Requests for QgsMapToolCircle2TangentsPoint

qgis · Oct 9, 2017 · e320565 · e320565
1 parent d72eebd
commit e320565
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/src/app/qgsmaptoolcircle2tangentspoint.cpp b/src/app/qgsmaptoolcircle2tangentspoint.cpp
@@ -24,20 +24,19 @@
 #include "qgsstatusbar.h"
 #include "qgslinestring.h"
 #include "qgsmultipolygon.h"
+#include "qgsspinbox.h"
 #include <memory>
 #include <QMouseEvent>
 
 QgsMapToolCircle2TangentsPoint::QgsMapToolCircle2TangentsPoint( QgsMapToolCapture *parentTool,
     QgsMapCanvas *canvas, CaptureMode mode )
   : QgsMapToolAddCircle( parentTool, canvas, mode )
 {
-  mCenters.clear();
 }
 
 QgsMapToolCircle2TangentsPoint::~QgsMapToolCircle2TangentsPoint()
 {
   deleteRadiusSpinBox();
-  mCenters.clear();
 }
 
 void QgsMapToolCircle2TangentsPoint::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
@@ -83,10 +82,7 @@ void QgsMapToolCircle2TangentsPoint::cadCanvasReleaseEvent( QgsMapMouseEvent *e
       mTempRubberBand = nullptr;
     }
 
-    for ( int i = 0; i < mRubberBands.size() ; ++i )
-    {
-      delete mRubberBands.at( i );
-    }
+    qDeleteAll( mRubberBands );
     mRubberBands.clear();
 
     deactivate();
@@ -226,7 +222,7 @@ void QgsMapToolCircle2TangentsPoint::getPossibleCenter( )
 void QgsMapToolCircle2TangentsPoint::createRadiusSpinBox()
 {
   deleteRadiusSpinBox();
-  mRadiusSpinBox = new QSpinBox();
+  mRadiusSpinBox = new QgsSpinBox();
   mRadiusSpinBox->setMaximum( 99999999 );
   mRadiusSpinBox->setMinimum( 0 );
   mRadiusSpinBox->setPrefix( tr( "Radius of the circle: " ) );
@@ -240,7 +236,6 @@ void QgsMapToolCircle2TangentsPoint::deleteRadiusSpinBox()
 {
   if ( mRadiusSpinBox )
   {
-    QgisApp::instance()->statusBarIface()->removeWidget( mRadiusSpinBox );
     delete mRadiusSpinBox;
     mRadiusSpinBox = nullptr;
   }
@@ -251,10 +246,7 @@ void QgsMapToolCircle2TangentsPoint::radiusSpinBoxChanged( int radius )
   mRadius = radius;
   getPossibleCenter( );
 
-  for ( int i = 0; i < mRubberBands.size() ; ++i )
-  {
-    delete mRubberBands.at( i );
-  }
+  qDeleteAll( mRubberBands );
   mRubberBands.clear();
   if ( mTempRubberBand )
   {

diff --git a/src/app/qgsmaptoolcircle2tangentspoint.h b/src/app/qgsmaptoolcircle2tangentspoint.h
@@ -32,7 +32,7 @@ class QgsMapToolCircle2TangentsPoint: public QgsMapToolAddCircle
     ~QgsMapToolCircle2TangentsPoint();
 
     void cadCanvasReleaseEvent( QgsMapMouseEvent *e ) override;
-    void cadCanvasMoveEvent( QgsMapMouseEvent *e );
+    void cadCanvasMoveEvent( QgsMapMouseEvent *e ) override;
 
   public slots:
     void radiusSpinBoxChanged( int radius );