Fix line coordinate transform

mhugent · mhugent · commit 93fc059e708e · 2011-01-28T16:20:37.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15095 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/qgsclipper.cpp b/src/core/qgsclipper.cpp
@@ -85,7 +85,7 @@ unsigned char* QgsClipper::clippedLineWKB( unsigned char* wkb, const QgsRectangl
       if ( clipLineSegment( clipExtent.xMinimum(), clipExtent.xMaximum(), clipExtent.yMinimum(), clipExtent.yMaximum(),
                             p0x, p0y, p1x_c,  p1y_c ) )
       {
-        bool newLine = line.size() > 0 && ( p1x_c != lastClipX || p1y_c != lastClipY );
+        bool newLine = line.size() > 0 && ( p0x != lastClipX || p0y != lastClipY );
         if ( newLine )
         {
           //add edge points to connect old and new line
diff --git a/src/core/symbology-ng/qgsrendererv2.cpp b/src/core/symbology-ng/qgsrendererv2.cpp
@@ -53,11 +53,10 @@ unsigned char* QgsFeatureRendererV2::_getLineString( QPolygonF& pts, QgsRenderCo
   wkb += sizeof( unsigned int );
 
   bool hasZValue = ( wkbType == QGis::WKBLineString25D );
-  double x, y;
+  double x, y, z;
 
   const QgsCoordinateTransform* ct = context.coordinateTransform();
   const QgsMapToPixel& mtp = context.mapToPixel();
-  double z = 0; // dummy variable for coordiante transform
 
   //apply clipping for large lines to achieve a better rendering performance
   if ( nPoints > 100 )
@@ -89,7 +88,10 @@ unsigned char* QgsFeatureRendererV2::_getLineString( QPolygonF& pts, QgsRenderCo
   for ( unsigned int i = 0; i < pts.size(); ++i )
   {
     if ( ct )
+    {
+      z = 0;
       ct->transformInPlace( pts[i].rx(), pts[i].ry(), z );
+    }
     mtp.transformInPlace( pts[i].rx(), pts[i].ry() );
   }
 

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ unsigned char* QgsClipper::clippedLineWKB( unsigned char* wkb, const QgsRectangl`
`85`	`85`	`if ( clipLineSegment( clipExtent.xMinimum(), clipExtent.xMaximum(), clipExtent.yMinimum(), clipExtent.yMaximum(),`
`86`	`86`	`p0x, p0y, p1x_c, p1y_c ) )`
`87`	`87`	`{`
`88`		`- bool newLine = line.size() > 0 && ( p1x_c != lastClipX \|\| p1y_c != lastClipY );`
	`88`	`+ bool newLine = line.size() > 0 && ( p0x != lastClipX \|\| p0y != lastClipY );`
`89`	`89`	`if ( newLine )`
`90`	`90`	`{`
`91`	`91`	`//add edge points to connect old and new line`