[QGIS Commit] r12808 - in trunk/qgis/src: core/symbology-ng ui/symbollayer

[svn_qgis at osgeo.org]

Author: wonder
Date: 2010-01-20 17:40:19 -0500 (Wed, 20 Jan 2010)
New Revision: 12808

Modified:
   trunk/qgis/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
   trunk/qgis/src/ui/symbollayer/widget_fontmarker.ui
Log:
Fixed positioning of font markers with rotation (#2380).
Allow rotation up to 360 degrees in the settings widget.


Modified: trunk/qgis/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
===================================================================
--- trunk/qgis/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp	2010-01-20 20:00:56 UTC (rev 12807)
+++ trunk/qgis/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp	2010-01-20 22:40:19 UTC (rev 12808)
@@ -524,14 +524,13 @@
   p->setPen( mColor );
   p->setFont( mFont );
 
+  p->save();
+  p->translate(point);
   if ( mAngle != 0 )
-  {
-    p->save();
     p->rotate( mAngle );
-  }
-  p->drawText( point - mChrOffset, mChr );
-  if ( mAngle != 0 )
-    p->restore();
+
+  p->drawText(-mChrOffset, mChr );
+  p->restore();
 }
 
 QgsStringMap QgsFontMarkerSymbolLayerV2::properties() const

Modified: trunk/qgis/src/ui/symbollayer/widget_fontmarker.ui
===================================================================
--- trunk/qgis/src/ui/symbollayer/widget_fontmarker.ui	2010-01-20 20:00:56 UTC (rev 12807)
+++ trunk/qgis/src/ui/symbollayer/widget_fontmarker.ui	2010-01-20 22:40:19 UTC (rev 12808)
@@ -62,6 +62,9 @@
        <property name="decimals">
         <number>1</number>
        </property>
+       <property name="maximum">
+        <double>360.000000000000000</double>
+       </property>
       </widget>
      </item>
      <item row="2" column="1">