- Add Signals start/stopCapturing

- fix QSpinBox -> QgsSpinBox
qgis · Oct 22, 2017 · 16cad4d · 16cad4d
1 parent 64cd1c5
commit 16cad4d
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 21 deletions.
diff --git a/src/app/qgsmaptooladdcircle.cpp b/src/app/qgsmaptooladdcircle.cpp
@@ -28,6 +28,8 @@ QgsMapToolAddCircle::QgsMapToolAddCircle( QgsMapToolCapture *parentTool, QgsMapC
   , mParentTool( parentTool )
 {
   clean();
+  connect( QgisApp::instance(), &QgisApp::newProject, this, &QgsMapToolAddCircle::stopCapturing );
+  connect( QgisApp::instance(), &QgisApp::projectRead, this, &QgsMapToolAddCircle::stopCapturing );
 }
 
 QgsMapToolAddCircle::~QgsMapToolAddCircle()

diff --git a/src/app/qgsmaptooladdcircularstring.cpp b/src/app/qgsmaptooladdcircularstring.cpp
@@ -29,10 +29,6 @@ QgsMapToolAddCircularString::QgsMapToolAddCircularString( QgsMapToolCapture *par
   , mParentTool( parentTool )
   , mShowCenterPointRubberBand( false )
 {
-  /* if ( mCanvas )
-   {
-     connect( mCanvas, &QgsMapCanvas::mapToolSet, this, &QgsMapToolAddCircularString::setParentTool );
-   }*/
   connect( QgisApp::instance(), &QgisApp::newProject, this, &QgsMapToolAddCircularString::stopCapturing );
   connect( QgisApp::instance(), &QgisApp::projectRead, this, &QgsMapToolAddCircularString::stopCapturing );
 }
@@ -43,20 +39,6 @@ QgsMapToolAddCircularString::~QgsMapToolAddCircularString()
   delete mTempRubberBand;
   removeCenterPointRubberBand();
 }
-/*
-void QgsMapToolAddCircularString::setParentTool( QgsMapTool *newTool, QgsMapTool *oldTool )
-{
-  QgsMapToolCapture *tool = dynamic_cast<QgsMapToolCapture *>( oldTool );
-  QgsMapToolAddCircularString *csTool = dynamic_cast<QgsMapToolAddCircularString *>( oldTool );
-  if ( csTool && newTool == this )
-  {
-    mParentTool = csTool->mParentTool;
-  }
-  else if ( tool && newTool == this )
-  {
-    mParentTool = tool;
-  }
-}*/
 
 void QgsMapToolAddCircularString::keyPressEvent( QKeyEvent *e )
 {

diff --git a/src/app/qgsmaptooladdellipse.cpp b/src/app/qgsmaptooladdellipse.cpp
@@ -28,6 +28,8 @@ QgsMapToolAddEllipse::QgsMapToolAddEllipse( QgsMapToolCapture *parentTool, QgsMa
   , mParentTool( parentTool )
 {
   clean();
+  connect( QgisApp::instance(), &QgisApp::newProject, this, &QgsMapToolAddEllipse::stopCapturing );
+  connect( QgisApp::instance(), &QgisApp::projectRead, this, &QgsMapToolAddEllipse::stopCapturing );
 }
 
 QgsMapToolAddEllipse::~QgsMapToolAddEllipse()

diff --git a/src/app/qgsmaptooladdrectangle.cpp b/src/app/qgsmaptooladdrectangle.cpp
@@ -29,6 +29,8 @@ QgsMapToolAddRectangle::QgsMapToolAddRectangle( QgsMapToolCapture *parentTool, Q
   , mParentTool( parentTool )
 {
   clean();
+  connect( QgisApp::instance(), &QgisApp::newProject, this, &QgsMapToolAddRectangle::stopCapturing );
+  connect( QgisApp::instance(), &QgisApp::projectRead, this, &QgsMapToolAddRectangle::stopCapturing );
 }
 
 void QgsMapToolAddRectangle::setAzimuth( const double azimuth )

diff --git a/src/app/qgsmaptooladdregularpolygon.cpp b/src/app/qgsmaptooladdregularpolygon.cpp
@@ -22,13 +22,14 @@
 #include "qgspoint.h"
 #include "qgisapp.h"
 #include "qgsstatusbar.h"
-#include "qgsspinbox.h"
 
 QgsMapToolAddRegularPolygon::QgsMapToolAddRegularPolygon( QgsMapToolCapture *parentTool, QgsMapCanvas *canvas, CaptureMode mode )
   : QgsMapToolCapture( canvas, QgisApp::instance()->cadDockWidget(), mode )
   , mParentTool( parentTool )
 {
   clean();
+  connect( QgisApp::instance(), &QgisApp::newProject, this, &QgsMapToolAddRegularPolygon::stopCapturing );
+  connect( QgisApp::instance(), &QgisApp::projectRead, this, &QgsMapToolAddRegularPolygon::stopCapturing );
 }
 
 QgsMapToolAddRegularPolygon::~QgsMapToolAddRegularPolygon()

diff --git a/src/app/qgsmaptooladdregularpolygon.h b/src/app/qgsmaptooladdregularpolygon.h
@@ -18,7 +18,7 @@
 
 #include "qgsregularpolygon.h"
 #include "qgsmaptoolcapture.h"
-#include "qspinbox.h"
+#include "qgsspinbox.h"
 
 class QSpinBox;
 
@@ -41,7 +41,7 @@ class QgsMapToolAddRegularPolygon: public QgsMapToolCapture
   protected:
     explicit QgsMapToolAddRegularPolygon( QgsMapCanvas *canvas ) = delete; //forbidden
 
-    std::unique_ptr<QSpinBox> mNumberSidesSpinBox;
+    std::unique_ptr<QgsSpinBox> mNumberSidesSpinBox;
     int mNumberSides = 6;
 
     //! (re-)create the spin box to enter the number of sides