Fixed positioning of font markers with rotation (#2380).

Allow rotation up to 360 degrees in the settings widget. git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12808 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jan 20, 2010 · 4a228f5 · 4a228f5
1 parent a3312b6
commit 4a228f5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp b/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
@@ -524,14 +524,13 @@ void QgsFontMarkerSymbolLayerV2::renderPoint( const QPointF& point, QgsSymbolV2R
   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

diff --git a/src/ui/symbollayer/widget_fontmarker.ui b/src/ui/symbollayer/widget_fontmarker.ui
@@ -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">