Fix for bug #1570, move vertex after add vertex introduces new vertic…

…es when snapping is active git-svn-id: http://svn.osgeo.org/qgis/trunk@10517 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Apr 9, 2009 · fa45125 · fa45125
1 parent 5526c6a
commit fa45125
Showing 1 changed file with 19 additions and 1 deletion.
diff --git a/src/app/qgsmaptooladdvertex.cpp b/src/app/qgsmaptooladdvertex.cpp
@@ -96,7 +96,25 @@ void QgsMapToolAddVertex::canvasReleaseEvent( QMouseEvent * e )
       int topologicalEditing = QgsProject::instance()->readNumEntry( "Digitizing", "/TopologicalEditing", 0 );
       if ( topologicalEditing )
       {
-        insertSegmentVerticesForSnap( snapResults, vlayer );
+        //ignore the snapping results that are on features / segments already considered in mRecentSnappingResults
+        QList<QgsSnappingResult> filteredSnapResults = snapResults;
+        QList<QgsSnappingResult>::iterator recentIt = mRecentSnappingResults.begin();
+        for(; recentIt != mRecentSnappingResults.end(); ++recentIt)
+        {
+            QList<QgsSnappingResult>::iterator filterIt = filteredSnapResults.begin();
+            for(; filterIt != filteredSnapResults.end(); ++filterIt)
+            {
+                if(filterIt->snappedAtGeometry == recentIt->snappedAtGeometry \
+                    && filterIt->snappedVertexNr == recentIt->snappedVertexNr \
+                    && filterIt->beforeVertexNr == recentIt->beforeVertexNr )
+                {
+                    filteredSnapResults.erase(filterIt);
+                    continue;
+                }
+
+            }
+        }
+        insertSegmentVerticesForSnap( filteredSnapResults, vlayer );
       }
 
       snappedPointMapCoord = snapPointFromResults( snapResults, e->pos() );