Fix remaining rubber band

qgis · Oct 16, 2017 · c4a75f0 · c4a75f0
1 parent e208bc0
commit c4a75f0
Show file tree

Hide file tree

Showing 15 changed files with 55 additions and 32 deletions.
diff --git a/python/gui/qgsmapcanvas.sip b/python/gui/qgsmapcanvas.sip
@@ -268,7 +268,7 @@ Pan to the selected features of current (vector) layer keeping same extent.
 .. seealso:: flashFeatureIds()
 %End
 
-    void setMapTool( QgsMapTool *mapTool );
+    void setMapTool( QgsMapTool *mapTool, bool clean = false );
 %Docstring
  Sets the map tool currently being used on the canvas
 %End

diff --git a/python/gui/qgsmaptool.sip b/python/gui/qgsmaptool.sip
@@ -146,6 +146,11 @@ called when set as currently active map tool
     virtual void deactivate();
 %Docstring
 called when map tool is being deactivated
+%End
+
+    virtual void clean();
+%Docstring
+convenient method to clean members
 %End
 
     QgsMapCanvas *canvas();

diff --git a/python/gui/qgsmaptoolcapture.sip b/python/gui/qgsmaptoolcapture.sip
@@ -89,6 +89,11 @@ Adds a whole curve (e.g. circularstring) to the captured geometry. Curve must be
  Clean a temporary rubberband
 %End
 
+    virtual void clean();
+%Docstring
+convenient method to clean members
+%End
+
   protected:
 
     int nextPoint( const QgsPoint &mapPoint, QgsPoint &layerPoint );

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -1789,21 +1789,21 @@ void QgisApp::createActions()
   connect( mActionAddFeature, &QAction::triggered, this, &QgisApp::addFeature );
   connect( mActionCircularStringCurvePoint, &QAction::triggered, this, [ = ] { setMapTool( mMapTools.mCircularStringRadius ); } );
   connect( mActionCircularStringRadius, &QAction::triggered, this, [ = ] { setMapTool( mMapTools.mCircularStringRadius ); } );
-  connect( mActionCircle2Points, &QAction::triggered, this, [ = ] { setMapTool( mMapTools.mCircle2Points ); } );
-  connect( mActionCircle3Points, &QAction::triggered, this, [ = ] { setMapTool( mMapTools.mCircle3Points ); } );
-  connect( mActionCircle3Tangents, &QAction::triggered, this, [ = ] { setMapTool( mMapTools.mCircle3Tangents ); } );
-  connect( mActionCircle2TangentsPoint, &QAction::triggered, this, [ = ] { setMapTool( mMapTools.mCircle2TangentsPoint ); } );
-  connect( mActionCircleCenterPoint, &QAction::triggered, this,  [ = ] { setMapTool( mMapTools.mCircleCenterPoint ); } );
-  connect( mActionEllipseCenter2Points, &QAction::triggered, this,  [ = ] { setMapTool( mMapTools.mEllipseCenter2Points ); } );
-  connect( mActionEllipseCenterPoint, &QAction::triggered, this,  [ = ] { setMapTool( mMapTools.mEllipseCenterPoint ); } );
-  connect( mActionEllipseExtent, &QAction::triggered, this,  [ = ] { setMapTool( mMapTools.mEllipseExtent ); } );
-  connect( mActionEllipseFoci, &QAction::triggered, this,  [ = ] { setMapTool( mMapTools.mEllipseFoci ); } );
-  connect( mActionRectangleCenterPoint, &QAction::triggered, this,  [ = ] { setMapTool( mMapTools.mRectangleCenterPoint ); } );
-  connect( mActionRectangleExtent, &QAction::triggered, this,  [ = ] { setMapTool( mMapTools.mRectangleExtent ); } );
-  connect( mActionRectangle3Points, &QAction::triggered, this,  [ = ] { setMapTool( mMapTools.mRectangle3Points ); } );
-  connect( mActionRegularPolygon2Points, &QAction::triggered, this,  [ = ] { setMapTool( mMapTools.mRegularPolygon2Points ); } );
-  connect( mActionRegularPolygonCenterPoint, &QAction::triggered, this,  [ = ] { setMapTool( mMapTools.mRegularPolygonCenterPoint ); } );
-  connect( mActionRegularPolygonCenterCorner, &QAction::triggered, this,  [ = ] { setMapTool( mMapTools.mRegularPolygonCenterCorner ); } );
+  connect( mActionCircle2Points, &QAction::triggered, this, [ = ] { setMapTool( mMapTools.mCircle2Points, true ); } );
+  connect( mActionCircle3Points, &QAction::triggered, this, [ = ] { setMapTool( mMapTools.mCircle3Points, true ); } );
+  connect( mActionCircle3Tangents, &QAction::triggered, this, [ = ] { setMapTool( mMapTools.mCircle3Tangents, true ); } );
+  connect( mActionCircle2TangentsPoint, &QAction::triggered, this, [ = ] { setMapTool( mMapTools.mCircle2TangentsPoint, true ); } );
+  connect( mActionCircleCenterPoint, &QAction::triggered, this,  [ = ] { setMapTool( mMapTools.mCircleCenterPoint, true ); } );
+  connect( mActionEllipseCenter2Points, &QAction::triggered, this,  [ = ] { setMapTool( mMapTools.mEllipseCenter2Points, true ); } );
+  connect( mActionEllipseCenterPoint, &QAction::triggered, this,  [ = ] { setMapTool( mMapTools.mEllipseCenterPoint, true ); } );
+  connect( mActionEllipseExtent, &QAction::triggered, this,  [ = ] { setMapTool( mMapTools.mEllipseExtent, true ); } );
+  connect( mActionEllipseFoci, &QAction::triggered, this,  [ = ] { setMapTool( mMapTools.mEllipseFoci, true ); } );
+  connect( mActionRectangleCenterPoint, &QAction::triggered, this,  [ = ] { setMapTool( mMapTools.mRectangleCenterPoint, true ); } );
+  connect( mActionRectangleExtent, &QAction::triggered, this,  [ = ] { setMapTool( mMapTools.mRectangleExtent, true ); } );
+  connect( mActionRectangle3Points, &QAction::triggered, this,  [ = ] { setMapTool( mMapTools.mRectangle3Points, true ); } );
+  connect( mActionRegularPolygon2Points, &QAction::triggered, this,  [ = ] { setMapTool( mMapTools.mRegularPolygon2Points, true ); } );
+  connect( mActionRegularPolygonCenterPoint, &QAction::triggered, this,  [ = ] { setMapTool( mMapTools.mRegularPolygonCenterPoint, true ); } );
+  connect( mActionRegularPolygonCenterCorner, &QAction::triggered, this,  [ = ] { setMapTool( mMapTools.mRegularPolygonCenterCorner, true ); } );
   connect( mActionMoveFeature, &QAction::triggered, this, &QgisApp::moveFeature );
   connect( mActionMoveFeature, &QAction::triggered, this, &QgisApp::moveFeature );
   connect( mActionMoveFeatureCopy, &QAction::triggered, this, &QgisApp::moveFeatureCopy );
