show snap indicators for snaps with constraints

olivierdalang · olivierdalang · commit 66bfde66d567 · 2020-05-21T21:58:32.000+02:00
diff --git a/src/gui/qgsadvanceddigitizingdockwidget.cpp b/src/gui/qgsadvanceddigitizingdockwidget.cpp
@@ -667,14 +667,9 @@ bool QgsAdvancedDigitizingDockWidget::applyConstraints( QgsMapMouseEvent *e )
     }
   }
 
-  // set the point coordinates in the map event
-  e->setMapPoint( point );
-
-  mSnapMatch = context.snappingUtils->snapToMap( point, nullptr, true );
-
-  if ( mSnapMatch.isValid() )
+  if ( output.snapMatch.isValid() )
   {
-    mSnapIndicator->setMatch( mSnapMatch );
+    mSnapIndicator->setMatch( output.snapMatch );
     mSnapIndicator->setVisible( true );
   }
   else
@@ -690,6 +685,8 @@ bool QgsAdvancedDigitizingDockWidget::applyConstraints( QgsMapMouseEvent *e )
    * when the snapped point corresponds to the constrained point or on an edge
    * if the topological editing is activated.
    */
+  e->setMapPoint( point );
+  mSnapMatch = context.snappingUtils->snapToMap( point, nullptr, true );
   if ( ( mSnapMatch.hasVertex() && ( point == mSnapMatch.point() ) ) || ( mSnapMatch.hasEdge() && QgsProject::instance()->topologicalEditing() ) )
   {
     e->snapPoint();

Original file line number	Diff line number	Diff line change
`@@ -667,14 +667,9 @@ bool QgsAdvancedDigitizingDockWidget::applyConstraints( QgsMapMouseEvent *e )`
`667`	`667`	`}`
`668`	`668`	`}`
`669`	`669`
`670`		`- // set the point coordinates in the map event`
`671`		`- e->setMapPoint( point );`
`672`		`-`
`673`		`- mSnapMatch = context.snappingUtils->snapToMap( point, nullptr, true );`
`674`		`-`
`675`		`- if ( mSnapMatch.isValid() )`
	`670`	`+ if ( output.snapMatch.isValid() )`
`676`	`671`	`{`
`677`		`- mSnapIndicator->setMatch( mSnapMatch );`
	`672`	`+ mSnapIndicator->setMatch( output.snapMatch );`
`678`	`673`	`mSnapIndicator->setVisible( true );`
`679`	`674`	`}`
`680`	`675`	`else`
`@@ -690,6 +685,8 @@ bool QgsAdvancedDigitizingDockWidget::applyConstraints( QgsMapMouseEvent *e )`
`690`	`685`	`* when the snapped point corresponds to the constrained point or on an edge`
`691`	`686`	`* if the topological editing is activated.`
`692`	`687`	`*/`
	`688`	`+ e->setMapPoint( point );`
	`689`	`+ mSnapMatch = context.snappingUtils->snapToMap( point, nullptr, true );`
`693`	`690`	`if ( ( mSnapMatch.hasVertex() && ( point == mSnapMatch.point() ) ) \|\| ( mSnapMatch.hasEdge() && QgsProject::instance()->topologicalEditing() ) )`
`694`	`691`	`{`
`695`	`692`	`e->snapPoint();`