Skip to content

Commit

Permalink
clean up of QgisApp
Browse files Browse the repository at this point in the history
  • Loading branch information
@3nids
3nids committed Jan 28, 2022
1 parent 0aed1cc commit f0d9897
Show file tree
Hide file tree
Showing 5 changed files with 55 additions and 897 deletions.
78 changes: 0 additions & 78 deletions src/app/maptools/qgsappmaptools.cpp
View file
Expand Up @@ -26,27 +26,10 @@
#include "qgsmaptooltextannotation.h"
#include "qgsmaptoolhtmlannotation.h"
#include "qgsmaptoolannotation.h"
#include "qgsmaptoolcircle2points.h"
#include "qgsmaptoolcircle3points.h"
#include "qgsmaptoolcircle2tangentspoint.h"
#include "qgsmaptoolmeasureangle.h"
#include "qgsmaptoolmeasurebearing.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"
Expand All @@ -71,45 +54,9 @@
#include "qgsmaptoolpinlabels.h"
#include "qgsmaptooloffsetpointsymbol.h"
#include "qgsmaptooleditmeshframe.h"
#include "qgsspinbox.h"
#include "qgssettingsregistrycore.h"
#include "qgsmaptoolmodifyannotation.h"

//
// QgsStreamDigitizingSettingsAction
//

QgsStreamDigitizingSettingsAction::QgsStreamDigitizingSettingsAction( QWidget *parent )
: QWidgetAction( parent )
{
QGridLayout *gLayout = new QGridLayout();
gLayout->setContentsMargins( 3, 2, 3, 2 );

mStreamToleranceSpinBox = new QgsSpinBox();
mStreamToleranceSpinBox->setSuffix( tr( "px" ) );
mStreamToleranceSpinBox->setKeyboardTracking( false );
mStreamToleranceSpinBox->setRange( 1, 200 );
mStreamToleranceSpinBox->setWrapping( false );
mStreamToleranceSpinBox->setSingleStep( 1 );
mStreamToleranceSpinBox->setClearValue( 2 );
mStreamToleranceSpinBox->setValue( QgsSettingsRegistryCore::settingsDigitizingStreamTolerance.value() );

QLabel *label = new QLabel( tr( "Streaming Tolerance" ) );
gLayout->addWidget( label, 1, 0 );
gLayout->addWidget( mStreamToleranceSpinBox, 1, 1 );
connect( mStreamToleranceSpinBox, qOverload<int>( &QgsSpinBox::valueChanged ), this, [ = ]( int value )
{
QgsSettingsRegistryCore::settingsDigitizingStreamTolerance.setValue( value );
} );

QWidget *w = new QWidget( parent );
w->setLayout( gLayout );
setDefaultWidget( w );
}

QgsStreamDigitizingSettingsAction::~QgsStreamDigitizingSettingsAction() = default;


//
// QgsAppMapTools
//
Expand All @@ -131,25 +78,6 @@ QgsAppMapTools::QgsAppMapTools( QgsMapCanvas *canvas, QgsAdvancedDigitizingDockW
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 ) );
Expand Down Expand Up @@ -181,8 +109,6 @@ QgsAppMapTools::QgsAppMapTools( QgsMapCanvas *canvas, QgsAdvancedDigitizingDockW
mTools.insert( Tool::ChangeLabelProperties, new QgsMapToolChangeLabelProperties( canvas, cadDock ) );
mTools.insert( Tool::EditMeshFrame, new QgsMapToolEditMeshFrame( canvas ) );
mTools.insert( Tool::AnnotationEdit, new QgsMapToolModifyAnnotation( canvas, cadDock ) );

mStreamDigitizingSettingsAction = new QgsStreamDigitizingSettingsAction( QgisApp::instance() );
}

QgsAppMapTools::~QgsAppMapTools()
Expand Down Expand Up @@ -210,8 +136,4 @@ QList<QgsMapToolCapture *> QgsAppMapTools::captureTools() const
return res;
}

QWidgetAction *QgsAppMapTools::streamDigitizingSettingsAction()
{
return mStreamDigitizingSettingsAction;
}

40 changes: 0 additions & 40 deletions src/app/maptools/qgsappmaptools.h
View file
Expand Up @@ -19,29 +19,13 @@
#include <QList>
#include <QHash>
#include <QPointer>
#include <QWidgetAction>


class QgsMapTool;
class QgsMapToolCapture;

class QgsMapCanvas;
class QgsAdvancedDigitizingDockWidget;
class QgsSpinBox;

class QgsStreamDigitizingSettingsAction: public QWidgetAction
{
Q_OBJECT

public:

QgsStreamDigitizingSettingsAction( QWidget *parent = nullptr );
~QgsStreamDigitizingSettingsAction() override;

private:
QgsSpinBox *mStreamToleranceSpinBox = nullptr;
};


class QgsAppMapTools
{
Expand All @@ -58,24 +42,6 @@ class QgsAppMapTools
MeasureAngle,
MeasureBearing,
AddFeature,
CircularStringCurvePoint,
CircularStringRadius,
Circle2Points,
Circle3Points,
Circle3Tangents,
Circle2TangentsPoint,
CircleCenterPoint,
EllipseCenter2Points,
EllipseCenterPoint,
EllipseExtent,
EllipseFoci,
RectangleCenterPoint,
RectangleExtent,
Rectangle3PointsDistance,
Rectangle3PointsProjected,
RegularPolygon2Points,
RegularPolygonCenterPoint,
RegularPolygonCenterCorner,
MoveFeature,
MoveFeatureCopy,
OffsetCurve,
Expand Down Expand Up @@ -139,15 +105,9 @@ class QgsAppMapTools
*/
QList< QgsMapToolCapture * > captureTools() const;

/**
* Returns the stream digitizing settings action;
*/
QWidgetAction *streamDigitizingSettingsAction();

private:

QHash< Tool, QPointer< QgsMapTool > > mTools;
QgsStreamDigitizingSettingsAction *mStreamDigitizingSettingsAction = nullptr;

// Disable copying as we have pointer members.
QgsAppMapTools( const QgsAppMapTools & ) = delete;
Expand Down

0 comments on commit f0d9897

Please sign in to comment.