Skip to content

Commit

Permalink
Expose shape digitizing methods to QgisInterface
Browse files Browse the repository at this point in the history
  • Loading branch information
@lbartoletti @nyalldawson
lbartoletti authored and nyalldawson committed Jan 7, 2020
1 parent faa7248 commit 2b031cf
Show file tree
Hide file tree
Showing 5 changed files with 85 additions and 1 deletion.
17 changes: 17 additions & 0 deletions python/gui/auto_generated/qgisinterface.sip.in
View file
Expand Up @@ -599,6 +599,23 @@ Returns the Hide Deselected Layers action.
virtual QAction *actionCheckQgisVersion() = 0;
virtual QAction *actionAbout() = 0;

virtual QAction *actionCircle2Points() = 0;
virtual QAction *actionCircle3Points() = 0;
virtual QAction *actionCircle3Tangents() = 0;
virtual QAction *actionCircle2TangentsPoint() = 0;
virtual QAction *actionCircleCenterPoint() = 0;
virtual QAction *actionEllipseCenter2Points() = 0;
virtual QAction *actionEllipseCenterPoint() = 0;
virtual QAction *actionEllipseExtent() = 0;
virtual QAction *actionEllipseFoci() = 0;
virtual QAction *actionRectangleCenterPoint() = 0;
virtual QAction *actionRectangleExtent() = 0;
virtual QAction *actionRectangle3PointsDistance() = 0;
virtual QAction *actionRectangle3PointsProjected() = 0;
virtual QAction *actionRegularPolygon2Points() = 0;
virtual QAction *actionRegularPolygonCenterPoint() = 0;
virtual QAction *actionRegularPolygonCenterCorner() = 0;

virtual QgsVectorLayerTools *vectorLayerTools() = 0;
%Docstring
Access the vector layer tools instance.
Expand Down
17 changes: 17 additions & 0 deletions src/app/qgisapp.h
View file
Expand Up @@ -482,6 +482,23 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
QAction *actionShowBookmarks() { return mActionShowBookmarks; }
QAction *actionShowBookmarkManager() { return mActionShowBookmarkManager; }
QAction *actionDraw() { return mActionDraw; }
QAction *actionCircle2Points() { return mActionCircle2Points ; }
QAction *actionCircle3Points() { return mActionCircle3Points ; }
QAction *actionCircle3Tangents() { return mActionCircle3Tangents ; }
QAction *actionCircle2TangentsPoint() { return mActionCircle2TangentsPoint ; }
QAction *actionCircleCenterPoint() { return mActionCircleCenterPoint ; }
QAction *actionEllipseCenter2Points() { return mActionEllipseCenter2Points ; }
QAction *actionEllipseCenterPoint() { return mActionEllipseCenterPoint ; }
QAction *actionEllipseExtent() { return mActionEllipseExtent ; }
QAction *actionEllipseFoci() { return mActionEllipseFoci ; }
QAction *actionRectangleCenterPoint() { return mActionRectangleCenterPoint ; }
QAction *actionRectangleExtent() { return mActionRectangleExtent ; }
QAction *actionRectangle3PointsDistance() { return mActionRectangle3PointsDistance ; }
QAction *actionRectangle3PointsProjected() { return mActionRectangle3PointsProjected ; }
QAction *actionRegularPolygon2Points() { return mActionRegularPolygon2Points ; }
QAction *actionRegularPolygonCenterPoint() { return mActionRegularPolygonCenterPoint ; }
QAction *actionRegularPolygonCenterCorner() { return mActionRegularPolygonCenterCorner ; }


QAction *actionDataSourceManager() { return mActionDataSourceManager; }
QAction *actionNewVectorLayer() { return mActionNewVectorLayer; }
Expand Down
17 changes: 16 additions & 1 deletion src/app/qgisappinterface.cpp
View file
Expand Up @@ -637,7 +637,22 @@ QAction *QgisAppInterface::actionMapTips() { return qgis->actionMapTips(); }
QAction *QgisAppInterface::actionNewBookmark() { return qgis->actionNewBookmark(); }
QAction *QgisAppInterface::actionShowBookmarks() { return qgis->actionShowBookmarks(); }
QAction *QgisAppInterface::actionDraw() { return qgis->actionDraw(); }

