Needs to snap point too when CadDockWidget is enabled. Fixes #18138

qgis · Mar 13, 2019 · 6fbe8cf · 6fbe8cf
1 parent a17e394
commit 6fbe8cf
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/gui/qgsadvanceddigitizingdockwidget.cpp b/src/gui/qgsadvanceddigitizingdockwidget.cpp
@@ -555,6 +555,8 @@ bool QgsAdvancedDigitizingDockWidget::applyConstraints( QgsMapMouseEvent *e )
 
   mSnapMatch = context.snappingUtils->snapToMap( point );
 
+  mSnappedToVertex = mSnapMatch.hasVertex();
+
   // update the point list
   updateCurrentPoint( point );
 

diff --git a/src/gui/qgsmaptooladvanceddigitizing.cpp b/src/gui/qgsmaptooladvanceddigitizing.cpp
@@ -34,6 +34,11 @@ void QgsMapToolAdvancedDigitizing::canvasPressEvent( QgsMapMouseEvent *e )
   {
     mCadDockWidget->applyConstraints( e );  // updates event's map point
 
+    if ( mCadDockWidget->mapPointMatch().hasVertex() )
+    {
+      e->snapPoint();
+    }
+
     if ( mCadDockWidget->constructionMode() )
       return;  // decided to eat the event and not pass it to the map tool (construction mode)
   }
@@ -73,6 +78,11 @@ void QgsMapToolAdvancedDigitizing::canvasReleaseEvent( QgsMapMouseEvent *e )
 
       mCadDockWidget->releaseLocks( false );
 
+      if ( mCadDockWidget->mapPointMatch().hasVertex() )
+      {
+        e->snapPoint();
+      }
+
       if ( mCadDockWidget->constructionMode() )
         return;  // decided to eat the event and not pass it to the map tool (construction mode)
     }