@@ -7801,9 +7801,9 @@ void QgisApp::addFeature()
   mMapCanvas->setMapTool( mMapTools.mAddFeature );
 }
 
-void QgisApp::setMapTool( QgsMapTool *tool )
+void QgisApp::setMapTool( QgsMapTool *tool, bool clean )
 {
-  mMapCanvas->setMapTool( tool );
+  mMapCanvas->setMapTool( tool, clean );
 }
 
 void QgisApp::selectFeatures()

diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
@@ -1261,7 +1261,7 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
     //! shows the snapping Options
     void snappingOptions();
     //! activates the tool
-    void setMapTool( QgsMapTool *tool );
+    void setMapTool( QgsMapTool *tool, bool clean = false );
 
 
     //! activates the rectangle selection tool

diff --git a/src/app/qgsmaptooladdcircle.h b/src/app/qgsmaptooladdcircle.h
@@ -39,6 +39,7 @@ class QgsMapToolAddCircle: public QgsMapToolCapture
 
     void deactivate() override;
     void activate() override;
+    void clean() override;
 
   protected:
     explicit QgsMapToolAddCircle( QgsMapCanvas *canvas ) = delete; //forbidden
@@ -55,9 +56,6 @@ class QgsMapToolAddCircle: public QgsMapToolCapture
     //! Circle
     QgsCircle mCircle;
 
-  private:
-    //! convenient method to clean members
-    void clean();
 };
 
 #endif // QGSMAPTOOLADDCIRCLE_H
diff --git a/src/app/qgsmaptooladdellipse.h b/src/app/qgsmaptooladdellipse.h
@@ -35,6 +35,7 @@ class QgsMapToolAddEllipse: public QgsMapToolCapture
     void deactivate() override;
 
     void activate() override;
+    void clean() override;
 
   protected:
     explicit QgsMapToolAddEllipse( QgsMapCanvas *canvas ) = delete; //forbidden
@@ -53,9 +54,6 @@ class QgsMapToolAddEllipse: public QgsMapToolCapture
     //! convenient method to return the number of segments
     unsigned int segments( ) { return QgsSettings().value( QStringLiteral( "/qgis/digitizing/offset_quad_seg" ), 8 ).toInt() * 12; }
 
