Fix rotation of simple marker if cache is not used (ticket #3778)

Marco Hugentobler · Marco Hugentobler · commit d85320b7a2da · 2011-05-20T22:59:59.000+02:00
diff --git a/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp b/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
@@ -374,7 +374,7 @@ void QgsSimpleMarkerSymbolLayerV2::renderPoint( const QPointF& point, QgsSymbolV
   {
     QMatrix transform;
 
-    // bool hasDataDefinedRotation = context.renderHints() & QgsSymbolV2::DataDefinedRotation;
+    bool hasDataDefinedRotation = context.renderHints() & QgsSymbolV2::DataDefinedRotation;
     bool hasDataDefinedSize = context.renderHints() & QgsSymbolV2::DataDefinedSizeScale;
 
     // move to the desired position
@@ -389,7 +389,7 @@ void QgsSimpleMarkerSymbolLayerV2::renderPoint( const QPointF& point, QgsSymbolV
     }
 
     // rotate if necessary
-    if ( mAngle != 0 )
+    if ( mAngle != 0 && hasDataDefinedRotation )
     {
       transform.rotate( mAngle );
     }

Original file line number	Diff line number	Diff line change
`@@ -374,7 +374,7 @@ void QgsSimpleMarkerSymbolLayerV2::renderPoint( const QPointF& point, QgsSymbolV`
`374`	`374`	`{`
`375`	`375`	`QMatrix transform;`
`376`	`376`
`377`		`- // bool hasDataDefinedRotation = context.renderHints() & QgsSymbolV2::DataDefinedRotation;`
	`377`	`+ bool hasDataDefinedRotation = context.renderHints() & QgsSymbolV2::DataDefinedRotation;`
`378`	`378`	`bool hasDataDefinedSize = context.renderHints() & QgsSymbolV2::DataDefinedSizeScale;`
`379`	`379`
`380`	`380`	`// move to the desired position`
`@@ -389,7 +389,7 @@ void QgsSimpleMarkerSymbolLayerV2::renderPoint( const QPointF& point, QgsSymbolV`
`389`	`389`	`}`
`390`	`390`
`391`	`391`	`// rotate if necessary`
`392`		`- if ( mAngle != 0 )`
	`392`	`+ if ( mAngle != 0 && hasDataDefinedRotation )`
`393`	`393`	`{`
`394`	`394`	`transform.rotate( mAngle );`
`395`	`395`	`}`