Node tool: give preference to vertex match over segment match from previous feature

wonder-sk · wonder-sk · commit b280c873d566 · 2017-06-08T23:02:27.000+02:00
diff --git a/src/app/nodetool/qgsnodetool.cpp b/src/app/nodetool/qgsnodetool.cpp
@@ -626,8 +626,13 @@ QgsPointLocator::Match QgsNodeTool::snapToEditableLayer( QgsMapMouseEvent *e )
   {
     OneFeatureFilter filterLast( mLastSnap->layer(), mLastSnap->featureId() );
     QgsPointLocator::Match lastMatch = snapUtils->snapToMap( mapPoint, &filterLast );
-    if ( lastMatch.isValid() && lastMatch.distance() <= m.distance() )
+    // but skip the the previously used feature if it would only snap to segment, while now we have snap to vertex
+    // so that if there is a point on a line, it gets priority (as is usual with combined vertex+segment snapping)
+    bool matchHasVertexLastHasEdge = m.hasVertex() && lastMatch.hasEdge();
+    if ( lastMatch.isValid() && lastMatch.distance() <= m.distance() && !matchHasVertexLastHasEdge )
+    {
       m = lastMatch;
+    }
   }
 
   snapUtils->setConfig( oldConfig );

Original file line number	Diff line number	Diff line change
`@@ -626,8 +626,13 @@ QgsPointLocator::Match QgsNodeTool::snapToEditableLayer( QgsMapMouseEvent *e )`
`626`	`626`	`{`
`627`	`627`	`OneFeatureFilter filterLast( mLastSnap->layer(), mLastSnap->featureId() );`
`628`	`628`	`QgsPointLocator::Match lastMatch = snapUtils->snapToMap( mapPoint, &filterLast );`
`629`		`- if ( lastMatch.isValid() && lastMatch.distance() <= m.distance() )`
	`629`	`+ // but skip the the previously used feature if it would only snap to segment, while now we have snap to vertex`
	`630`	`+ // so that if there is a point on a line, it gets priority (as is usual with combined vertex+segment snapping)`
	`631`	`+ bool matchHasVertexLastHasEdge = m.hasVertex() && lastMatch.hasEdge();`
	`632`	`+ if ( lastMatch.isValid() && lastMatch.distance() <= m.distance() && !matchHasVertexLastHasEdge )`
	`633`	`+ {`
`630`	`634`	`m = lastMatch;`
	`635`	`+ }`
`631`	`636`	`}`
`632`	`637`
`633`	`638`	`snapUtils->setConfig( oldConfig );`