-  private:
-    //! convenient method to clean members
-    void clean();
 };
 
 #endif // QGSMAPTOOLADDELLIPSE_H
diff --git a/src/app/qgsmaptooladdrectangle.h b/src/app/qgsmaptooladdrectangle.h
@@ -36,6 +36,7 @@ class QgsMapToolAddRectangle: public QgsMapToolCapture
     void deactivate( const bool isOriented = false );
 
     void activate() override;
+    void clean() override;
 
   protected:
     explicit QgsMapToolAddRectangle( QgsMapCanvas *canvas ) = delete; //forbidden
@@ -84,8 +85,6 @@ class QgsMapToolAddRectangle: public QgsMapToolCapture
     double mDistance2 = 0.0;
     //! Convenient member for the side where the second distance is drawn or when map is rotated.
     int mSide = 1;
-    //! convenient method to clean members
-    void clean();
 };
 
 #endif // QGSMAPTOOLADDRECTANGLE_H
diff --git a/src/app/qgsmaptooladdregularpolygon.h b/src/app/qgsmaptooladdregularpolygon.h
@@ -36,6 +36,7 @@ class QgsMapToolAddRegularPolygon: public QgsMapToolCapture
     void deactivate() override;
 
     void activate() override;
+    void clean() override;
 
   protected:
     explicit QgsMapToolAddRegularPolygon( QgsMapCanvas *canvas ) = delete; //forbidden
@@ -60,9 +61,6 @@ class QgsMapToolAddRegularPolygon: public QgsMapToolCapture
     //! Regular shape as a regular polygon
     QgsRegularPolygon mRegularPolygon;
 
-  private:
-    //! convenient method to clean members
-    void clean();
 };
 
 #endif // QGSMAPTOOLADDREGULARPOLYGON_H
diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
@@ -1599,13 +1599,16 @@ void QgsMapCanvas::mouseMoveEvent( QMouseEvent *e )
   emit xyCoordinates( coord );
 }
 
-void QgsMapCanvas::setMapTool( QgsMapTool *tool )
+void QgsMapCanvas::setMapTool( QgsMapTool *tool, bool clean )
 {
   if ( !tool )
     return;
 
   if ( mMapTool )
   {
+    if ( clean )
+      mMapTool->clean();
+
     disconnect( mMapTool, &QObject::destroyed, this, &QgsMapCanvas::mapToolDestroyed );
     mMapTool->deactivate();
   }

diff --git a/src/gui/qgsmapcanvas.h b/src/gui/qgsmapcanvas.h
@@ -269,7 +269,7 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
                           int flashes = 3, int duration = 500 );
 
     //! \brief Sets the map tool currently being used on the canvas
-    void setMapTool( QgsMapTool *mapTool );
+    void setMapTool( QgsMapTool *mapTool, bool clean = false );
 
     /** \brief Unset the current map tool or last non zoom tool
      *

diff --git a/src/gui/qgsmaptool.cpp b/src/gui/qgsmaptool.cpp
@@ -104,6 +104,11 @@ void QgsMapTool::deactivate()
   emit deactivated();
 }
 
+void QgsMapTool::clean()
+{
+
+}
+
 void QgsMapTool::setAction( QAction *action )
 {
   if ( mAction )

diff --git a/src/gui/qgsmaptool.h b/src/gui/qgsmaptool.h
@@ -149,6 +149,9 @@ class GUI_EXPORT QgsMapTool : public QObject
     //! called when map tool is being deactivated
     virtual void deactivate();
 
+    //! convenient method to clean members
+    virtual void clean();
+
     //! returns pointer to the tool's map canvas
     QgsMapCanvas *canvas();
 

diff --git a/src/gui/qgsmaptoolcapture.cpp b/src/gui/qgsmaptoolcapture.cpp
@@ -618,6 +618,12 @@ void QgsMapToolCapture::deleteTempRubberBand()
   }
 }
 
+void QgsMapToolCapture::clean()
+{
+  stopCapturing();
+  clearCurve();
+}
+
 void QgsMapToolCapture::closePolygon()
 {
   mCaptureCurve.close();

diff --git a/src/gui/qgsmaptoolcapture.h b/src/gui/qgsmaptoolcapture.h
@@ -104,6 +104,9 @@ class GUI_EXPORT QgsMapToolCapture : public QgsMapToolAdvancedDigitizing
      */
     void deleteTempRubberBand();
 
+    //! convenient method to clean members
+    virtual void clean() override;
+
   private slots:
     void validationFinished();
     void currentLayerChanged( QgsMapLayer *layer );