Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Cleanup map tools handling a bit, and fix a crash on exit
- Loading branch information
1 parent
c6370c7
commit f23f4e1
Showing
5 changed files
with
461 additions
and
425 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,162 @@ | ||
| /*************************************************************************** | ||
| qgsappmaptools.cpp | ||
| -------------------------------------- | ||
| Date : March 2021 | ||
| Copyright : (C) 2021 by Nyall Dawson | ||
| Email : nyall dot dawson at gmail dot com | ||
| *************************************************************************** | ||
| * * | ||
| * This program is free software; you can redistribute it and/or modify * | ||
| * it under the terms of the GNU General Public License as published by * | ||
| * the Free Software Foundation; either version 2 of the License, or * | ||
| * (at your option) any later version. * | ||
| * * | ||
| ***************************************************************************/ | ||
|
|
||
| #include "qgsappmaptools.h" | ||
| #include "qgsmaptool.h" | ||
| #include "qgsmaptoolselect.h" | ||
| #include "qgsmaptoolidentifyaction.h" | ||
| #include "qgsmaptooladdfeature.h" | ||
| #include "qgsmaptoolzoom.h" | ||
| #include "qgsmaptoolpan.h" | ||
| #include "qgsmaptoolfeatureaction.h" | ||
| #include "qgsmeasuretool.h" | ||
| #include "qgsmaptooltextannotation.h" | ||
| #include "qgsmaptoolhtmlannotation.h" | ||
| #include "qgsmaptoolannotation.h" | ||
| #include "qgsmaptoolcircle2points.h" | ||
| #include "qgsmaptoolcircle3points.h" | ||
| #include "qgsmaptoolcircle2tangentspoint.h" | ||
| #include "qgsmaptoolmeasureangle.h" | ||
| #include "qgsmaptoolformannotation.h" | ||
| #include "qgsmaptoolsvgannotation.h" | ||
| #include "qgsmaptoolcircularstringcurvepoint.h" | ||
| #include "qgsmaptoolcircularstringradius.h" | ||
| #include "qgsmaptoolcircle3tangents.h" | ||
| #include "qgsmaptoolcirclecenterpoint.h" | ||
| #include "qgsmaptoolellipsecenter2points.h" | ||
| #include "qgsmaptoolellipsecenterpoint.h" | ||
| #include "qgsmaptoolellipseextent.h" | ||
| #include "qgsmaptoolellipsefoci.h" | ||
| #include "qgsmaptoolrectangle3points.h" | ||
| #include "qgsmaptoolrectanglecenter.h" | ||
| #include "qgsmaptoolrectangleextent.h" | ||
| #include "qgsmaptoolregularpolygon2points.h" | ||
| #include "qgsmaptoolregularpolygoncentercorner.h" | ||
| #include "qgsmaptoolregularpolygoncenterpoint.h" | ||
| #include "qgsmaptoolrotatefeature.h" | ||
| #include "qgsmaptoolscalefeature.h" | ||
| #include "qgsmaptoolmovefeature.h" | ||
| #include "qgsmaptooloffsetcurve.h" | ||
| #include "qgsmaptoolreshape.h" | ||
| #include "qgsmaptoolsplitfeatures.h" | ||
| #include "qgsmaptoolsplitparts.h" | ||
| #include "qgsmaptoolreverseline.h" | ||
| #include "qgsmaptooladdring.h" | ||
| #include "qgsmaptoolfillring.h" | ||
| #include "qgsmaptoolsimplify.h" | ||
| #include "qgsmaptooldeletepart.h" | ||
| #include "qgsmaptooldeletering.h" | ||
| #include "qgsmaptooladdpart.h" | ||
| #include "vertextool/qgsvertextool.h" | ||
| #include "qgsmaptoolrotatepointsymbols.h" | ||
| #include "qgsmaptoolrotatelabel.h" | ||
| #include "qgsmaptooltrimextendfeature.h" | ||
| #include "qgsmaptoolshowhidelabels.h" | ||
| #include "qgsmaptoolmovelabel.h" | ||
| #include "qgsmaptoolchangelabelproperties.h" | ||
| #include "qgsmaptoolpinlabels.h" | ||
| #include "qgsmaptooloffsetpointsymbol.h" | ||
|
|
||
| QgsAppMapTools::QgsAppMapTools( QgsMapCanvas *canvas, QgsAdvancedDigitizingDockWidget *cadDock ) | ||
| { | ||
| mTools.insert( Tool::ZoomIn, new QgsMapToolZoom( canvas, false /* zoomIn */ ) ); | ||
| mTools.insert( Tool::ZoomOut, new QgsMapToolZoom( canvas, true /* zoomOut */ ) ); | ||
| mTools.insert( Tool::Pan, new QgsMapToolPan( canvas ) ); | ||
| mTools.insert( Tool::Identify, new QgsMapToolIdentifyAction( canvas ) ); | ||
| mTools.insert( Tool::FeatureAction, new QgsMapToolFeatureAction( canvas ) ); | ||
| mTools.insert( Tool::MeasureDistance, new QgsMeasureTool( canvas, false /* area */ ) ); | ||
| mTools.insert( Tool::MeasureArea, new QgsMeasureTool( canvas, true /* area */ ) ); | ||
| mTools.insert( Tool::MeasureAngle, new QgsMapToolMeasureAngle( canvas ) ); | ||
| mTools.insert( Tool::TextAnnotation, new QgsMapToolTextAnnotation( canvas ) ); | ||
| mTools.insert( Tool::FormAnnotation, new QgsMapToolFormAnnotation( canvas ) ); | ||
| mTools.insert( Tool::HtmlAnnotation, new QgsMapToolHtmlAnnotation( canvas ) ); | ||
| mTools.insert( Tool::SvgAnnotation, new QgsMapToolSvgAnnotation( canvas ) ); | ||
| mTools.insert( Tool::Annotation, new QgsMapToolAnnotation( canvas ) ); | ||
| mTools.insert( Tool::AddFeature, new QgsMapToolAddFeature( canvas, QgsMapToolCapture::CaptureNone ) ); | ||
| QgsMapToolCapture *addFeatureTool = qobject_cast< QgsMapToolCapture *>( mTools.value( Tool::AddFeature ) ); | ||
| mTools.insert( Tool::CircularStringCurvePoint, new QgsMapToolCircularStringCurvePoint( addFeatureTool, canvas ) ); | ||
| mTools.insert( Tool::CircularStringRadius, new QgsMapToolCircularStringRadius( addFeatureTool, canvas ) ); | ||
| mTools.insert( Tool::Circle2Points, new QgsMapToolCircle2Points( addFeatureTool, canvas ) ); | ||
| mTools.insert( Tool::Circle3Points, new QgsMapToolCircle3Points( addFeatureTool, canvas ) ); | ||
| mTools.insert( Tool::Circle3Tangents, new QgsMapToolCircle3Tangents( addFeatureTool, canvas ) ); | ||
| mTools.insert( Tool::Circle2TangentsPoint, new QgsMapToolCircle2TangentsPoint( addFeatureTool, canvas ) ); | ||
| mTools.insert( Tool::CircleCenterPoint, new QgsMapToolCircleCenterPoint( addFeatureTool, canvas ) ); | ||
| mTools.insert( Tool::EllipseCenter2Points, new QgsMapToolEllipseCenter2Points( addFeatureTool, canvas ) ); | ||
| mTools.insert( Tool::EllipseCenterPoint, new QgsMapToolEllipseCenterPoint( addFeatureTool, canvas ) ); | ||
| mTools.insert( Tool::EllipseExtent, new QgsMapToolEllipseExtent( addFeatureTool, canvas ) ); | ||
| mTools.insert( Tool::EllipseFoci, new QgsMapToolEllipseFoci( addFeatureTool, canvas ) ); | ||
| mTools.insert( Tool::RectangleCenterPoint, new QgsMapToolRectangleCenter( addFeatureTool, canvas ) ); | ||
| mTools.insert( Tool::RectangleExtent, new QgsMapToolRectangleExtent( addFeatureTool, canvas ) ); | ||
| mTools.insert( Tool::Rectangle3PointsDistance, new QgsMapToolRectangle3Points( addFeatureTool, canvas, QgsMapToolRectangle3Points::DistanceMode ) ); | ||
| mTools.insert( Tool::Rectangle3PointsProjected, new QgsMapToolRectangle3Points( addFeatureTool, canvas, QgsMapToolRectangle3Points::ProjectedMode ) ); | ||
| mTools.insert( Tool::RegularPolygon2Points, new QgsMapToolRegularPolygon2Points( addFeatureTool, canvas ) ); | ||
| mTools.insert( Tool::RegularPolygonCenterPoint, new QgsMapToolRegularPolygonCenterPoint( addFeatureTool, canvas ) ); | ||
| mTools.insert( Tool::RegularPolygonCenterCorner, new QgsMapToolRegularPolygonCenterCorner( addFeatureTool, canvas ) ); | ||
| mTools.insert( Tool::MoveFeature, new QgsMapToolMoveFeature( canvas, QgsMapToolMoveFeature::Move ) ); | ||
| mTools.insert( Tool::MoveFeatureCopy, new QgsMapToolMoveFeature( canvas, QgsMapToolMoveFeature::CopyMove ) ); | ||
| mTools.insert( Tool::RotateFeature, new QgsMapToolRotateFeature( canvas ) ); | ||
| mTools.insert( Tool::ScaleFeature, new QgsMapToolScaleFeature( canvas ) ); | ||
| mTools.insert( Tool::OffsetCurve, new QgsMapToolOffsetCurve( canvas ) ); | ||
| mTools.insert( Tool::ReshapeFeatures, new QgsMapToolReshape( canvas ) ); | ||
| mTools.insert( Tool::ReverseLine, new QgsMapToolReverseLine( canvas ) ); | ||
| mTools.insert( Tool::SplitFeatures, new QgsMapToolSplitFeatures( canvas ) ); | ||
| mTools.insert( Tool::SplitParts, new QgsMapToolSplitParts( canvas ) ); | ||
| mTools.insert( Tool::SelectFeatures, new QgsMapToolSelect( canvas ) ); | ||
| mTools.insert( Tool::SelectPolygon, new QgsMapToolSelect( canvas ) ); | ||
| mTools.insert( Tool::SelectFreehand, new QgsMapToolSelect( canvas ) ); | ||
| mTools.insert( Tool::SelectRadius, new QgsMapToolSelect( canvas ) ); | ||
| mTools.insert( Tool::AddRing, new QgsMapToolAddRing( canvas ) ); | ||
| mTools.insert( Tool::FillRing, new QgsMapToolFillRing( canvas ) ); | ||
| mTools.insert( Tool::AddPart, new QgsMapToolAddPart( canvas ) ); | ||
| mTools.insert( Tool::SimplifyFeature, new QgsMapToolSimplify( canvas ) ); | ||
| mTools.insert( Tool::DeleteRing, new QgsMapToolDeleteRing( canvas ) ); | ||
| mTools.insert( Tool::DeletePart, new QgsMapToolDeletePart( canvas ) ); | ||
| mTools.insert( Tool::VertexTool, new QgsVertexTool( canvas, cadDock ) ); | ||
| mTools.insert( Tool::VertexToolActiveLayer, new QgsVertexTool( canvas, cadDock, QgsVertexTool::ActiveLayer ) ); | ||
| mTools.insert( Tool::RotatePointSymbolsTool, new QgsMapToolRotatePointSymbols( canvas ) ); | ||
| mTools.insert( Tool::OffsetPointSymbolTool, new QgsMapToolOffsetPointSymbol( canvas ) ); | ||
| mTools.insert( Tool::TrimExtendFeature, new QgsMapToolTrimExtendFeature( canvas ) ); | ||
| mTools.insert( Tool::PinLabels, new QgsMapToolPinLabels( canvas, cadDock ) ); | ||
| mTools.insert( Tool::ShowHideLabels, new QgsMapToolShowHideLabels( canvas, cadDock ) ); | ||
| mTools.insert( Tool::MoveLabel, new QgsMapToolMoveLabel( canvas, cadDock ) ); | ||
| mTools.insert( Tool::RotateLabel, new QgsMapToolRotateLabel( canvas, cadDock ) ); | ||
| mTools.insert( Tool::ChangeLabelProperties, new QgsMapToolChangeLabelProperties( canvas, cadDock ) ); | ||
| } | ||
|
|
||
| QgsAppMapTools::~QgsAppMapTools() | ||
| { | ||
| for ( auto it = mTools.constBegin(); it != mTools.constEnd(); ++it ) | ||
| { | ||
| delete it.value(); | ||
| } | ||
| } | ||
|
|
||
| QgsMapTool *QgsAppMapTools::mapTool( QgsAppMapTools::Tool tool ) | ||
| { | ||
| return mTools.value( tool ); | ||
| } | ||
|
|
||
|
|
||
| QList<QgsMapToolCapture *> QgsAppMapTools::captureTools() const | ||
| { | ||
| QList< QgsMapToolCapture * > res; | ||
| for ( auto it = mTools.constBegin(); it != mTools.constEnd(); ++it ) | ||
| { | ||
| if ( QgsMapToolCapture *captureTool = qobject_cast< QgsMapToolCapture * >( it.value() ) ) | ||
| res << captureTool; | ||
| } | ||
| return res; | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,128 @@ | ||
| /*************************************************************************** | ||
| qgsappmaptools.h | ||
| -------------------------------------- | ||
| Date : March 2021 | ||
| Copyright : (C) 2021 by Nyall Dawson | ||
| Email : nyall dot dawson at gmail dot com | ||
| *************************************************************************** | ||
| * * | ||
| * This program is free software; you can redistribute it and/or modify * | ||
| * it under the terms of the GNU General Public License as published by * | ||
| * the Free Software Foundation; either version 2 of the License, or * | ||
| * (at your option) any later version. * | ||
| * * | ||
| ***************************************************************************/ | ||
|
|
||
| #ifndef QGSAPPMAPTOOLS_H | ||
| #define QGSAPPMAPTOOLS_H | ||
|
|
||
| #include <QList> | ||
| #include <QHash> | ||
| #include <QPointer> | ||
|
|
||
| class QgsMapTool; | ||
| class QgsMapToolCapture; | ||
|
|
||
| class QgsMapCanvas; | ||
| class QgsAdvancedDigitizingDockWidget; | ||
|
|
||
| class QgsAppMapTools | ||
| { | ||
| public: | ||
| enum Tool | ||
| { | ||
| ZoomIn, | ||
| ZoomOut, | ||
| Pan, | ||
| Identify, | ||
| FeatureAction, | ||
| MeasureDistance, | ||
| MeasureArea, | ||
| MeasureAngle, | ||
| AddFeature, | ||
| CircularStringCurvePoint, | ||
| CircularStringRadius, | ||
| Circle2Points, | ||
| Circle3Points, | ||
| Circle3Tangents, | ||
| Circle2TangentsPoint, | ||
| CircleCenterPoint, | ||
| EllipseCenter2Points, | ||
| EllipseCenterPoint, | ||
| EllipseExtent, | ||
| EllipseFoci, | ||
| RectangleCenterPoint, | ||
| RectangleExtent, | ||
| Rectangle3PointsDistance, | ||
| Rectangle3PointsProjected, | ||
| RegularPolygon2Points, | ||
| RegularPolygonCenterPoint, | ||
| RegularPolygonCenterCorner, | ||
| MoveFeature, | ||
| MoveFeatureCopy, | ||
| OffsetCurve, | ||
| ReshapeFeatures, | ||
| SplitFeatures, | ||
| SplitParts, | ||
| SelectFeatures, | ||
| SelectPolygon, | ||
| SelectFreehand, | ||
| SelectRadius, | ||
| VertexAdd, | ||
| VertexMove, | ||
| VertexDelete, | ||
| AddRing, | ||
| FillRing, | ||
| AddPart, | ||
| SimplifyFeature, | ||
| DeleteRing, | ||
| DeletePart, | ||
| VertexTool, | ||
| VertexToolActiveLayer, | ||
| RotatePointSymbolsTool, | ||
| OffsetPointSymbolTool, | ||
| Annotation, | ||
| FormAnnotation, | ||
| HtmlAnnotation, | ||
| SvgAnnotation, | ||
| TextAnnotation, | ||
| PinLabels, | ||
| ShowHideLabels, | ||
| MoveLabel, | ||
| RotateFeature, | ||
| ScaleFeature, | ||
| RotateLabel, | ||
| ChangeLabelProperties, | ||
| ReverseLine, | ||
| TrimExtendFeature, | ||
| }; | ||
|
|
||
| QgsAppMapTools( QgsMapCanvas *canvas, QgsAdvancedDigitizingDockWidget *cadDock ); | ||
| ~QgsAppMapTools(); | ||
|
|
||
| /** | ||
| * Returns the specified \a tool. | ||
| */ | ||
| QgsMapTool *mapTool( Tool tool ); | ||
|
|
||
| /** | ||
| * Returns the specified \a tool. | ||
| */ | ||
| template <class ToolType> ToolType *mapTool( Tool tool ) | ||
| { | ||
| QgsMapTool *t = mapTool( tool ); | ||
| return qobject_cast< ToolType * >( t ); | ||
| } | ||
|
|
||
| /** | ||
| * Returns a list of all QgsMapToolCapture derived tools. | ||
| */ | ||
| QList< QgsMapToolCapture * > captureTools() const; | ||
|
|
||
| private: | ||
|
|
||
| QHash< Tool, QPointer< QgsMapTool > > mTools; | ||
|
|
||
| }; | ||
|
|
||
| #endif // QGSAPPMAPTOOLS_H |
Oops, something went wrong.