[selfsnap] apply pr review

qgis · May 26, 2020 · 47fdd4b · 47fdd4b
1 parent 02c7a9a
commit 47fdd4b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/python/core/auto_generated/qgssnappingutils.sip.in b/python/core/auto_generated/qgssnappingutils.sip.in
@@ -169,7 +169,7 @@ Set if invisible features must be snapped or not.
     void addExtraSnapLayer( QgsVectorLayer *vl );
 %Docstring
 Supply an extra snapping layer (typically a memory layer).
-This is can be used by map tools to provide additionnal
+This can be used by map tools to provide additionnal
 snappings points.
 
 .. seealso:: :py:func:`removeExtraSnapLayer`

diff --git a/src/app/qgssnappingwidget.cpp b/src/app/qgssnappingwidget.cpp
@@ -291,7 +291,7 @@ QgsSnappingWidget::QgsSnappingWidget( QgsProject *project, QgsMapCanvas *canvas,
   mSelfSnappingAction = new QAction( tr( "Self-snapping" ), this );
   mSelfSnappingAction->setCheckable( true );
   mSelfSnappingAction->setIcon( QIcon( QgsApplication::getThemeIcon( "/mIconSnappingSelf.svg" ) ) );
-  mSelfSnappingAction->setToolTip( tr( "Enable Self-snapping" ) );
+  mSelfSnappingAction->setToolTip( tr( "If self snapping is enabled, snapping will also take the current state of the digitized feature into consideration." ) );
   mSelfSnappingAction->setObjectName( QStringLiteral( "SelfSnappingAction" ) );
   connect( mSelfSnappingAction, &QAction::toggled, this, &QgsSnappingWidget::enableSelfSnapping );
 

diff --git a/src/core/qgscadutils.h b/src/core/qgscadutils.h
@@ -92,7 +92,10 @@ class CORE_EXPORT QgsCadUtils
       //! map point aligned according to the constraints
       QgsPointXY finalMapPoint;
 
-      //! Snapped point - only valid if actually used for something
+      /**
+       * Snapped point - only valid if actually used for something
+       * \since QGIS 3.14
+       */
       QgsPointLocator::Match snapMatch;
 
       /**

diff --git a/src/core/qgssnappingutils.h b/src/core/qgssnappingutils.h
@@ -187,7 +187,7 @@ class CORE_EXPORT QgsSnappingUtils : public QObject
 
     /**
      * Supply an extra snapping layer (typically a memory layer).
-     * This is can be used by map tools to provide additionnal
+     * This can be used by map tools to provide additionnal
      * snappings points.
      *
      * \see removeExtraSnapLayer()

diff --git a/src/gui/qgsmaptoolcapture.cpp b/src/gui/qgsmaptoolcapture.cpp
@@ -72,6 +72,7 @@ QgsMapToolCapture::~QgsMapToolCapture()
     mValidator->deleteLater();
     mValidator = nullptr;
   }
+  mCanvas->snappingUtils()->removeExtraSnapLayer( mExtraSnapLayer );
   mExtraSnapLayer->deleteLater();
   mExtraSnapLayer = nullptr;
 }