Merge pull request #974 from leyan/topology_bug

3nids · 3nids · commit 1f81a84c9ee7 · 2013-10-28T00:16:36.000-07:00
correct bug in topology rubberband when OTF is enabled
diff --git a/src/app/nodetool/qgsmaptoolnodetool.cpp b/src/app/nodetool/qgsmaptoolnodetool.cpp
@@ -187,7 +187,7 @@ void QgsMapToolNodeTool::createTopologyRubberBands( QgsVectorLayer* vlayer, cons
       }
       else
       {
-        trb->addPoint( topolGeometry->vertexAt( tVertex ) );
+        trb->addPoint( toMapCoordinates( vlayer, topolGeometry->vertexAt( tVertex ) ) );
         if ( tVertex == tVertexFirst ) // cycle first vertex need to be added also
         {
           movingPoints->insert( movingPointIndex );
@@ -206,14 +206,14 @@ void QgsMapToolNodeTool::createTopologyRubberBands( QgsVectorLayer* vlayer, cons
         // find first no matching vertex
         if ( dist > ZERO_TOLERANCE || !vertexMap[at]->isSelected() ) // problem with double precision
         {
-          trb->addPoint( topolGeometry->vertexAt( tVertex ) );
+          trb->addPoint( toMapCoordinates( vlayer, topolGeometry->vertexAt( tVertex ) ) );
           break; // found first vertex
         }
         else // add moving point to rubberband
         {
           if ( addedPoints->contains( tVertex ) )
             break; // just preventing to circle
-          trb->addPoint( topolGeometry->vertexAt( tVertex ) );
+          trb->addPoint( toMapCoordinates( vlayer, topolGeometry->vertexAt( tVertex ) ) );
           movingPoints->insert( movingPointIndex );
           movingPointIndex++;
           addedPoints->insert( tVertex );

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ void QgsMapToolNodeTool::createTopologyRubberBands( QgsVectorLayer* vlayer, cons`
`187`	`187`	`}`
`188`	`188`	`else`
`189`	`189`	`{`
`190`		`- trb->addPoint( topolGeometry->vertexAt( tVertex ) );`
	`190`	`+ trb->addPoint( toMapCoordinates( vlayer, topolGeometry->vertexAt( tVertex ) ) );`
`191`	`191`	`if ( tVertex == tVertexFirst ) // cycle first vertex need to be added also`
`192`	`192`	`{`
`193`	`193`	`movingPoints->insert( movingPointIndex );`
`@@ -206,14 +206,14 @@ void QgsMapToolNodeTool::createTopologyRubberBands( QgsVectorLayer* vlayer, cons`
`206`	`206`	`// find first no matching vertex`
`207`	`207`	`if ( dist > ZERO_TOLERANCE \|\| !vertexMap[at]->isSelected() ) // problem with double precision`
`208`	`208`	`{`
`209`		`- trb->addPoint( topolGeometry->vertexAt( tVertex ) );`
	`209`	`+ trb->addPoint( toMapCoordinates( vlayer, topolGeometry->vertexAt( tVertex ) ) );`
`210`	`210`	`break; // found first vertex`
`211`	`211`	`}`
`212`	`212`	`else // add moving point to rubberband`
`213`	`213`	`{`
`214`	`214`	`if ( addedPoints->contains( tVertex ) )`
`215`	`215`	`break; // just preventing to circle`
`216`		`- trb->addPoint( topolGeometry->vertexAt( tVertex ) );`
	`216`	`+ trb->addPoint( toMapCoordinates( vlayer, topolGeometry->vertexAt( tVertex ) ) );`
`217`	`217`	`movingPoints->insert( movingPointIndex );`
`218`	`218`	`movingPointIndex++;`
`219`	`219`	`addedPoints->insert( tVertex );`