QAction *QgisAppInterface::actionCircle2Points() { return qgis->actionCircle2Points();}
QAction *QgisAppInterface::actionCircle3Points() { return qgis->actionCircle3Points();}
QAction *QgisAppInterface::actionCircle3Tangents() { return qgis->actionCircle3Tangents();}
QAction *QgisAppInterface::actionCircle2TangentsPoint() { return qgis->actionCircle2TangentsPoint();}
QAction *QgisAppInterface::actionCircleCenterPoint() { return qgis->actionCircleCenterPoint();}
QAction *QgisAppInterface::actionEllipseCenter2Points() { return qgis->actionEllipseCenter2Points();}
QAction *QgisAppInterface::actionEllipseCenterPoint() { return qgis->actionEllipseCenterPoint();}
QAction *QgisAppInterface::actionEllipseExtent() { return qgis->actionEllipseExtent();}
QAction *QgisAppInterface::actionEllipseFoci() { return qgis->actionEllipseFoci();}
QAction *QgisAppInterface::actionRectangleCenterPoint() { return qgis->actionRectangleCenterPoint();}
QAction *QgisAppInterface::actionRectangleExtent() { return qgis->actionRectangleExtent();}
QAction *QgisAppInterface::actionRectangle3PointsDistance() { return qgis->actionRectangle3PointsDistance();}
QAction *QgisAppInterface::actionRectangle3PointsProjected() { return qgis->actionRectangle3PointsProjected();}
QAction *QgisAppInterface::actionRegularPolygon2Points() { return qgis->actionRegularPolygon2Points();}
QAction *QgisAppInterface::actionRegularPolygonCenterPoint() { return qgis->actionRegularPolygonCenterPoint();}
QAction *QgisAppInterface::actionRegularPolygonCenterCorner() { return qgis->actionRegularPolygonCenterCorner();}
//! Layer menu actions
QAction *QgisAppInterface::actionNewVectorLayer() { return qgis->actionNewVectorLayer(); }
QAction *QgisAppInterface::actionAddOgrLayer() { return qgis->actionAddOgrLayer(); }
Expand Down
17 changes: 17 additions & 0 deletions src/app/qgisappinterface.h
View file
Expand Up @@ -266,6 +266,23 @@ class APP_EXPORT QgisAppInterface : public QgisInterface
QAction *actionQgisHomePage() override;
QAction *actionCheckQgisVersion() override;
QAction *actionAbout() override;
QAction *actionCircle2Points() override;
QAction *actionCircle3Points() override;
QAction *actionCircle3Tangents() override;
QAction *actionCircle2TangentsPoint() override;
QAction *actionCircleCenterPoint() override;
QAction *actionEllipseCenter2Points() override;
QAction *actionEllipseCenterPoint() override;
QAction *actionEllipseExtent() override;
QAction *actionEllipseFoci() override;
QAction *actionRectangleCenterPoint() override;
QAction *actionRectangleExtent() override;
QAction *actionRectangle3PointsDistance() override;
QAction *actionRectangle3PointsProjected() override;
QAction *actionRegularPolygon2Points() override;
QAction *actionRegularPolygonCenterPoint() override;
QAction *actionRegularPolygonCenterCorner() override;

bool openFeatureForm( QgsVectorLayer *l, QgsFeature &f, bool updateFeatureOnly = false, bool showModal = true ) override;
QgsAttributeDialog *getFeatureForm( QgsVectorLayer *layer, QgsFeature &feature ) override;
QgsVectorLayerTools *vectorLayerTools() override;
Expand Down
18 changes: 18 additions & 0 deletions src/gui/qgisinterface.h
View file
Expand Up @@ -534,6 +534,24 @@ class GUI_EXPORT QgisInterface : public QObject
virtual QAction *actionCheckQgisVersion() = 0;
virtual QAction *actionAbout() = 0;

// Shape digitize actions
virtual QAction *actionCircle2Points() = 0;
virtual QAction *actionCircle3Points() = 0;
virtual QAction *actionCircle3Tangents() = 0;
virtual QAction *actionCircle2TangentsPoint() = 0;
virtual QAction *actionCircleCenterPoint() = 0;
virtual QAction *actionEllipseCenter2Points() = 0;
virtual QAction *actionEllipseCenterPoint() = 0;
virtual QAction *actionEllipseExtent() = 0;
virtual QAction *actionEllipseFoci() = 0;
virtual QAction *actionRectangleCenterPoint() = 0;
virtual QAction *actionRectangleExtent() = 0;
virtual QAction *actionRectangle3PointsDistance() = 0;
virtual QAction *actionRectangle3PointsProjected() = 0;
virtual QAction *actionRegularPolygon2Points() = 0;
virtual QAction *actionRegularPolygonCenterPoint() = 0;
virtual QAction *actionRegularPolygonCenterCorner() = 0;

/**
* Access the vector layer tools instance.
* With the help of this you can access methods like addFeature, startEditing
Expand Down

0 comments on commit 2b031cf

Please sign in to comment.