[rotation] prevent rotation of labels when placed around or over a point/centroid

nirvn · Sandro Santilli · commit 8f706644720c · 2015-01-08T14:24:04.000+01:00
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -4139,7 +4139,9 @@ void QgsPalLabeling::drawLabelCandidateRect( pal::LabelPosition* lp, QPainter* p
   if ( rotation )
   {
     // Only if not horizontal
-    if ( lp->getFeaturePart()->getLayer()->getArrangement() != P_HORIZ )
+    if ( lp->getFeaturePart()->getLayer()->getArrangement() != P_POINT &&
+         lp->getFeaturePart()->getLayer()->getArrangement() != P_POINT_OVER &&
+         lp->getFeaturePart()->getLayer()->getArrangement() != P_HORIZ )
     {
       painter->rotate( rotation );
     }
@@ -4303,7 +4305,9 @@ void QgsPalLabeling::drawLabel( pal::LabelPosition* label, QgsRenderContext& con
       if ( rotation )
       {
         // Only if not horizontal
-        if ( lp->getFeaturePart()->getLayer()->getArrangement() != P_HORIZ )
+        if ( lp->getFeaturePart()->getLayer()->getArrangement() != P_POINT &&
+             lp->getFeaturePart()->getLayer()->getArrangement() != P_POINT_OVER &&
+             lp->getFeaturePart()->getLayer()->getArrangement() != P_HORIZ )
         {
           painter->rotate( rotation );
         }

Original file line number	Diff line number	Diff line change
`@@ -4139,7 +4139,9 @@ void QgsPalLabeling::drawLabelCandidateRect( pal::LabelPosition* lp, QPainter* p`
`4139`	`4139`	`if ( rotation )`
`4140`	`4140`	`{`
`4141`	`4141`	`// Only if not horizontal`
`4142`		`- if ( lp->getFeaturePart()->getLayer()->getArrangement() != P_HORIZ )`
	`4142`	`+ if ( lp->getFeaturePart()->getLayer()->getArrangement() != P_POINT &&`
	`4143`	`+ lp->getFeaturePart()->getLayer()->getArrangement() != P_POINT_OVER &&`
	`4144`	`+ lp->getFeaturePart()->getLayer()->getArrangement() != P_HORIZ )`
`4143`	`4145`	`{`
`4144`	`4146`	`painter->rotate( rotation );`
`4145`	`4147`	`}`
`@@ -4303,7 +4305,9 @@ void QgsPalLabeling::drawLabel( pal::LabelPosition* label, QgsRenderContext& con`
`4303`	`4305`	`if ( rotation )`
`4304`	`4306`	`{`
`4305`	`4307`	`// Only if not horizontal`
`4306`		`- if ( lp->getFeaturePart()->getLayer()->getArrangement() != P_HORIZ )`
	`4308`	`+ if ( lp->getFeaturePart()->getLayer()->getArrangement() != P_POINT &&`
	`4309`	`+ lp->getFeaturePart()->getLayer()->getArrangement() != P_POINT_OVER &&`
	`4310`	`+ lp->getFeaturePart()->getLayer()->getArrangement() != P_HORIZ )`
`4307`	`4311`	`{`
`4308`	`4312`	`painter->rotate( rotation );`
`4309`	`4313`	`}`