Skip to content

Commit

Permalink
Add snapindicator to shape tools (#8292)
Browse files Browse the repository at this point in the history
  • Loading branch information
@lbartoletti @3nids
lbartoletti authored and 3nids committed Oct 26, 2018
1 parent 547fdb8 commit 40e9406
Show file tree
Hide file tree
Showing 27 changed files with 91 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/app/qgsmaptooladdcircle.cpp
View file
Expand Up @@ -22,10 +22,12 @@
#include "qgsmapcanvas.h"
#include "qgspoint.h"
#include "qgisapp.h"
#include "qgssnapindicator.h"

QgsMapToolAddCircle::QgsMapToolAddCircle( QgsMapToolCapture *parentTool, QgsMapCanvas *canvas, CaptureMode mode )
: QgsMapToolCapture( canvas, QgisApp::instance()->cadDockWidget(), mode )
, mParentTool( parentTool )
, mSnapIndicator( qgis::make_unique< QgsSnapIndicator>( canvas ) )
{
clean();
connect( QgisApp::instance(), &QgisApp::newProject, this, &QgsMapToolAddCircle::stopCapturing );
Expand Down
4 changes: 4 additions & 0 deletions src/app/qgsmaptooladdcircle.h
View file
Expand Up @@ -21,6 +21,7 @@
#include "qgis_app.h"

class QgsGeometryRubberBand;
class QgsSnapIndicator;

struct EdgesOnlyFilter : public QgsPointLocator::MatchFilter
{
Expand Down Expand Up @@ -59,6 +60,9 @@ class APP_EXPORT QgsMapToolAddCircle: public QgsMapToolCapture
//! Layer type which will be used for rubberband
QgsWkbTypes::GeometryType mLayerType = QgsWkbTypes::LineGeometry;

//! Snapping indicators
std::unique_ptr<QgsSnapIndicator> mSnapIndicator;

};

#endif // QGSMAPTOOLADDCIRCLE_H
2 changes: 2 additions & 0 deletions src/app/qgsmaptooladdcircularstring.cpp
View file
Expand Up @@ -23,11 +23,13 @@
#include "qgsmapcanvas.h"
#include "qgspoint.h"
#include "qgisapp.h"
#include "qgssnapindicator.h"

QgsMapToolAddCircularString::QgsMapToolAddCircularString( QgsMapToolCapture *parentTool, QgsMapCanvas *canvas, CaptureMode mode )
: QgsMapToolCapture( canvas, QgisApp::instance()->cadDockWidget(), mode )
, mParentTool( parentTool )
, mShowCenterPointRubberBand( false )
, mSnapIndicator( qgis::make_unique< QgsSnapIndicator>( canvas ) )
{
connect( QgisApp::instance(), &QgisApp::newProject, this, &QgsMapToolAddCircularString::stopCapturing );
connect( QgisApp::instance(), &QgisApp::projectRead, this, &QgsMapToolAddCircularString::stopCapturing );
Expand Down
4 changes: 4 additions & 0 deletions src/app/qgsmaptooladdcircularstring.h
View file
Expand Up @@ -20,6 +20,7 @@
#include "qgis_app.h"

class QgsGeometryRubberBand;
class QgsSnapIndicator;

class APP_EXPORT QgsMapToolAddCircularString: public QgsMapToolCapture
{
Expand Down Expand Up @@ -61,6 +62,9 @@ class APP_EXPORT QgsMapToolAddCircularString: public QgsMapToolCapture
void removeCenterPointRubberBand();
//! Layer type which will be used for rubberband
QgsWkbTypes::GeometryType mLayerType = QgsWkbTypes::LineGeometry;

//! Snapping indicators
std::unique_ptr<QgsSnapIndicator> mSnapIndicator;
};

#endif // QGSMAPTOOLADDCIRCULARSTRING_H
2 changes: 2 additions & 0 deletions src/app/qgsmaptooladdellipse.cpp
View file
Expand Up @@ -22,10 +22,12 @@
#include "qgsmapcanvas.h"
#include "qgspoint.h"
#include "qgisapp.h"
#include "qgssnapindicator.h"

QgsMapToolAddEllipse::QgsMapToolAddEllipse( QgsMapToolCapture *parentTool, QgsMapCanvas *canvas, CaptureMode mode )
: QgsMapToolCapture( canvas, QgisApp::instance()->cadDockWidget(), mode )
, mParentTool( parentTool )
, mSnapIndicator( qgis::make_unique< QgsSnapIndicator>( canvas ) )
{
clean();
connect( QgisApp::instance(), &QgisApp::newProject, this, &QgsMapToolAddEllipse::stopCapturing );
Expand Down
4 changes: 4 additions & 0 deletions src/app/qgsmaptooladdellipse.h
View file
Expand Up @@ -22,6 +22,7 @@
#include "qgis_app.h"

class QgsGeometryRubberBand;
class QgsSnapIndicator;

class APP_EXPORT QgsMapToolAddEllipse: public QgsMapToolCapture
{
Expand Down Expand Up @@ -57,6 +58,9 @@ class APP_EXPORT QgsMapToolAddEllipse: public QgsMapToolCapture
//! Layer type which will be used for rubberband
QgsWkbTypes::GeometryType mLayerType = QgsWkbTypes::LineGeometry;

//! Snapping indicators
std::unique_ptr<QgsSnapIndicator> mSnapIndicator;

};

#endif // QGSMAPTOOLADDELLIPSE_H
2 changes: 2 additions & 0 deletions src/app/qgsmaptooladdrectangle.cpp
View file
Expand Up @@ -23,10 +23,12 @@
#include "qgsmapcanvas.h"
#include "qgspoint.h"
#include "qgisapp.h"
#include "qgssnapindicator.h"

QgsMapToolAddRectangle::QgsMapToolAddRectangle( QgsMapToolCapture *parentTool, QgsMapCanvas *canvas, CaptureMode mode )
: QgsMapToolCapture( canvas, QgisApp::instance()->cadDockWidget(), mode )
, mParentTool( parentTool )
, mSnapIndicator( qgis::make_unique< QgsSnapIndicator>( canvas ) )
{
clean();
connect( QgisApp::instance(), &QgisApp::newProject, this, &QgsMapToolAddRectangle::stopCapturing );
Expand Down
4 changes: 4 additions & 0 deletions src/app/qgsmaptooladdrectangle.h
View file
Expand Up @@ -22,6 +22,7 @@
#include "qgis_app.h"

class QgsPolygon;
class QgsSnapIndicator;

class APP_EXPORT QgsMapToolAddRectangle: public QgsMapToolCapture
{
Expand Down Expand Up @@ -80,6 +81,9 @@ class APP_EXPORT QgsMapToolAddRectangle: public QgsMapToolCapture
//! Layer type which will be used for rubberband
QgsWkbTypes::GeometryType mLayerType = QgsWkbTypes::LineGeometry;

//! Snapping indicators
std::unique_ptr<QgsSnapIndicator> mSnapIndicator;

private:
//! Convenient member for the azimuth of the rotated rectangle or when map is rotated.
double mAzimuth = 0.0;
Expand Down
2 changes: 2 additions & 0 deletions src/app/qgsmaptooladdregularpolygon.cpp
View file
Expand Up @@ -22,10 +22,12 @@
#include "qgspoint.h"
#include "qgisapp.h"
#include "qgsstatusbar.h"
#include "qgssnapindicator.h"

QgsMapToolAddRegularPolygon::QgsMapToolAddRegularPolygon( QgsMapToolCapture *parentTool, QgsMapCanvas *canvas, CaptureMode mode )
: QgsMapToolCapture( canvas, QgisApp::instance()->cadDockWidget(), mode )
, mParentTool( parentTool )
, mSnapIndicator( qgis::make_unique< QgsSnapIndicator>( canvas ) )
{
clean();
connect( QgisApp::instance(), &QgisApp::newProject, this, &QgsMapToolAddRegularPolygon::stopCapturing );
Expand Down
4 changes: 4 additions & 0 deletions src/app/qgsmaptooladdregularpolygon.h
View file
Expand Up @@ -22,6 +22,7 @@
#include "qgis_app.h"

class QSpinBox;
class QgsSnapIndicator;

class APP_EXPORT QgsMapToolAddRegularPolygon: public QgsMapToolCapture
{
Expand Down Expand Up @@ -65,6 +66,9 @@ class APP_EXPORT QgsMapToolAddRegularPolygon: public QgsMapToolCapture
//! Layer type which will be used for rubberband
QgsWkbTypes::GeometryType mLayerType = QgsWkbTypes::LineGeometry;

//! Snapping indicators
std::unique_ptr<QgsSnapIndicator> mSnapIndicator;

};

#endif // QGSMAPTOOLADDREGULARPOLYGON_H
4 changes: 4 additions & 0 deletions src/app/qgsmaptoolcircle2points.cpp
View file
Expand Up @@ -19,6 +19,7 @@
#include "qgsmapcanvas.h"
#include "qgspoint.h"
#include "qgsmapmouseevent.h"
#include "qgssnapindicator.h"


QgsMapToolCircle2Points::QgsMapToolCircle2Points( QgsMapToolCapture *parentTool,
Expand Down Expand Up @@ -56,6 +57,9 @@ void QgsMapToolCircle2Points::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
void QgsMapToolCircle2Points::cadCanvasMoveEvent( QgsMapMouseEvent *e )
{
QgsPoint point = mapPoint( *e );

mSnapIndicator->setMatch( e->mapPointMatch() );

if ( mTempRubberBand )
{
mCircle = QgsCircle().from2Points( mPoints.at( 0 ), point );
Expand Down
4 changes: 4 additions & 0 deletions src/app/qgsmaptoolcircle2tangentspoint.cpp
View file
Expand Up @@ -29,6 +29,7 @@
#include <memory>
#include "qgsmapmouseevent.h"
#include "qgsmessagebar.h"
#include "qgssnapindicator.h"

QgsMapToolCircle2TangentsPoint::QgsMapToolCircle2TangentsPoint( QgsMapToolCapture *parentTool,
QgsMapCanvas *canvas, CaptureMode mode )
Expand Down Expand Up @@ -102,6 +103,9 @@ void QgsMapToolCircle2TangentsPoint::cadCanvasReleaseEvent( QgsMapMouseEvent *e
void QgsMapToolCircle2TangentsPoint::cadCanvasMoveEvent( QgsMapMouseEvent *e )
{
QgsPoint mapPoint( e->mapPoint() );

mSnapIndicator->setMatch( e->mapPointMatch() );

EdgesOnlyFilter filter;
QgsPointLocator::Match match = mCanvas->snappingUtils()->snapToMap( mapPoint, &filter );

Expand Down
3 changes: 3 additions & 0 deletions src/app/qgsmaptoolcircle3points.cpp
View file
Expand Up @@ -20,6 +20,7 @@
#include "qgsmapcanvas.h"
#include "qgspoint.h"
#include "qgsmapmouseevent.h"
#include "qgssnapindicator.h"

QgsMapToolCircle3Points::QgsMapToolCircle3Points( QgsMapToolCapture *parentTool,
QgsMapCanvas *canvas, CaptureMode mode )
Expand Down Expand Up @@ -55,6 +56,8 @@ void QgsMapToolCircle3Points::cadCanvasMoveEvent( QgsMapMouseEvent *e )
{
QgsPoint point = mapPoint( *e );

mSnapIndicator->setMatch( e->mapPointMatch() );

if ( mTempRubberBand )
{
switch ( mPoints.size() )
Expand Down
4 changes: 4 additions & 0 deletions src/app/qgsmaptoolcircle3tangents.cpp
View file
Expand Up @@ -24,6 +24,7 @@
#include "qgisapp.h"
#include "qgsmapmouseevent.h"
#include "qgsmessagebar.h"
#include "qgssnapindicator.h"


QgsMapToolCircle3Tangents::QgsMapToolCircle3Tangents( QgsMapToolCapture *parentTool,
Expand Down Expand Up @@ -76,6 +77,9 @@ void QgsMapToolCircle3Tangents::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
void QgsMapToolCircle3Tangents::cadCanvasMoveEvent( QgsMapMouseEvent *e )
{
QgsPoint point = mapPoint( *e );

mSnapIndicator->setMatch( e->mapPointMatch() );

EdgesOnlyFilter filter;
QgsPointLocator::Match match = mCanvas->snappingUtils()->snapToMap( point, &filter );

Expand Down
4 changes: 4 additions & 0 deletions src/app/qgsmaptoolcirclecenterpoint.cpp
View file
Expand Up @@ -19,6 +19,7 @@
#include "qgsmapcanvas.h"
#include "qgspoint.h"
#include "qgsmapmouseevent.h"
#include "qgssnapindicator.h"


QgsMapToolCircleCenterPoint::QgsMapToolCircleCenterPoint( QgsMapToolCapture *parentTool,
Expand Down Expand Up @@ -57,6 +58,9 @@ void QgsMapToolCircleCenterPoint::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
void QgsMapToolCircleCenterPoint::cadCanvasMoveEvent( QgsMapMouseEvent *e )
{
QgsPoint point = mapPoint( *e );

mSnapIndicator->setMatch( e->mapPointMatch() );

if ( mTempRubberBand )
{
mCircle = QgsCircle().fromCenterPoint( mPoints.at( 0 ), point );
Expand Down
4 changes: 4 additions & 0 deletions src/app/qgsmaptoolcircularstringcurvepoint.cpp
View file
Expand Up @@ -19,6 +19,7 @@
#include "qgsmapcanvas.h"
#include "qgspoint.h"
#include "qgsmapmouseevent.h"
#include "qgssnapindicator.h"


QgsMapToolCircularStringCurvePoint::QgsMapToolCircularStringCurvePoint( QgsMapToolCapture *parentTool,
Expand Down Expand Up @@ -83,6 +84,9 @@ void QgsMapToolCircularStringCurvePoint::cadCanvasReleaseEvent( QgsMapMouseEvent
void QgsMapToolCircularStringCurvePoint::cadCanvasMoveEvent( QgsMapMouseEvent *e )
{
QgsPoint mapPoint( e->mapPoint() );

mSnapIndicator->setMatch( e->mapPointMatch() );

QgsVertexId idx( 0, 0, 1 + ( mPoints.size() + 1 ) % 2 );
if ( mTempRubberBand )
{
Expand Down
4 changes: 4 additions & 0 deletions src/app/qgsmaptoolcircularstringradius.cpp
View file
Expand Up @@ -23,6 +23,7 @@
#include "qgspoint.h"
#include "qgsstatusbar.h"
#include "qgsmapmouseevent.h"
#include "qgssnapindicator.h"

#include <QDoubleSpinBox>
#include <cmath>
Expand Down Expand Up @@ -96,6 +97,9 @@ void QgsMapToolCircularStringRadius::cadCanvasReleaseEvent( QgsMapMouseEvent *e

void QgsMapToolCircularStringRadius::cadCanvasMoveEvent( QgsMapMouseEvent *e )
{

mSnapIndicator->setMatch( e->mapPointMatch() );

if ( !mPoints.isEmpty() )
{
recalculateTempRubberBand( e->mapPoint() );
Expand Down
3 changes: 3 additions & 0 deletions src/app/qgsmaptoolellipsecenter2points.cpp
View file
Expand Up @@ -20,6 +20,7 @@
#include "qgsmapcanvas.h"
#include "qgspoint.h"
#include "qgsmapmouseevent.h"
#include "qgssnapindicator.h"
#include <memory>

QgsMapToolEllipseCenter2Points::QgsMapToolEllipseCenter2Points( QgsMapToolCapture *parentTool,
Expand Down Expand Up @@ -58,6 +59,8 @@ void QgsMapToolEllipseCenter2Points::cadCanvasMoveEvent( QgsMapMouseEvent *e )
{
QgsPoint point = mapPoint( *e );

mSnapIndicator->setMatch( e->mapPointMatch() );

if ( mTempRubberBand )
{
switch ( mPoints.size() )
Expand Down
4 changes: 4 additions & 0 deletions src/app/qgsmaptoolellipsecenterpoint.cpp
View file
Expand Up @@ -19,6 +19,7 @@
#include "qgsmapcanvas.h"
#include "qgspoint.h"
#include "qgsmapmouseevent.h"
#include "qgssnapindicator.h"


QgsMapToolEllipseCenterPoint::QgsMapToolEllipseCenterPoint( QgsMapToolCapture *parentTool,
Expand Down Expand Up @@ -54,6 +55,9 @@ void QgsMapToolEllipseCenterPoint::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
void QgsMapToolEllipseCenterPoint::cadCanvasMoveEvent( QgsMapMouseEvent *e )
{
QgsPoint point = mapPoint( *e );

mSnapIndicator->setMatch( e->mapPointMatch() );

if ( mTempRubberBand )
{
mEllipse = QgsEllipse().fromCenterPoint( mPoints.at( 0 ), point );
Expand Down
3 changes: 3 additions & 0 deletions src/app/qgsmaptoolellipseextent.cpp
View file
Expand Up @@ -21,6 +21,7 @@
#include "qgsgeometryutils.h"
#include "qgslinestring.h"
#include "qgsmapmouseevent.h"
#include "qgssnapindicator.h"


QgsMapToolEllipseExtent::QgsMapToolEllipseExtent( QgsMapToolCapture *parentTool,
Expand Down Expand Up @@ -57,6 +58,8 @@ void QgsMapToolEllipseExtent::cadCanvasMoveEvent( QgsMapMouseEvent *e )
{
QgsPoint point = mapPoint( *e );

mSnapIndicator->setMatch( e->mapPointMatch() );

if ( mTempRubberBand )
{
switch ( mPoints.size() )
Expand Down
3 changes: 3 additions & 0 deletions src/app/qgsmaptoolellipsefoci.cpp
View file
Expand Up @@ -20,6 +20,7 @@
#include "qgsmapcanvas.h"
#include "qgspoint.h"
#include "qgsmapmouseevent.h"
#include "qgssnapindicator.h"
#include <memory>

QgsMapToolEllipseFoci::QgsMapToolEllipseFoci( QgsMapToolCapture *parentTool,
Expand Down Expand Up @@ -56,6 +57,8 @@ void QgsMapToolEllipseFoci::cadCanvasMoveEvent( QgsMapMouseEvent *e )
{
QgsPoint point = mapPoint( *e );

mSnapIndicator->setMatch( e->mapPointMatch() );

if ( mTempRubberBand )
{
switch ( mPoints.size() )
Expand Down
3 changes: 3 additions & 0 deletions src/app/qgsmaptoolrectangle3points.cpp
View file
Expand Up @@ -22,6 +22,7 @@
#include "qgspoint.h"
#include "qgsmapmouseevent.h"
#include <memory>
#include "qgssnapindicator.h"

QgsMapToolRectangle3Points::QgsMapToolRectangle3Points( QgsMapToolCapture *parentTool,
QgsMapCanvas *canvas, CaptureMode mode )
Expand Down Expand Up @@ -58,6 +59,8 @@ void QgsMapToolRectangle3Points::cadCanvasMoveEvent( QgsMapMouseEvent *e )
{
QgsPoint point = mapPoint( *e );

mSnapIndicator->setMatch( e->mapPointMatch() );

if ( mTempRubberBand )
{
switch ( mPoints.size() )
Expand Down
3 changes: 3 additions & 0 deletions src/app/qgsmaptoolrectanglecenter.cpp
View file
Expand Up @@ -21,6 +21,7 @@
#include "qgslinestring.h"
#include "qgspoint.h"
#include "qgsmapmouseevent.h"
#include "qgssnapindicator.h"

#include <memory>

Expand Down Expand Up @@ -60,6 +61,8 @@ void QgsMapToolRectangleCenter::cadCanvasMoveEvent( QgsMapMouseEvent *e )
{
QgsPoint point = mapPoint( *e );

mSnapIndicator->setMatch( e->mapPointMatch() );

if ( mTempRubberBand )
{
switch ( mPoints.size() )
Expand Down

0 comments on commit 40e9406

Please sign in to comment.