Fix reprojected markers

mhugent · mhugent · commit c8a65668edc0 · 2015-09-07T11:26:17.000+02:00
diff --git a/src/core/symbology-ng/qgslinesymbollayerv2.cpp b/src/core/symbology-ng/qgslinesymbollayerv2.cpp
@@ -1007,21 +1007,21 @@ void QgsMarkerLineSymbolLayerV2::renderPolylineVertex( const QPolygonF& points,
 
     QgsVertexId vId;
     QgsPointV2 vPoint;
-    double z;
+    double x, y, z;
     QPointF mapPoint;
     while ( context.renderContext().geometry()->nextVertex( vId, vPoint ) )
     {
       if (( placement == Vertex && vId.type == QgsVertexId::SegmentVertex )
           || ( placement == CurvePoint && vId.type == QgsVertexId::CurveVertex ) )
       {
         //transform
-        mapPoint.setX( vPoint.x() ); mapPoint.setY( vPoint.y() ); z = vPoint.z();
-        mtp.transformInPlace( mapPoint.rx(), mapPoint.ry() );
+        x = vPoint.x(), y = vPoint.y(); z = vPoint.z();
         if ( ct )
         {
-          ct->transformInPlace( mapPoint.rx(), mapPoint.ry(), z );
+          ct->transformInPlace( x, y, z );
         }
-
+        mapPoint.setX( x ); mapPoint.setY( y );
+        mtp.transformInPlace( mapPoint.rx(), mapPoint.ry() );
         if ( mRotateMarker )
         {
           double angle = context.renderContext().geometry()->vertexAngle( vId );
diff --git a/src/core/symbology-ng/qgsrendererv2.cpp b/src/core/symbology-ng/qgsrendererv2.cpp
@@ -443,17 +443,18 @@ void QgsFeatureRendererV2::renderFeatureWithSymbol( QgsFeature& feature, QgsSymb
 
     QgsPointV2 vertexPoint;
     QgsVertexId vertexId;
-    double z;
+    double x, y, z;
     QPointF mapPoint;
     while ( geom->geometry()->nextVertex( vertexId, vertexPoint ) )
     {
       //transform
-      mapPoint.setX( vertexPoint.x() ); mapPoint.setY( vertexPoint.y() ); z = vertexPoint.z();
-      mtp.transformInPlace( mapPoint.rx(), mapPoint.ry() );
+      x = vertexPoint.x(); y = vertexPoint.y(); z = vertexPoint.z();
       if ( ct )
       {
-        ct->transformInPlace( mapPoint.rx(), mapPoint.ry(), z );
+        ct->transformInPlace( x, y, z );
       }
+      mapPoint.setX( x ); mapPoint.setY( y );
+      mtp.transformInPlace( mapPoint.rx(), mapPoint.ry() );
       renderVertexMarker( mapPoint, context );
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -1007,21 +1007,21 @@ void QgsMarkerLineSymbolLayerV2::renderPolylineVertex( const QPolygonF& points,`
`1007`	`1007`
`1008`	`1008`	`QgsVertexId vId;`
`1009`	`1009`	`QgsPointV2 vPoint;`
`1010`		`- double z;`
	`1010`	`+ double x, y, z;`
`1011`	`1011`	`QPointF mapPoint;`
`1012`	`1012`	`while ( context.renderContext().geometry()->nextVertex( vId, vPoint ) )`
`1013`	`1013`	`{`
`1014`	`1014`	`if (( placement == Vertex && vId.type == QgsVertexId::SegmentVertex )`
`1015`	`1015`	`\|\| ( placement == CurvePoint && vId.type == QgsVertexId::CurveVertex ) )`
`1016`	`1016`	`{`
`1017`	`1017`	`//transform`
`1018`		`- mapPoint.setX( vPoint.x() ); mapPoint.setY( vPoint.y() ); z = vPoint.z();`
`1019`		`- mtp.transformInPlace( mapPoint.rx(), mapPoint.ry() );`
	`1018`	`+ x = vPoint.x(), y = vPoint.y(); z = vPoint.z();`
`1020`	`1019`	`if ( ct )`
`1021`	`1020`	`{`
`1022`		`- ct->transformInPlace( mapPoint.rx(), mapPoint.ry(), z );`
	`1021`	`+ ct->transformInPlace( x, y, z );`
`1023`	`1022`	`}`
`1024`		`-`
	`1023`	`+ mapPoint.setX( x ); mapPoint.setY( y );`
	`1024`	`+ mtp.transformInPlace( mapPoint.rx(), mapPoint.ry() );`
`1025`	`1025`	`if ( mRotateMarker )`
`1026`	`1026`	`{`
`1027`	`1027`	`double angle = context.renderContext().geometry()->vertexAngle( vId );`
Original file line number	Diff line number	Diff line change
`@@ -443,17 +443,18 @@ void QgsFeatureRendererV2::renderFeatureWithSymbol( QgsFeature& feature, QgsSymb`
`443`	`443`
`444`	`444`	`QgsPointV2 vertexPoint;`
`445`	`445`	`QgsVertexId vertexId;`
`446`		`- double z;`
	`446`	`+ double x, y, z;`
`447`	`447`	`QPointF mapPoint;`
`448`	`448`	`while ( geom->geometry()->nextVertex( vertexId, vertexPoint ) )`
`449`	`449`	`{`
`450`	`450`	`//transform`
`451`		`- mapPoint.setX( vertexPoint.x() ); mapPoint.setY( vertexPoint.y() ); z = vertexPoint.z();`
`452`		`- mtp.transformInPlace( mapPoint.rx(), mapPoint.ry() );`
	`451`	`+ x = vertexPoint.x(); y = vertexPoint.y(); z = vertexPoint.z();`
`453`	`452`	`if ( ct )`
`454`	`453`	`{`
`455`		`- ct->transformInPlace( mapPoint.rx(), mapPoint.ry(), z );`
	`454`	`+ ct->transformInPlace( x, y, z );`
`456`	`455`	`}`
	`456`	`+ mapPoint.setX( x ); mapPoint.setY( y );`
	`457`	`+ mtp.transformInPlace( mapPoint.rx(), mapPoint.ry() );`
`457`	`458`	`renderVertexMarker( mapPoint, context );`
`458`	`459`	`}`
`459`	`460`	`}`