Highlight grid for map tools that snap to grid

qgis · Aug 26, 2018 · b68ce3780e1693db190e2cccd1a0650c225eaf18 · b68ce37
1 parent 6c467fb
commit b68ce3780e1693db190e2cccd1a0650c225eaf18
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/gui/qgsmaptooladvanceddigitizing.cpp b/src/gui/qgsmaptooladvanceddigitizing.cpp
@@ -19,6 +19,7 @@
 #include "qgsadvanceddigitizingdockwidget.h"
 #include "qgsvectorlayer.h"
 #include "qgsgeometryfixes.h"
+#include "qgssnaptogridcanvasitem.h"
 
 QgsMapToolAdvancedDigitizing::QgsMapToolAdvancedDigitizing( QgsMapCanvas *canvas, QgsAdvancedDigitizingDockWidget *cadDockWidget )
   : QgsMapToolEdit( canvas )
@@ -109,6 +110,7 @@ void QgsMapToolAdvancedDigitizing::canvasMoveEvent( QgsMapMouseEvent *e )
   if ( mSnapToGridEnabled && layer )
   {
     e->snapToGrid( layer->geometryFixes()->geometryPrecision(), layer->crs() );
+    mSnapToGridCanvasItem->setPoint( e->mapPoint() );
   }
 
   cadCanvasMoveEvent( e );
@@ -119,13 +121,19 @@ void QgsMapToolAdvancedDigitizing::activate()
   QgsMapToolEdit::activate();
   connect( mCadDockWidget, &QgsAdvancedDigitizingDockWidget::pointChanged, this, &QgsMapToolAdvancedDigitizing::cadPointChanged );
   mCadDockWidget->enable();
+  mSnapToGridCanvasItem = new QgsSnapToGridCanvasItem( mCanvas );
+  mSnapToGridCanvasItem->setCrs( currentVectorLayer()->crs() );
+  mSnapToGridCanvasItem->setPrecision( currentVectorLayer()->geometryFixes()->geometryPrecision() );
+  mSnapToGridCanvasItem->setEnabled( mSnapToGridEnabled );
 }
 
 void QgsMapToolAdvancedDigitizing::deactivate()
 {
   QgsMapToolEdit::deactivate();
   disconnect( mCadDockWidget, &QgsAdvancedDigitizingDockWidget::pointChanged, this, &QgsMapToolAdvancedDigitizing::cadPointChanged );
   mCadDockWidget->disable();
+  delete mSnapToGridCanvasItem;
+  mSnapToGridCanvasItem = nullptr;
 }
 
 void QgsMapToolAdvancedDigitizing::cadPointChanged( const QgsPointXY &point )
@@ -142,5 +150,9 @@ bool QgsMapToolAdvancedDigitizing::snapToGridEnabled() const
 
 void QgsMapToolAdvancedDigitizing::setSnapToGridEnabled( bool snapToGridEnabled )
 {
-  mSnapToGridEnabled = snapToGridEnabled;
+  if ( mSnapToGridCanvasItem )
+  {
+    mSnapToGridEnabled = snapToGridEnabled;
+    mSnapToGridCanvasItem->setEnabled( snapToGridEnabled );
+  }
 }
diff --git a/src/gui/qgsmaptooladvanceddigitizing.h b/src/gui/qgsmaptooladvanceddigitizing.h
@@ -22,6 +22,7 @@
 
 class QgsMapMouseEvent;
 class QgsAdvancedDigitizingDockWidget;
+class QgsSnapToGridCanvasItem;
 
 /**
  * \ingroup gui
@@ -175,6 +176,7 @@ class GUI_EXPORT QgsMapToolAdvancedDigitizing : public QgsMapToolEdit
     bool mAutoSnapEnabled = true;
     //! Whether to snap to grid before passing coordinates to cadCanvas*Event()
     bool mSnapToGridEnabled = true;
+    QgsSnapToGridCanvasItem *mSnapToGridCanvasItem = nullptr;
 };
 
 #endif // QGSMAPTOOLADVANCEDDIGITIZE_H