Fix snapping

m-kuhn · m-kuhn · commit 1d90f6692d23 · 2015-09-13T20:32:50.000+02:00
diff --git a/src/gui/qgsmaptooladvanceddigitizing.cpp b/src/gui/qgsmaptooladvanceddigitizing.cpp
@@ -34,18 +34,21 @@ QgsMapToolAdvancedDigitizing::~QgsMapToolAdvancedDigitizing()
 
 void QgsMapToolAdvancedDigitizing::canvasPressEvent( QgsMapMouseEvent* e )
 {
+  snap( e );
   if ( !mCadDockWidget->canvasPressEvent( e ) )
     cadCanvasPressEvent( e );
 }
 
 void QgsMapToolAdvancedDigitizing::canvasReleaseEvent( QgsMapMouseEvent* e )
 {
+  snap( e );
   if ( !mCadDockWidget->canvasReleaseEvent( e, mCaptureMode == CaptureLine || mCaptureMode == CapturePolygon ) )
     cadCanvasReleaseEvent( e );
 }
 
 void QgsMapToolAdvancedDigitizing::canvasMoveEvent( QgsMapMouseEvent* e )
 {
+  snap( e );
   if ( !mCadDockWidget->canvasMoveEvent( e ) )
     cadCanvasMoveEvent( e );
 }
@@ -70,3 +73,9 @@ void QgsMapToolAdvancedDigitizing::cadPointChanged( const QgsPoint& point )
   fakeEvent.setMapPoint( point );
   canvasMoveEvent( &fakeEvent );
 }
+
+void QgsMapToolAdvancedDigitizing::snap( QgsMapMouseEvent* e )
+{
+  if ( !mCadDockWidget->cadEnabled() )
+    e->snapPoint( QgsMapMouseEvent::SnapProjectConfig );
+}
diff --git a/src/gui/qgsmaptooladvanceddigitizing.h b/src/gui/qgsmaptooladvanceddigitizing.h
@@ -123,7 +123,7 @@ class GUI_EXPORT QgsMapToolAdvancedDigitizing : public QgsMapToolEdit
   private slots:
     /**
      * Is to be called by the cad system whenever a point changes outside of a
-     * mouse event. E.g. when additional constraints are triggered.
+     * mouse event. E.g. when additional constraints are toggled.
      * The specified point will be used to generate a fake mouse event which will
      * be sent as move event to cadCanvasMoveEvent.
      *
@@ -133,6 +133,8 @@ class GUI_EXPORT QgsMapToolAdvancedDigitizing : public QgsMapToolEdit
 
   private:
     QgsAdvancedDigitizingDockWidget* mCadDockWidget;
+
+    void snap( QgsMapMouseEvent* e );
 };
 
 #endif // QGSMAPTOOLADVANCEDDIGITIZE_H

Original file line number	Diff line number	Diff line change
`@@ -34,18 +34,21 @@ QgsMapToolAdvancedDigitizing::~QgsMapToolAdvancedDigitizing()`
`34`	`34`
`35`	`35`	`void QgsMapToolAdvancedDigitizing::canvasPressEvent( QgsMapMouseEvent* e )`
`36`	`36`	`{`
	`37`	`+ snap( e );`
`37`	`38`	`if ( !mCadDockWidget->canvasPressEvent( e ) )`
`38`	`39`	`cadCanvasPressEvent( e );`
`39`	`40`	`}`
`40`	`41`
`41`	`42`	`void QgsMapToolAdvancedDigitizing::canvasReleaseEvent( QgsMapMouseEvent* e )`
`42`	`43`	`{`
	`44`	`+ snap( e );`
`43`	`45`	`if ( !mCadDockWidget->canvasReleaseEvent( e, mCaptureMode == CaptureLine \|\| mCaptureMode == CapturePolygon ) )`
`44`	`46`	`cadCanvasReleaseEvent( e );`
`45`	`47`	`}`
`46`	`48`
`47`	`49`	`void QgsMapToolAdvancedDigitizing::canvasMoveEvent( QgsMapMouseEvent* e )`
`48`	`50`	`{`
	`51`	`+ snap( e );`
`49`	`52`	`if ( !mCadDockWidget->canvasMoveEvent( e ) )`
`50`	`53`	`cadCanvasMoveEvent( e );`
`51`	`54`	`}`
`@@ -70,3 +73,9 @@ void QgsMapToolAdvancedDigitizing::cadPointChanged( const QgsPoint& point )`
`70`	`73`	`fakeEvent.setMapPoint( point );`
`71`	`74`	`canvasMoveEvent( &fakeEvent );`
`72`	`75`	`}`
	`76`	`+`
	`77`	`+void QgsMapToolAdvancedDigitizing::snap( QgsMapMouseEvent* e )`
	`78`	`+{`
	`79`	`+ if ( !mCadDockWidget->cadEnabled() )`
	`80`	`+ e->snapPoint( QgsMapMouseEvent::SnapProjectConfig );`
	`81`	`+}`