Fixed misplacement of rotated labels

wonder · wonder · commit 7186af4e2b17 · 2009-08-17T22:30:09.000Z
git-svn-id: http://svn.osgeo.org/qgis/branches/symbology-ng-branch@11418 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/plugins/labeling/pallabeling.cpp b/src/plugins/labeling/pallabeling.cpp
@@ -541,8 +541,9 @@ void PalLabeling::drawLabel( pal::LabelPosition* label, QPainter* painter, const
 
   // shift by one as we have 2px border
   painter->save();
-  painter->translate( QPointF(outPt.x()+1, outPt.y()-1-lyr.fontBaseline) );
+  painter->translate( QPointF(outPt.x(), outPt.y()) );
   painter->rotate(-label->getAlpha() * 180 / M_PI );
+  painter->translate( QPointF(1, -1-lyr.fontBaseline) );
 
   if (drawBuffer)
   {

Original file line number	Diff line number	Diff line change
`@@ -541,8 +541,9 @@ void PalLabeling::drawLabel( pal::LabelPosition* label, QPainter* painter, const`
`541`	`541`
`542`	`542`	`// shift by one as we have 2px border`
`543`	`543`	`painter->save();`
`544`		`- painter->translate( QPointF(outPt.x()+1, outPt.y()-1-lyr.fontBaseline) );`
	`544`	`+ painter->translate( QPointF(outPt.x(), outPt.y()) );`
`545`	`545`	`painter->rotate(-label->getAlpha() * 180 / M_PI );`
	`546`	`+ painter->translate( QPointF(1, -1-lyr.fontBaseline) );`
`546`	`547`
`547`	`548`	`if (drawBuffer)`
`548`	`549`	`{`