Fix automatically set anchor point isn't cleared after applying action

(cherry picked from commit a445771)
qgis · Jan 15, 2021 · c8d690e · c8d690e
1 parent c698939
commit c8d690e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/app/qgsmaptoolrotatefeature.cpp b/src/app/qgsmaptoolrotatefeature.cpp
@@ -234,12 +234,12 @@ void QgsMapToolRotateFeature::canvasReleaseEvent( QgsMapMouseEvent *e )
     QgsRectangle selectRect( layerCoords.x() - searchRadius, layerCoords.y() - searchRadius,
                              layerCoords.x() + searchRadius, layerCoords.y() + searchRadius );
 
-    bool autoCalculateAnchorPoint = false;
+    mAutoSetAnchorPoint = false;
     if ( !mAnchorPoint )
     {
       mAnchorPoint = qgis::make_unique<QgsVertexMarker>( mCanvas );
       mAnchorPoint->setIconType( QgsVertexMarker::ICON_CROSS );
-      autoCalculateAnchorPoint = true;
+      mAutoSetAnchorPoint = true;
     }
 
     if ( vlayer->selectedFeatureCount() == 0 )
@@ -277,7 +277,7 @@ void QgsMapToolRotateFeature::canvasReleaseEvent( QgsMapMouseEvent *e )
       }
 
       QgsRectangle bound = cf.geometry().boundingBox();
-      if ( autoCalculateAnchorPoint )
+      if ( mAutoSetAnchorPoint )
       {
         mStartPointMapCoords = toMapCoordinates( vlayer, bound.center() );
         mAnchorPoint->setCenter( mStartPointMapCoords );
@@ -337,7 +337,7 @@ void QgsMapToolRotateFeature::cancel()
   deleteRotationWidget();
   deleteRubberband();
   QgsVectorLayer *vlayer = currentVectorLayer();
-  if ( vlayer->selectedFeatureCount() == 0 )
+  if ( vlayer->selectedFeatureCount() == 0 || mAutoSetAnchorPoint )
   {
     mAnchorPoint.reset();
   }
@@ -422,6 +422,9 @@ void QgsMapToolRotateFeature::applyRotation( double rotation )
   deleteRotationWidget();
   deleteRubberband();
 
+  if ( mAutoSetAnchorPoint )
+    mAnchorPoint.reset();
+
   vlayer->endEditCommand();
   vlayer->triggerRepaint();
 }

diff --git a/src/app/qgsmaptoolrotatefeature.h b/src/app/qgsmaptoolrotatefeature.h
@@ -112,6 +112,7 @@ class APP_EXPORT QgsMapToolRotateFeature: public QgsMapToolEdit
 
     QPoint mStPoint;
     std::unique_ptr<QgsVertexMarker> mAnchorPoint = nullptr;
+    bool mAutoSetAnchorPoint = false;
 
     bool mRotationActive;