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

qgis · Jan 12, 2021 · a445771 · a445771
1 parent 0dfaa78
commit a445771
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 8 deletions.
diff --git a/src/app/qgsmaptoolrotatefeature.cpp b/src/app/qgsmaptoolrotatefeature.cpp
@@ -233,12 +233,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 )
@@ -276,7 +276,7 @@ void QgsMapToolRotateFeature::canvasReleaseEvent( QgsMapMouseEvent *e )
       }
 
       QgsRectangle bound = cf.geometry().boundingBox();
-      if ( autoCalculateAnchorPoint )
+      if ( mAutoSetAnchorPoint )
       {
         mStartPointMapCoords = toMapCoordinates( vlayer, bound.center() );
         mAnchorPoint->setCenter( mStartPointMapCoords );
@@ -336,7 +336,7 @@ void QgsMapToolRotateFeature::cancel()
   deleteRotationWidget();
   deleteRubberband();
   QgsVectorLayer *vlayer = currentVectorLayer();
-  if ( vlayer->selectedFeatureCount() == 0 )
+  if ( vlayer->selectedFeatureCount() == 0 || mAutoSetAnchorPoint )
   {
     mAnchorPoint.reset();
   }
@@ -420,6 +420,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 = false;
 

diff --git a/src/app/qgsmaptoolscalefeature.cpp b/src/app/qgsmaptoolscalefeature.cpp
@@ -196,12 +196,12 @@ void QgsMapToolScaleFeature::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 )
@@ -239,7 +239,7 @@ void QgsMapToolScaleFeature::canvasReleaseEvent( QgsMapMouseEvent *e )
       }
 
       mExtent = cf.geometry().boundingBox();
-      if ( autoCalculateAnchorPoint )
+      if ( mAutoSetAnchorPoint )
       {
         mFeatureCenterMapCoords = toMapCoordinates( vlayer, mExtent.center() );
         mAnchorPoint->setCenter( mFeatureCenterMapCoords );
@@ -291,7 +291,7 @@ void QgsMapToolScaleFeature::cancel()
   deleteScalingWidget();
   deleteRubberband();
   QgsVectorLayer *vlayer = currentVectorLayer();
-  if ( vlayer->selectedFeatureCount() == 0 )
+  if ( vlayer->selectedFeatureCount() == 0 || mAutoSetAnchorPoint )
   {
     mAnchorPoint.reset();
   }
@@ -357,6 +357,9 @@ void QgsMapToolScaleFeature::applyScaling( double scale )
   deleteScalingWidget();
   deleteRubberband();
 
+  if ( mAutoSetAnchorPoint )
+    mAnchorPoint.reset();
+
   vlayer->endEditCommand();
   vlayer->triggerRepaint();
 }

diff --git a/src/app/qgsmaptoolscalefeature.h b/src/app/qgsmaptoolscalefeature.h
@@ -109,6 +109,7 @@ class APP_EXPORT QgsMapToolScaleFeature: public QgsMapToolEdit
     QgsRectangle mExtent;
 
     std::unique_ptr<QgsVertexMarker> mAnchorPoint = nullptr;
+    bool mAutoSetAnchorPoint = false;
 
     bool mScalingActive = false;
 

diff --git a/tests/src/app/testqgsmaptoolscalefeature.cpp b/tests/src/app/testqgsmaptoolscalefeature.cpp
@@ -134,6 +134,10 @@ void TestQgsMapToolScaleFeature::testScaleFeature()
   utils.mouseClick( -2, -1, Qt::LeftButton, Qt::KeyboardModifiers(), true );
   utils.mouseMove( -2.5, -0.5 );
   utils.mouseClick( -2.5, -0.5, Qt::LeftButton, Qt::KeyboardModifiers(), true );
+
+  QCOMPARE( mLayerBase->getFeature( 1 ).geometry().asWkt( 2 ), QStringLiteral( "Polygon ((-2.5 -2.5, -2.5 -0.5, -0.5 -0.5, -0.5 -2.5, -2.5 -2.5))" ) );
+  QCOMPARE( mLayerBase->getFeature( 2 ).geometry().asWkt( 2 ), QStringLiteral( "Polygon ((1.1 0.8, 1.1 5, 2.1 5, 2.1 0.8, 1.1 0.8))" ) );
+
   //scale down
   utils.mouseClick( 1.1, 0.8, Qt::LeftButton, Qt::KeyboardModifiers(), true );
   utils.mouseMove( 1.35, 1.85 );