sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

- Add Signals start/stopCapturing

Browse Source 
- fix QSpinBox -> QgsSpinBox
This commit is contained in:
lbartoletti 2017-10-22 22:03:27 +02:00
parent 64cd1c5436
commit 16cad4d14f
6 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/qgsmaptooladdcircle.cpp
View File

@ -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()

18
src/app/qgsmaptooladdcircularstring.cpp
View File

@ -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 )
{

2
src/app/qgsmaptooladdellipse.cpp
View File

@ -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()

2
src/app/qgsmaptooladdrectangle.cpp
View File

@ -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 )

3
src/app/qgsmaptooladdregularpolygon.cpp
View File

@ -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()

4
src/app/qgsmaptooladdregularpolygon.h
View File

@ -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