From 1d482cf953c20db4598b4a71c4e542767094d263 Mon Sep 17 00:00:00 2001 From: Alexander Bruy Date: Mon, 11 Dec 2017 10:32:14 +0200 Subject: [PATCH 1/6] [processing] add groupId() method to algorithms to get unique ID of the algorithm group. Adapt native algorithms --- .../models/qgsprocessingmodelalgorithm.sip | 4 +++- .../processing/qgsprocessingalgorithm.sip | 10 ++++++++++ .../qgsalgorithmaddincrementalfield.cpp | 5 +++++ .../qgsalgorithmaddincrementalfield.h | 1 + .../qgsalgorithmassignprojection.cpp | 5 +++++ .../processing/qgsalgorithmassignprojection.h | 1 + .../processing/qgsalgorithmboundary.cpp | 5 +++++ .../processing/qgsalgorithmboundary.h | 1 + .../processing/qgsalgorithmboundingbox.cpp | 5 +++++ .../processing/qgsalgorithmboundingbox.h | 1 + .../processing/qgsalgorithmbuffer.cpp | 5 +++++ src/analysis/processing/qgsalgorithmbuffer.h | 1 + .../processing/qgsalgorithmcentroid.cpp | 5 +++++ .../processing/qgsalgorithmcentroid.h | 1 + src/analysis/processing/qgsalgorithmclip.cpp | 5 +++++ src/analysis/processing/qgsalgorithmclip.h | 1 + .../processing/qgsalgorithmconvexhull.cpp | 5 +++++ .../processing/qgsalgorithmconvexhull.h | 1 + .../processing/qgsalgorithmdissolve.cpp | 10 ++++++++++ .../processing/qgsalgorithmdissolve.h | 2 ++ .../processing/qgsalgorithmdropgeometry.cpp | 5 +++++ .../processing/qgsalgorithmdropgeometry.h | 1 + .../processing/qgsalgorithmdropmzvalues.cpp | 5 +++++ .../processing/qgsalgorithmdropmzvalues.h | 1 + .../processing/qgsalgorithmextenttolayer.h | 1 + .../qgsalgorithmextractbyattribute.cpp | 5 +++++ .../qgsalgorithmextractbyattribute.h | 1 + .../qgsalgorithmextractbyexpression.cpp | 5 +++++ .../qgsalgorithmextractbyexpression.h | 1 + .../qgsalgorithmextractbyextent.cpp | 5 +++++ .../processing/qgsalgorithmextractbyextent.h | 1 + .../qgsalgorithmextractbylocation.cpp | 10 ++++++++++ .../qgsalgorithmextractbylocation.h | 2 ++ .../processing/qgsalgorithmextractnodes.cpp | 5 +++++ .../processing/qgsalgorithmextractnodes.h | 1 + .../processing/qgsalgorithmfiledownloader.cpp | 5 +++++ .../processing/qgsalgorithmfiledownloader.h | 1 + .../processing/qgsalgorithmfixgeometries.cpp | 5 +++++ .../processing/qgsalgorithmfixgeometries.h | 1 + .../qgsalgorithmjoinbyattribute.cpp | 5 +++++ .../processing/qgsalgorithmjoinbyattribute.h | 1 + .../processing/qgsalgorithmjoinwithlines.cpp | 5 +++++ .../processing/qgsalgorithmjoinwithlines.h | 1 + .../qgsalgorithmlineintersection.cpp | 5 +++++ .../processing/qgsalgorithmlineintersection.h | 1 + .../processing/qgsalgorithmloadlayer.cpp | 5 +++++ .../processing/qgsalgorithmloadlayer.h | 1 + .../qgsalgorithmmeancoordinates.cpp | 5 +++++ .../processing/qgsalgorithmmeancoordinates.h | 1 + .../processing/qgsalgorithmmergelines.cpp | 5 +++++ .../processing/qgsalgorithmmergelines.h | 1 + .../processing/qgsalgorithmmergevector.cpp | 5 +++++ .../processing/qgsalgorithmmergevector.h | 1 + .../qgsalgorithmminimumenclosingcircle.cpp | 5 +++++ .../qgsalgorithmminimumenclosingcircle.h | 1 + .../qgsalgorithmmultiparttosinglepart.cpp | 5 +++++ .../qgsalgorithmmultiparttosinglepart.h | 1 + .../qgsalgorithmorderbyexpression.cpp | 5 +++++ .../qgsalgorithmorderbyexpression.h | 1 + ...qgsalgorithmorientedminimumboundingbox.cpp | 5 +++++ .../qgsalgorithmorientedminimumboundingbox.h | 1 + .../processing/qgsalgorithmpackage.cpp | 5 +++++ src/analysis/processing/qgsalgorithmpackage.h | 1 + .../qgsalgorithmpromotetomultipart.cpp | 5 +++++ .../qgsalgorithmpromotetomultipart.h | 1 + .../qgsalgorithmrasterlayeruniquevalues.cpp | 4 ++++ .../qgsalgorithmrasterlayeruniquevalues.h | 1 + .../qgsalgorithmremoveduplicatenodes.cpp | 5 +++++ .../qgsalgorithmremoveduplicatenodes.h | 1 + .../qgsalgorithmremovenullgeometry.cpp | 7 ++++++- .../qgsalgorithmremovenullgeometry.h | 1 + .../processing/qgsalgorithmrenamelayer.cpp | 5 +++++ .../processing/qgsalgorithmrenamelayer.h | 1 + .../qgsalgorithmsaveselectedfeatures.cpp | 5 +++++ .../qgsalgorithmsaveselectedfeatures.h | 1 + .../processing/qgsalgorithmsimplify.cpp | 5 +++++ .../processing/qgsalgorithmsimplify.h | 1 + .../processing/qgsalgorithmsmooth.cpp | 5 +++++ src/analysis/processing/qgsalgorithmsmooth.h | 1 + .../processing/qgsalgorithmsnaptogrid.cpp | 5 +++++ .../processing/qgsalgorithmsnaptogrid.h | 1 + .../processing/qgsalgorithmsplitwithlines.cpp | 5 +++++ .../processing/qgsalgorithmsplitwithlines.h | 1 + .../qgsalgorithmstringconcatenation.cpp | 5 +++++ .../qgsalgorithmstringconcatenation.h | 1 + .../processing/qgsalgorithmsubdivide.cpp | 5 +++++ .../processing/qgsalgorithmsubdivide.h | 1 + .../processing/qgsalgorithmtransect.cpp | 5 +++++ .../processing/qgsalgorithmtransect.h | 1 + .../processing/qgsalgorithmtransform.cpp | 5 +++++ .../processing/qgsalgorithmtransform.h | 1 + .../processing/qgsalgorithmtranslate.cpp | 5 +++++ .../processing/qgsalgorithmtranslate.h | 1 + .../models/qgsprocessingmodelalgorithm.cpp | 8 +++++++- .../models/qgsprocessingmodelalgorithm.h | 4 +++- src/core/processing/qgsprocessingalgorithm.h | 10 ++++++++++ tests/testdata/polys_overlapping_with_id.dbf | Bin 1329 -> 1329 bytes 97 files changed, 316 insertions(+), 4 deletions(-) diff --git a/python/core/processing/models/qgsprocessingmodelalgorithm.sip b/python/core/processing/models/qgsprocessingmodelalgorithm.sip index b6e4cf48722..663f622b021 100644 --- a/python/core/processing/models/qgsprocessingmodelalgorithm.sip +++ b/python/core/processing/models/qgsprocessingmodelalgorithm.sip @@ -22,7 +22,7 @@ class QgsProcessingModelAlgorithm : QgsProcessingAlgorithm %End public: - QgsProcessingModelAlgorithm( const QString &name = QString(), const QString &group = QString() ); + QgsProcessingModelAlgorithm( const QString &name = QString(), const QString &group = QString(), const QString &groupId = QString() ); %Docstring Constructor for QgsProcessingModelAlgorithm. %End @@ -36,6 +36,8 @@ class QgsProcessingModelAlgorithm : QgsProcessingAlgorithm virtual QString group() const; + virtual QString groupId() const; + virtual QIcon icon() const; virtual QString svgIconPath() const; diff --git a/python/core/processing/qgsprocessingalgorithm.sip b/python/core/processing/qgsprocessingalgorithm.sip index 079c28cf7f4..7accb991e9c 100644 --- a/python/core/processing/qgsprocessingalgorithm.sip +++ b/python/core/processing/qgsprocessingalgorithm.sip @@ -158,10 +158,20 @@ class QgsProcessingAlgorithm %Docstring Returns the name of the group this algorithm belongs to. This string should be localised. +.. seealso:: :py:func:`groupId()` .. seealso:: :py:func:`tags()` :rtype: str %End + virtual QString groupId() const; +%Docstring + Returns the unique ID of the group this algorithm belongs to. This string + should be fixed for the algorithm, and must not be localised. The group id + should be unique within each provider. Group id should contain lowercase + alphanumeric characters only and no spaces or other formatting characters. +.. seealso:: :py:func:`group()` + :rtype: str +%End virtual Flags flags() const; %Docstring Returns the flags indicating how and when the algorithm operates and should be exposed to users. diff --git a/src/analysis/processing/qgsalgorithmaddincrementalfield.cpp b/src/analysis/processing/qgsalgorithmaddincrementalfield.cpp index 7709935a563..ed5be287b62 100644 --- a/src/analysis/processing/qgsalgorithmaddincrementalfield.cpp +++ b/src/analysis/processing/qgsalgorithmaddincrementalfield.cpp @@ -49,6 +49,11 @@ QString QgsAddIncrementalFieldAlgorithm::group() const return QObject::tr( "Vector table" ); } +QString QgsAddIncrementalFieldAlgorithm::groupId() const +{ + return QStringLiteral( "vectortable" ); +} + QString QgsAddIncrementalFieldAlgorithm::outputName() const { return QObject::tr( "Incremented" ); diff --git a/src/analysis/processing/qgsalgorithmaddincrementalfield.h b/src/analysis/processing/qgsalgorithmaddincrementalfield.h index 165d59f66a4..5d21cdcbacb 100644 --- a/src/analysis/processing/qgsalgorithmaddincrementalfield.h +++ b/src/analysis/processing/qgsalgorithmaddincrementalfield.h @@ -38,6 +38,7 @@ class QgsAddIncrementalFieldAlgorithm : public QgsProcessingFeatureBasedAlgorith QString displayName() const override; virtual QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QList inputLayerTypes() const override; QgsAddIncrementalFieldAlgorithm *createInstance() const override SIP_FACTORY; diff --git a/src/analysis/processing/qgsalgorithmassignprojection.cpp b/src/analysis/processing/qgsalgorithmassignprojection.cpp index 4801d3b0b98..a5e95e5a161 100644 --- a/src/analysis/processing/qgsalgorithmassignprojection.cpp +++ b/src/analysis/processing/qgsalgorithmassignprojection.cpp @@ -39,6 +39,11 @@ QString QgsAssignProjectionAlgorithm::group() const return QObject::tr( "Vector general" ); } +QString QgsAssignProjectionAlgorithm::groupId() const +{ + return QStringLiteral( "vectorgeneral" ); +} + QString QgsAssignProjectionAlgorithm::outputName() const { return QObject::tr( "Assigned CRS" ); diff --git a/src/analysis/processing/qgsalgorithmassignprojection.h b/src/analysis/processing/qgsalgorithmassignprojection.h index 3824d9fc398..6b380313dbf 100644 --- a/src/analysis/processing/qgsalgorithmassignprojection.h +++ b/src/analysis/processing/qgsalgorithmassignprojection.h @@ -38,6 +38,7 @@ class QgsAssignProjectionAlgorithm : public QgsProcessingFeatureBasedAlgorithm QString displayName() const override; virtual QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QgsAssignProjectionAlgorithm *createInstance() const override SIP_FACTORY; diff --git a/src/analysis/processing/qgsalgorithmboundary.cpp b/src/analysis/processing/qgsalgorithmboundary.cpp index 41e3dae934a..a313cc87074 100644 --- a/src/analysis/processing/qgsalgorithmboundary.cpp +++ b/src/analysis/processing/qgsalgorithmboundary.cpp @@ -39,6 +39,11 @@ QString QgsBoundaryAlgorithm::group() const return QObject::tr( "Vector geometry" ); } +QString QgsBoundaryAlgorithm::groupId() const +{ + return QStringLiteral( "vectorgeometry" ); +} + QString QgsBoundaryAlgorithm::outputName() const { return QObject::tr( "Boundary" ); diff --git a/src/analysis/processing/qgsalgorithmboundary.h b/src/analysis/processing/qgsalgorithmboundary.h index 63830d94bfe..232e944112b 100644 --- a/src/analysis/processing/qgsalgorithmboundary.h +++ b/src/analysis/processing/qgsalgorithmboundary.h @@ -38,6 +38,7 @@ class QgsBoundaryAlgorithm : public QgsProcessingFeatureBasedAlgorithm QString displayName() const override; QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QList inputLayerTypes() const override; QgsBoundaryAlgorithm *createInstance() const override SIP_FACTORY; diff --git a/src/analysis/processing/qgsalgorithmboundingbox.cpp b/src/analysis/processing/qgsalgorithmboundingbox.cpp index 6b29914014a..1034fddb362 100644 --- a/src/analysis/processing/qgsalgorithmboundingbox.cpp +++ b/src/analysis/processing/qgsalgorithmboundingbox.cpp @@ -39,6 +39,11 @@ QString QgsBoundingBoxAlgorithm::group() const return QObject::tr( "Vector geometry" ); } +QString QgsBoundingBoxAlgorithm::groupId() const +{ + return QStringLiteral( "vectorgeometry" ); +} + QString QgsBoundingBoxAlgorithm::outputName() const { return QObject::tr( "Bounds" ); diff --git a/src/analysis/processing/qgsalgorithmboundingbox.h b/src/analysis/processing/qgsalgorithmboundingbox.h index e6925debd8c..6187ff59188 100644 --- a/src/analysis/processing/qgsalgorithmboundingbox.h +++ b/src/analysis/processing/qgsalgorithmboundingbox.h @@ -38,6 +38,7 @@ class QgsBoundingBoxAlgorithm : public QgsProcessingFeatureBasedAlgorithm QString displayName() const override; virtual QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QgsBoundingBoxAlgorithm *createInstance() const override SIP_FACTORY; diff --git a/src/analysis/processing/qgsalgorithmbuffer.cpp b/src/analysis/processing/qgsalgorithmbuffer.cpp index 4f514ff1932..61be4ad8fbb 100644 --- a/src/analysis/processing/qgsalgorithmbuffer.cpp +++ b/src/analysis/processing/qgsalgorithmbuffer.cpp @@ -39,6 +39,11 @@ QString QgsBufferAlgorithm::group() const return QObject::tr( "Vector geometry" ); } +QString QgsBufferAlgorithm::groupId() const +{ + return QStringLiteral( "vectorgeometry" ); +} + void QgsBufferAlgorithm::initAlgorithm( const QVariantMap & ) { addParameter( new QgsProcessingParameterFeatureSource( QStringLiteral( "INPUT" ), QObject::tr( "Input layer" ) ) ); diff --git a/src/analysis/processing/qgsalgorithmbuffer.h b/src/analysis/processing/qgsalgorithmbuffer.h index cd370831902..11d9e44e5b1 100644 --- a/src/analysis/processing/qgsalgorithmbuffer.h +++ b/src/analysis/processing/qgsalgorithmbuffer.h @@ -40,6 +40,7 @@ class QgsBufferAlgorithm : public QgsProcessingAlgorithm QString displayName() const override; virtual QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QgsBufferAlgorithm *createInstance() const override SIP_FACTORY; diff --git a/src/analysis/processing/qgsalgorithmcentroid.cpp b/src/analysis/processing/qgsalgorithmcentroid.cpp index 8a7da3532ee..67accb861d2 100644 --- a/src/analysis/processing/qgsalgorithmcentroid.cpp +++ b/src/analysis/processing/qgsalgorithmcentroid.cpp @@ -39,6 +39,11 @@ QString QgsCentroidAlgorithm::group() const return QObject::tr( "Vector geometry" ); } +QString QgsCentroidAlgorithm::groupId() const +{ + return QStringLiteral( "vectorgeometry" ); +} + QString QgsCentroidAlgorithm::outputName() const { return QObject::tr( "Centroids" ); diff --git a/src/analysis/processing/qgsalgorithmcentroid.h b/src/analysis/processing/qgsalgorithmcentroid.h index 48e0a66cb43..bc9d20867c6 100644 --- a/src/analysis/processing/qgsalgorithmcentroid.h +++ b/src/analysis/processing/qgsalgorithmcentroid.h @@ -39,6 +39,7 @@ class QgsCentroidAlgorithm : public QgsProcessingFeatureBasedAlgorithm QString displayName() const override; QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QgsCentroidAlgorithm *createInstance() const override SIP_FACTORY; diff --git a/src/analysis/processing/qgsalgorithmclip.cpp b/src/analysis/processing/qgsalgorithmclip.cpp index 428d303f6f2..1c94e99aa02 100644 --- a/src/analysis/processing/qgsalgorithmclip.cpp +++ b/src/analysis/processing/qgsalgorithmclip.cpp @@ -40,6 +40,11 @@ QString QgsClipAlgorithm::group() const return QObject::tr( "Vector overlay" ); } +QString QgsClipAlgorithm::groupId() const +{ + return QStringLiteral( "vectoroverlay" ); +} + void QgsClipAlgorithm::initAlgorithm( const QVariantMap & ) { addParameter( new QgsProcessingParameterFeatureSource( QStringLiteral( "INPUT" ), QObject::tr( "Input layer" ) ) ); diff --git a/src/analysis/processing/qgsalgorithmclip.h b/src/analysis/processing/qgsalgorithmclip.h index a66e900ef07..4fec3835cc8 100644 --- a/src/analysis/processing/qgsalgorithmclip.h +++ b/src/analysis/processing/qgsalgorithmclip.h @@ -39,6 +39,7 @@ class QgsClipAlgorithm : public QgsProcessingAlgorithm QString displayName() const override; virtual QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QgsClipAlgorithm *createInstance() const override SIP_FACTORY; diff --git a/src/analysis/processing/qgsalgorithmconvexhull.cpp b/src/analysis/processing/qgsalgorithmconvexhull.cpp index 5d0438f8a60..5ff1455b70d 100644 --- a/src/analysis/processing/qgsalgorithmconvexhull.cpp +++ b/src/analysis/processing/qgsalgorithmconvexhull.cpp @@ -39,6 +39,11 @@ QString QgsConvexHullAlgorithm::group() const return QObject::tr( "Vector geometry" ); } +QString QgsConvexHullAlgorithm::groupId() const +{ + return QStringLiteral( "vectorgeometry" ); +} + QString QgsConvexHullAlgorithm::outputName() const { return QObject::tr( "Convex hulls" ); diff --git a/src/analysis/processing/qgsalgorithmconvexhull.h b/src/analysis/processing/qgsalgorithmconvexhull.h index d70915d890b..8fc723bb166 100644 --- a/src/analysis/processing/qgsalgorithmconvexhull.h +++ b/src/analysis/processing/qgsalgorithmconvexhull.h @@ -39,6 +39,7 @@ class QgsConvexHullAlgorithm : public QgsProcessingFeatureBasedAlgorithm QString displayName() const override; virtual QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QgsConvexHullAlgorithm *createInstance() const override SIP_FACTORY; diff --git a/src/analysis/processing/qgsalgorithmdissolve.cpp b/src/analysis/processing/qgsalgorithmdissolve.cpp index 5f68f71dc62..960b09a8678 100644 --- a/src/analysis/processing/qgsalgorithmdissolve.cpp +++ b/src/analysis/processing/qgsalgorithmdissolve.cpp @@ -181,6 +181,11 @@ QString QgsDissolveAlgorithm::group() const return QObject::tr( "Vector geometry" ); } +QString QgsDissolveAlgorithm::groupId() const +{ + return QStringLiteral( "vectorgeometry" ); +} + void QgsDissolveAlgorithm::initAlgorithm( const QVariantMap & ) { @@ -237,6 +242,11 @@ QString QgsCollectAlgorithm::group() const return QObject::tr( "Vector geometry" ); } +QString QgsCollectAlgorithm::groupId() const +{ + return QStringLiteral( "vectorgeometry" ); +} + QVariantMap QgsCollectAlgorithm::processAlgorithm( const QVariantMap ¶meters, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) { return processCollection( parameters, context, feedback, []( const QVector< QgsGeometry > &parts )->QgsGeometry diff --git a/src/analysis/processing/qgsalgorithmdissolve.h b/src/analysis/processing/qgsalgorithmdissolve.h index 21c3da7d0bc..52c1472a5a9 100644 --- a/src/analysis/processing/qgsalgorithmdissolve.h +++ b/src/analysis/processing/qgsalgorithmdissolve.h @@ -50,6 +50,7 @@ class QgsDissolveAlgorithm : public QgsCollectorAlgorithm QString displayName() const override; virtual QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QgsDissolveAlgorithm *createInstance() const override SIP_FACTORY; @@ -74,6 +75,7 @@ class QgsCollectAlgorithm : public QgsCollectorAlgorithm QString displayName() const override; virtual QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QgsCollectAlgorithm *createInstance() const override SIP_FACTORY; diff --git a/src/analysis/processing/qgsalgorithmdropgeometry.cpp b/src/analysis/processing/qgsalgorithmdropgeometry.cpp index 627eaf9fa2e..56bf878aca1 100644 --- a/src/analysis/processing/qgsalgorithmdropgeometry.cpp +++ b/src/analysis/processing/qgsalgorithmdropgeometry.cpp @@ -39,6 +39,11 @@ QString QgsDropGeometryAlgorithm::group() const return QObject::tr( "Vector general" ); } +QString QgsDropGeometryAlgorithm::groupId() const +{ + return QStringLiteral( "vectorgeneral" ); +} + QString QgsDropGeometryAlgorithm::outputName() const { return QObject::tr( "Dropped geometries" ); diff --git a/src/analysis/processing/qgsalgorithmdropgeometry.h b/src/analysis/processing/qgsalgorithmdropgeometry.h index 3462b18a323..b3b8c8d5a23 100644 --- a/src/analysis/processing/qgsalgorithmdropgeometry.h +++ b/src/analysis/processing/qgsalgorithmdropgeometry.h @@ -38,6 +38,7 @@ class QgsDropGeometryAlgorithm : public QgsProcessingFeatureBasedAlgorithm QString displayName() const override; QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QgsDropGeometryAlgorithm *createInstance() const override SIP_FACTORY; QgsCoordinateReferenceSystem outputCrs( const QgsCoordinateReferenceSystem &inputCrs ) const override; diff --git a/src/analysis/processing/qgsalgorithmdropmzvalues.cpp b/src/analysis/processing/qgsalgorithmdropmzvalues.cpp index 5fe4476c96d..dc6bce0294e 100644 --- a/src/analysis/processing/qgsalgorithmdropmzvalues.cpp +++ b/src/analysis/processing/qgsalgorithmdropmzvalues.cpp @@ -39,6 +39,11 @@ QString QgsDropMZValuesAlgorithm::group() const return QObject::tr( "Vector geometry" ); } +QString QgsDropMZValuesAlgorithm::groupId() const +{ + return QStringLiteral( "vectorgeometry" ); +} + QString QgsDropMZValuesAlgorithm::outputName() const { return QObject::tr( "Z/M Dropped" ); diff --git a/src/analysis/processing/qgsalgorithmdropmzvalues.h b/src/analysis/processing/qgsalgorithmdropmzvalues.h index 9cb887c60d2..52cbe05b1d2 100644 --- a/src/analysis/processing/qgsalgorithmdropmzvalues.h +++ b/src/analysis/processing/qgsalgorithmdropmzvalues.h @@ -38,6 +38,7 @@ class QgsDropMZValuesAlgorithm : public QgsProcessingFeatureBasedAlgorithm QString displayName() const override; QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QgsDropMZValuesAlgorithm *createInstance() const override SIP_FACTORY; diff --git a/src/analysis/processing/qgsalgorithmextenttolayer.h b/src/analysis/processing/qgsalgorithmextenttolayer.h index 1a5d1d5508e..036b7bbdb6b 100644 --- a/src/analysis/processing/qgsalgorithmextenttolayer.h +++ b/src/analysis/processing/qgsalgorithmextenttolayer.h @@ -39,6 +39,7 @@ class QgsExtentToLayerAlgorithm : public QgsProcessingAlgorithm QString displayName() const override { return QObject::tr( "Create layer from extent" ); } virtual QStringList tags() const override { return QObject::tr( "extent,layer,polygon,create,new" ).split( ',' ); } QString group() const override { return QObject::tr( "Vector geometry" ); } + QString groupId() const override { return QStringLiteral( "vectorgeometry" ); } QString shortHelpString() const override; QgsExtentToLayerAlgorithm *createInstance() const override SIP_FACTORY; diff --git a/src/analysis/processing/qgsalgorithmextractbyattribute.cpp b/src/analysis/processing/qgsalgorithmextractbyattribute.cpp index 2fcd203436b..7b220824ab7 100644 --- a/src/analysis/processing/qgsalgorithmextractbyattribute.cpp +++ b/src/analysis/processing/qgsalgorithmextractbyattribute.cpp @@ -39,6 +39,11 @@ QString QgsExtractByAttributeAlgorithm::group() const return QObject::tr( "Vector selection" ); } +QString QgsExtractByAttributeAlgorithm::groupId() const +{ + return QStringLiteral( "vectorselection" ); +} + void QgsExtractByAttributeAlgorithm::initAlgorithm( const QVariantMap & ) { addParameter( new QgsProcessingParameterFeatureSource( QStringLiteral( "INPUT" ), QObject::tr( "Input layer" ) ) ); diff --git a/src/analysis/processing/qgsalgorithmextractbyattribute.h b/src/analysis/processing/qgsalgorithmextractbyattribute.h index c50c75082b5..7e5d3fc39e4 100644 --- a/src/analysis/processing/qgsalgorithmextractbyattribute.h +++ b/src/analysis/processing/qgsalgorithmextractbyattribute.h @@ -54,6 +54,7 @@ class QgsExtractByAttributeAlgorithm : public QgsProcessingAlgorithm QString displayName() const override; virtual QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QgsExtractByAttributeAlgorithm *createInstance() const override SIP_FACTORY; diff --git a/src/analysis/processing/qgsalgorithmextractbyexpression.cpp b/src/analysis/processing/qgsalgorithmextractbyexpression.cpp index c7af2643882..dd9a03579f7 100644 --- a/src/analysis/processing/qgsalgorithmextractbyexpression.cpp +++ b/src/analysis/processing/qgsalgorithmextractbyexpression.cpp @@ -39,6 +39,11 @@ QString QgsExtractByExpressionAlgorithm::group() const return QObject::tr( "Vector selection" ); } +QString QgsExtractByExpressionAlgorithm::groupId() const +{ + return QStringLiteral( "vectorselection" ); +} + void QgsExtractByExpressionAlgorithm::initAlgorithm( const QVariantMap & ) { addParameter( new QgsProcessingParameterFeatureSource( QStringLiteral( "INPUT" ), QObject::tr( "Input layer" ) ) ); diff --git a/src/analysis/processing/qgsalgorithmextractbyexpression.h b/src/analysis/processing/qgsalgorithmextractbyexpression.h index f8e150a1d32..2d6845a9b61 100644 --- a/src/analysis/processing/qgsalgorithmextractbyexpression.h +++ b/src/analysis/processing/qgsalgorithmextractbyexpression.h @@ -39,6 +39,7 @@ class QgsExtractByExpressionAlgorithm : public QgsProcessingAlgorithm QString displayName() const override; virtual QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QgsExtractByExpressionAlgorithm *createInstance() const override SIP_FACTORY; diff --git a/src/analysis/processing/qgsalgorithmextractbyextent.cpp b/src/analysis/processing/qgsalgorithmextractbyextent.cpp index ef054a276ec..75877cbbb61 100644 --- a/src/analysis/processing/qgsalgorithmextractbyextent.cpp +++ b/src/analysis/processing/qgsalgorithmextractbyextent.cpp @@ -39,6 +39,11 @@ QString QgsExtractByExtentAlgorithm::group() const return QObject::tr( "Vector overlay" ); } +QString QgsExtractByExtentAlgorithm::groupId() const +{ + return QStringLiteral( "vectoroverlay" ); +} + void QgsExtractByExtentAlgorithm::initAlgorithm( const QVariantMap & ) { addParameter( new QgsProcessingParameterFeatureSource( QStringLiteral( "INPUT" ), QObject::tr( "Input layer" ) ) ); diff --git a/src/analysis/processing/qgsalgorithmextractbyextent.h b/src/analysis/processing/qgsalgorithmextractbyextent.h index f09558a2b63..fa5884fd723 100644 --- a/src/analysis/processing/qgsalgorithmextractbyextent.h +++ b/src/analysis/processing/qgsalgorithmextractbyextent.h @@ -39,6 +39,7 @@ class QgsExtractByExtentAlgorithm : public QgsProcessingAlgorithm QString displayName() const override; virtual QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QgsExtractByExtentAlgorithm *createInstance() const override SIP_FACTORY; diff --git a/src/analysis/processing/qgsalgorithmextractbylocation.cpp b/src/analysis/processing/qgsalgorithmextractbylocation.cpp index 419e3e82686..915896b91ca 100644 --- a/src/analysis/processing/qgsalgorithmextractbylocation.cpp +++ b/src/analysis/processing/qgsalgorithmextractbylocation.cpp @@ -245,6 +245,11 @@ QString QgsSelectByLocationAlgorithm::group() const return QObject::tr( "Vector selection" ); } +QString QgsSelectByLocationAlgorithm::groupId() const +{ + return QStringLiteral( "vectorselection" ); +} + QString QgsSelectByLocationAlgorithm::shortHelpString() const { return QObject::tr( "This algorithm creates a selection in a vector layer. The criteria for selecting " @@ -313,6 +318,11 @@ QString QgsExtractByLocationAlgorithm::group() const return QObject::tr( "Vector selection" ); } +QString QgsExtractByLocationAlgorithm::groupId() const +{ + return QStringLiteral( "vectorselection" ); +} + QString QgsExtractByLocationAlgorithm::shortHelpString() const { return QObject::tr( "This algorithm creates a new vector layer that only contains matching features from an " diff --git a/src/analysis/processing/qgsalgorithmextractbylocation.h b/src/analysis/processing/qgsalgorithmextractbylocation.h index 6d5905360cc..24e627336c1 100644 --- a/src/analysis/processing/qgsalgorithmextractbylocation.h +++ b/src/analysis/processing/qgsalgorithmextractbylocation.h @@ -67,6 +67,7 @@ class QgsSelectByLocationAlgorithm : public QgsLocationBasedAlgorithm QString displayName() const override; virtual QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QgsSelectByLocationAlgorithm *createInstance() const override SIP_FACTORY; @@ -91,6 +92,7 @@ class QgsExtractByLocationAlgorithm : public QgsLocationBasedAlgorithm QString displayName() const override; virtual QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QgsExtractByLocationAlgorithm *createInstance() const override SIP_FACTORY; diff --git a/src/analysis/processing/qgsalgorithmextractnodes.cpp b/src/analysis/processing/qgsalgorithmextractnodes.cpp index c320dfdba9b..8b41906084f 100644 --- a/src/analysis/processing/qgsalgorithmextractnodes.cpp +++ b/src/analysis/processing/qgsalgorithmextractnodes.cpp @@ -42,6 +42,11 @@ QString QgsExtractNodesAlgorithm::group() const return QObject::tr( "Vector geometry" ); } +QString QgsExtractNodesAlgorithm::groupId() const +{ + return QStringLiteral( "vectorgeometry" ); +} + QString QgsExtractNodesAlgorithm::shortHelpString() const { return QObject::tr( "This algorithm takes a line or polygon layer and generates a point layer with points representing the nodes in the input lines or polygons. The attributes associated to each point are the same ones associated to the line or polygon that the point belongs to." ) + diff --git a/src/analysis/processing/qgsalgorithmextractnodes.h b/src/analysis/processing/qgsalgorithmextractnodes.h index 16fa8e957c1..2e05a5ace09 100644 --- a/src/analysis/processing/qgsalgorithmextractnodes.h +++ b/src/analysis/processing/qgsalgorithmextractnodes.h @@ -39,6 +39,7 @@ class QgsExtractNodesAlgorithm : public QgsProcessingAlgorithm QString displayName() const override; virtual QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QgsExtractNodesAlgorithm *createInstance() const override SIP_FACTORY; diff --git a/src/analysis/processing/qgsalgorithmfiledownloader.cpp b/src/analysis/processing/qgsalgorithmfiledownloader.cpp index fc71b979e90..1ee12618528 100644 --- a/src/analysis/processing/qgsalgorithmfiledownloader.cpp +++ b/src/analysis/processing/qgsalgorithmfiledownloader.cpp @@ -45,6 +45,11 @@ QString QgsFileDownloaderAlgorithm::group() const return tr( "File tools" ); } +QString QgsFileDownloaderAlgorithm::groupId() const +{ + return QStringLiteral( "filetools" ); +} + QString QgsFileDownloaderAlgorithm::shortHelpString() const { return tr( "This algorithm downloads a URL on the file system." ); diff --git a/src/analysis/processing/qgsalgorithmfiledownloader.h b/src/analysis/processing/qgsalgorithmfiledownloader.h index 34928c27e1a..413bdbf4cde 100644 --- a/src/analysis/processing/qgsalgorithmfiledownloader.h +++ b/src/analysis/processing/qgsalgorithmfiledownloader.h @@ -39,6 +39,7 @@ class QgsFileDownloaderAlgorithm : public QgsProcessingAlgorithm, public QObject QString displayName() const override; virtual QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QgsFileDownloaderAlgorithm *createInstance() const override SIP_FACTORY; diff --git a/src/analysis/processing/qgsalgorithmfixgeometries.cpp b/src/analysis/processing/qgsalgorithmfixgeometries.cpp index 2dc56f96495..db778a259ec 100644 --- a/src/analysis/processing/qgsalgorithmfixgeometries.cpp +++ b/src/analysis/processing/qgsalgorithmfixgeometries.cpp @@ -39,6 +39,11 @@ QString QgsFixGeometriesAlgorithm::group() const return QObject::tr( "Vector geometry" ); } +QString QgsFixGeometriesAlgorithm::groupId() const +{ + return QStringLiteral( "vectorgeometry" ); +} + QgsProcessingFeatureSource::Flag QgsFixGeometriesAlgorithm::sourceFlags() const { return QgsProcessingFeatureSource::FlagSkipGeometryValidityChecks; diff --git a/src/analysis/processing/qgsalgorithmfixgeometries.h b/src/analysis/processing/qgsalgorithmfixgeometries.h index 2471451fafc..8e964a5cfaf 100644 --- a/src/analysis/processing/qgsalgorithmfixgeometries.h +++ b/src/analysis/processing/qgsalgorithmfixgeometries.h @@ -38,6 +38,7 @@ class QgsFixGeometriesAlgorithm : public QgsProcessingFeatureBasedAlgorithm QString displayName() const override; virtual QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QgsFixGeometriesAlgorithm *createInstance() const override SIP_FACTORY; diff --git a/src/analysis/processing/qgsalgorithmjoinbyattribute.cpp b/src/analysis/processing/qgsalgorithmjoinbyattribute.cpp index e66ac157fc7..2c3ad80873b 100644 --- a/src/analysis/processing/qgsalgorithmjoinbyattribute.cpp +++ b/src/analysis/processing/qgsalgorithmjoinbyattribute.cpp @@ -39,6 +39,11 @@ QString QgsJoinByAttributeAlgorithm::group() const return QObject::tr( "Vector general" ); } +QString QgsJoinByAttributeAlgorithm::groupId() const +{ + return QStringLiteral( "vectorgeneral" ); +} + void QgsJoinByAttributeAlgorithm::initAlgorithm( const QVariantMap & ) { addParameter( new QgsProcessingParameterFeatureSource( QStringLiteral( "INPUT" ), diff --git a/src/analysis/processing/qgsalgorithmjoinbyattribute.h b/src/analysis/processing/qgsalgorithmjoinbyattribute.h index 1cf39185578..77127b8e684 100644 --- a/src/analysis/processing/qgsalgorithmjoinbyattribute.h +++ b/src/analysis/processing/qgsalgorithmjoinbyattribute.h @@ -39,6 +39,7 @@ class QgsJoinByAttributeAlgorithm : public QgsProcessingAlgorithm QString displayName() const override; virtual QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QgsJoinByAttributeAlgorithm *createInstance() const override SIP_FACTORY; diff --git a/src/analysis/processing/qgsalgorithmjoinwithlines.cpp b/src/analysis/processing/qgsalgorithmjoinwithlines.cpp index b95abf675a7..a6018acfb6b 100644 --- a/src/analysis/processing/qgsalgorithmjoinwithlines.cpp +++ b/src/analysis/processing/qgsalgorithmjoinwithlines.cpp @@ -40,6 +40,11 @@ QString QgsJoinWithLinesAlgorithm::group() const return QObject::tr( "Vector analysis" ); } +QString QgsJoinWithLinesAlgorithm::groupId() const +{ + return QStringLiteral( "vectoranalysis" ); +} + void QgsJoinWithLinesAlgorithm::initAlgorithm( const QVariantMap & ) { addParameter( new QgsProcessingParameterFeatureSource( QStringLiteral( "HUBS" ), diff --git a/src/analysis/processing/qgsalgorithmjoinwithlines.h b/src/analysis/processing/qgsalgorithmjoinwithlines.h index 2cbfd0d164b..f29167693ee 100644 --- a/src/analysis/processing/qgsalgorithmjoinwithlines.h +++ b/src/analysis/processing/qgsalgorithmjoinwithlines.h @@ -39,6 +39,7 @@ class QgsJoinWithLinesAlgorithm : public QgsProcessingAlgorithm QString displayName() const override; virtual QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QgsJoinWithLinesAlgorithm *createInstance() const override SIP_FACTORY; diff --git a/src/analysis/processing/qgsalgorithmlineintersection.cpp b/src/analysis/processing/qgsalgorithmlineintersection.cpp index a181eee7e07..2c08639d8ac 100644 --- a/src/analysis/processing/qgsalgorithmlineintersection.cpp +++ b/src/analysis/processing/qgsalgorithmlineintersection.cpp @@ -40,6 +40,11 @@ QString QgsLineIntersectionAlgorithm::group() const return QObject::tr( "Vector overlay" ); } +QString QgsLineIntersectionAlgorithm::groupId() const +{ + return QStringLiteral( "vectoroverlay" ); +} + void QgsLineIntersectionAlgorithm::initAlgorithm( const QVariantMap & ) { addParameter( new QgsProcessingParameterFeatureSource( QStringLiteral( "INPUT" ), diff --git a/src/analysis/processing/qgsalgorithmlineintersection.h b/src/analysis/processing/qgsalgorithmlineintersection.h index ca49dd19d90..0fbeb8e2d03 100644 --- a/src/analysis/processing/qgsalgorithmlineintersection.h +++ b/src/analysis/processing/qgsalgorithmlineintersection.h @@ -39,6 +39,7 @@ class QgsLineIntersectionAlgorithm : public QgsProcessingAlgorithm QString displayName() const override; virtual QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QgsLineIntersectionAlgorithm *createInstance() const override SIP_FACTORY; diff --git a/src/analysis/processing/qgsalgorithmloadlayer.cpp b/src/analysis/processing/qgsalgorithmloadlayer.cpp index 926f590ab9c..271640f7f10 100644 --- a/src/analysis/processing/qgsalgorithmloadlayer.cpp +++ b/src/analysis/processing/qgsalgorithmloadlayer.cpp @@ -44,6 +44,11 @@ QString QgsLoadLayerAlgorithm::group() const return QObject::tr( "Modeler tools" ); } +QString QgsLoadLayerAlgorithm::groupId() const +{ + return QStringLiteral( "modelertools" ); +} + QString QgsLoadLayerAlgorithm::shortHelpString() const { return QObject::tr( "This algorithm loads a layer to the current project." ); diff --git a/src/analysis/processing/qgsalgorithmloadlayer.h b/src/analysis/processing/qgsalgorithmloadlayer.h index cc520d009cd..134f07cb6f4 100644 --- a/src/analysis/processing/qgsalgorithmloadlayer.h +++ b/src/analysis/processing/qgsalgorithmloadlayer.h @@ -38,6 +38,7 @@ class QgsLoadLayerAlgorithm : public QgsProcessingAlgorithm QString displayName() const override; virtual QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QgsLoadLayerAlgorithm *createInstance() const override SIP_FACTORY; diff --git a/src/analysis/processing/qgsalgorithmmeancoordinates.cpp b/src/analysis/processing/qgsalgorithmmeancoordinates.cpp index 5ea5d2d1f60..a0c68dd54fc 100644 --- a/src/analysis/processing/qgsalgorithmmeancoordinates.cpp +++ b/src/analysis/processing/qgsalgorithmmeancoordinates.cpp @@ -39,6 +39,11 @@ QString QgsMeanCoordinatesAlgorithm::group() const return QObject::tr( "Vector analysis" ); } +QString QgsMeanCoordinatesAlgorithm::groupId() const +{ + return QStringLiteral( "vectoranalysis" ); +} + void QgsMeanCoordinatesAlgorithm::initAlgorithm( const QVariantMap & ) { addParameter( new QgsProcessingParameterFeatureSource( QStringLiteral( "INPUT" ), diff --git a/src/analysis/processing/qgsalgorithmmeancoordinates.h b/src/analysis/processing/qgsalgorithmmeancoordinates.h index f116676676f..6263fe4187c 100644 --- a/src/analysis/processing/qgsalgorithmmeancoordinates.h +++ b/src/analysis/processing/qgsalgorithmmeancoordinates.h @@ -40,6 +40,7 @@ class QgsMeanCoordinatesAlgorithm : public QgsProcessingAlgorithm QString displayName() const override; virtual QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QgsMeanCoordinatesAlgorithm *createInstance() const override SIP_FACTORY; diff --git a/src/analysis/processing/qgsalgorithmmergelines.cpp b/src/analysis/processing/qgsalgorithmmergelines.cpp index 97fbcf938c7..352ee76ace9 100644 --- a/src/analysis/processing/qgsalgorithmmergelines.cpp +++ b/src/analysis/processing/qgsalgorithmmergelines.cpp @@ -39,6 +39,11 @@ QString QgsMergeLinesAlgorithm::group() const return QObject::tr( "Vector geometry" ); } +QString QgsMergeLinesAlgorithm::groupId() const +{ + return QStringLiteral( "vectorgeometry" ); +} + QString QgsMergeLinesAlgorithm::outputName() const { return QObject::tr( "Merged" ); diff --git a/src/analysis/processing/qgsalgorithmmergelines.h b/src/analysis/processing/qgsalgorithmmergelines.h index 182bdd7661c..4a6be52e37b 100644 --- a/src/analysis/processing/qgsalgorithmmergelines.h +++ b/src/analysis/processing/qgsalgorithmmergelines.h @@ -42,6 +42,7 @@ class QgsMergeLinesAlgorithm : public QgsProcessingFeatureBasedAlgorithm QString displayName() const override; virtual QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QList inputLayerTypes() const override; QgsMergeLinesAlgorithm *createInstance() const override SIP_FACTORY; diff --git a/src/analysis/processing/qgsalgorithmmergevector.cpp b/src/analysis/processing/qgsalgorithmmergevector.cpp index 30ec785c94e..25effe593c6 100644 --- a/src/analysis/processing/qgsalgorithmmergevector.cpp +++ b/src/analysis/processing/qgsalgorithmmergevector.cpp @@ -39,6 +39,11 @@ QString QgsMergeVectorAlgorithm::group() const return QObject::tr( "Vector general" ); } +QString QgsMergeVectorAlgorithm::groupId() const +{ + return QStringLiteral( "vectorgeneral" ); +} + void QgsMergeVectorAlgorithm::initAlgorithm( const QVariantMap & ) { addParameter( new QgsProcessingParameterMultipleLayers( QStringLiteral( "LAYERS" ), QObject::tr( "Input layers" ), QgsProcessing::TypeVector ) ); diff --git a/src/analysis/processing/qgsalgorithmmergevector.h b/src/analysis/processing/qgsalgorithmmergevector.h index 072636d49cf..8b53c1d9451 100644 --- a/src/analysis/processing/qgsalgorithmmergevector.h +++ b/src/analysis/processing/qgsalgorithmmergevector.h @@ -39,6 +39,7 @@ class QgsMergeVectorAlgorithm : public QgsProcessingAlgorithm QString displayName() const override; virtual QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QgsMergeVectorAlgorithm *createInstance() const override SIP_FACTORY; diff --git a/src/analysis/processing/qgsalgorithmminimumenclosingcircle.cpp b/src/analysis/processing/qgsalgorithmminimumenclosingcircle.cpp index 5af54f991b4..e855bcd3784 100644 --- a/src/analysis/processing/qgsalgorithmminimumenclosingcircle.cpp +++ b/src/analysis/processing/qgsalgorithmminimumenclosingcircle.cpp @@ -39,6 +39,11 @@ QString QgsMinimumEnclosingCircleAlgorithm::group() const return QObject::tr( "Vector geometry" ); } +QString QgsMinimumEnclosingCircleAlgorithm::groupId() const +{ + return QStringLiteral( "vectorgeometry" ); +} + QString QgsMinimumEnclosingCircleAlgorithm::outputName() const { return QObject::tr( "Minimum enclosing circles" ); diff --git a/src/analysis/processing/qgsalgorithmminimumenclosingcircle.h b/src/analysis/processing/qgsalgorithmminimumenclosingcircle.h index ce6bee6b2fc..8337ef9bb39 100644 --- a/src/analysis/processing/qgsalgorithmminimumenclosingcircle.h +++ b/src/analysis/processing/qgsalgorithmminimumenclosingcircle.h @@ -39,6 +39,7 @@ class QgsMinimumEnclosingCircleAlgorithm : public QgsProcessingFeatureBasedAlgor QString displayName() const override; virtual QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QgsMinimumEnclosingCircleAlgorithm *createInstance() const override SIP_FACTORY; diff --git a/src/analysis/processing/qgsalgorithmmultiparttosinglepart.cpp b/src/analysis/processing/qgsalgorithmmultiparttosinglepart.cpp index 99229e84d48..36f7818c945 100644 --- a/src/analysis/processing/qgsalgorithmmultiparttosinglepart.cpp +++ b/src/analysis/processing/qgsalgorithmmultiparttosinglepart.cpp @@ -39,6 +39,11 @@ QString QgsMultipartToSinglepartAlgorithm::group() const return QObject::tr( "Vector geometry" ); } +QString QgsMultipartToSinglepartAlgorithm::groupId() const +{ + return QStringLiteral( "vectorgeometry" ); +} + void QgsMultipartToSinglepartAlgorithm::initAlgorithm( const QVariantMap & ) { addParameter( new QgsProcessingParameterFeatureSource( QStringLiteral( "INPUT" ), QObject::tr( "Input layer" ) ) ); diff --git a/src/analysis/processing/qgsalgorithmmultiparttosinglepart.h b/src/analysis/processing/qgsalgorithmmultiparttosinglepart.h index f52d53b0dec..4a56c8c94a1 100644 --- a/src/analysis/processing/qgsalgorithmmultiparttosinglepart.h +++ b/src/analysis/processing/qgsalgorithmmultiparttosinglepart.h @@ -39,6 +39,7 @@ class QgsMultipartToSinglepartAlgorithm : public QgsProcessingAlgorithm QString displayName() const override; virtual QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QgsMultipartToSinglepartAlgorithm *createInstance() const override SIP_FACTORY; diff --git a/src/analysis/processing/qgsalgorithmorderbyexpression.cpp b/src/analysis/processing/qgsalgorithmorderbyexpression.cpp index 06880a97ef0..6a9b7e4f1ba 100644 --- a/src/analysis/processing/qgsalgorithmorderbyexpression.cpp +++ b/src/analysis/processing/qgsalgorithmorderbyexpression.cpp @@ -42,6 +42,11 @@ QString QgsOrderByExpressionAlgorithm::group() const return QObject::tr( "Vector general" ); } +QString QgsOrderByExpressionAlgorithm::groupId() const +{ + return QStringLiteral( "vectorgeneral" ); +} + void QgsOrderByExpressionAlgorithm::initAlgorithm( const QVariantMap & ) { addParameter( new QgsProcessingParameterFeatureSource( QStringLiteral( "INPUT" ), QObject::tr( "Input layer" ) ) ); diff --git a/src/analysis/processing/qgsalgorithmorderbyexpression.h b/src/analysis/processing/qgsalgorithmorderbyexpression.h index eec70a17f53..a6efaec5b26 100644 --- a/src/analysis/processing/qgsalgorithmorderbyexpression.h +++ b/src/analysis/processing/qgsalgorithmorderbyexpression.h @@ -39,6 +39,7 @@ class QgsOrderByExpressionAlgorithm : public QgsProcessingAlgorithm QString displayName() const override; virtual QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QgsOrderByExpressionAlgorithm *createInstance() const override SIP_FACTORY; diff --git a/src/analysis/processing/qgsalgorithmorientedminimumboundingbox.cpp b/src/analysis/processing/qgsalgorithmorientedminimumboundingbox.cpp index a1d556f9582..44424341a22 100644 --- a/src/analysis/processing/qgsalgorithmorientedminimumboundingbox.cpp +++ b/src/analysis/processing/qgsalgorithmorientedminimumboundingbox.cpp @@ -39,6 +39,11 @@ QString QgsOrientedMinimumBoundingBoxAlgorithm::group() const return QObject::tr( "Vector geometry" ); } +QString QgsOrientedMinimumBoundingBoxAlgorithm::groupId() const +{ + return QStringLiteral( "vectorgeometry" ); +} + QString QgsOrientedMinimumBoundingBoxAlgorithm::outputName() const { return QObject::tr( "Bounding boxes" ); diff --git a/src/analysis/processing/qgsalgorithmorientedminimumboundingbox.h b/src/analysis/processing/qgsalgorithmorientedminimumboundingbox.h index a806744aab7..3cd5a4682d8 100644 --- a/src/analysis/processing/qgsalgorithmorientedminimumboundingbox.h +++ b/src/analysis/processing/qgsalgorithmorientedminimumboundingbox.h @@ -38,6 +38,7 @@ class QgsOrientedMinimumBoundingBoxAlgorithm : public QgsProcessingFeatureBasedA QString displayName() const override; virtual QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QgsOrientedMinimumBoundingBoxAlgorithm *createInstance() const override SIP_FACTORY; diff --git a/src/analysis/processing/qgsalgorithmpackage.cpp b/src/analysis/processing/qgsalgorithmpackage.cpp index b0ed3d01684..891f4d46c8f 100644 --- a/src/analysis/processing/qgsalgorithmpackage.cpp +++ b/src/analysis/processing/qgsalgorithmpackage.cpp @@ -42,6 +42,11 @@ QString QgsPackageAlgorithm::group() const return QObject::tr( "Database" ); } +QString QgsPackageAlgorithm::groupId() const +{ + return QStringLiteral( "database" ); +} + void QgsPackageAlgorithm::initAlgorithm( const QVariantMap & ) { addParameter( new QgsProcessingParameterMultipleLayers( QStringLiteral( "LAYERS" ), QObject::tr( "Input layers" ), QgsProcessing::TypeVector ) ); diff --git a/src/analysis/processing/qgsalgorithmpackage.h b/src/analysis/processing/qgsalgorithmpackage.h index 9b777db0167..d2242f5a1d1 100644 --- a/src/analysis/processing/qgsalgorithmpackage.h +++ b/src/analysis/processing/qgsalgorithmpackage.h @@ -41,6 +41,7 @@ class QgsPackageAlgorithm : public QgsProcessingAlgorithm QString displayName() const override; virtual QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QgsPackageAlgorithm *createInstance() const override SIP_FACTORY; diff --git a/src/analysis/processing/qgsalgorithmpromotetomultipart.cpp b/src/analysis/processing/qgsalgorithmpromotetomultipart.cpp index 4b07574c4d7..b761be0123d 100644 --- a/src/analysis/processing/qgsalgorithmpromotetomultipart.cpp +++ b/src/analysis/processing/qgsalgorithmpromotetomultipart.cpp @@ -39,6 +39,11 @@ QString QgsPromoteToMultipartAlgorithm::group() const return QObject::tr( "Vector geometry" ); } +QString QgsPromoteToMultipartAlgorithm::groupId() const +{ + return QStringLiteral( "vectorgeometry" ); +} + QString QgsPromoteToMultipartAlgorithm::outputName() const { return QObject::tr( "Multiparts" ); diff --git a/src/analysis/processing/qgsalgorithmpromotetomultipart.h b/src/analysis/processing/qgsalgorithmpromotetomultipart.h index dcf3f98ea02..f5196e990a4 100644 --- a/src/analysis/processing/qgsalgorithmpromotetomultipart.h +++ b/src/analysis/processing/qgsalgorithmpromotetomultipart.h @@ -39,6 +39,7 @@ class QgsPromoteToMultipartAlgorithm : public QgsProcessingFeatureBasedAlgorithm QString displayName() const override; virtual QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QgsPromoteToMultipartAlgorithm *createInstance() const override SIP_FACTORY; diff --git a/src/analysis/processing/qgsalgorithmrasterlayeruniquevalues.cpp b/src/analysis/processing/qgsalgorithmrasterlayeruniquevalues.cpp index 6b8489ebc6a..cf5449f9860 100644 --- a/src/analysis/processing/qgsalgorithmrasterlayeruniquevalues.cpp +++ b/src/analysis/processing/qgsalgorithmrasterlayeruniquevalues.cpp @@ -39,6 +39,10 @@ QString QgsRasterLayerUniqueValuesReportAlgorithm::group() const return QObject::tr( "Raster analysis" ); } +QString QgsRasterLayerUniqueValuesReportAlgorithm::groupId() const +{ + return QStringLiteral( "rasteranalysis" ); +} void QgsRasterLayerUniqueValuesReportAlgorithm::initAlgorithm( const QVariantMap & ) { diff --git a/src/analysis/processing/qgsalgorithmrasterlayeruniquevalues.h b/src/analysis/processing/qgsalgorithmrasterlayeruniquevalues.h index f184887d6a5..faa7802be41 100644 --- a/src/analysis/processing/qgsalgorithmrasterlayeruniquevalues.h +++ b/src/analysis/processing/qgsalgorithmrasterlayeruniquevalues.h @@ -39,6 +39,7 @@ class QgsRasterLayerUniqueValuesReportAlgorithm : public QgsProcessingAlgorithm QString displayName() const override; virtual QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QgsRasterLayerUniqueValuesReportAlgorithm *createInstance() const override SIP_FACTORY; diff --git a/src/analysis/processing/qgsalgorithmremoveduplicatenodes.cpp b/src/analysis/processing/qgsalgorithmremoveduplicatenodes.cpp index 057adcbcad0..313b83b9589 100644 --- a/src/analysis/processing/qgsalgorithmremoveduplicatenodes.cpp +++ b/src/analysis/processing/qgsalgorithmremoveduplicatenodes.cpp @@ -39,6 +39,11 @@ QString QgsAlgorithmRemoveDuplicateNodes::group() const return QObject::tr( "Vector geometry" ); } +QString QgsAlgorithmRemoveDuplicateNodes::groupId() const +{ + return QStringLiteral( "vectorgeometry" ); +} + QString QgsAlgorithmRemoveDuplicateNodes::outputName() const { return QObject::tr( "Cleaned" ); diff --git a/src/analysis/processing/qgsalgorithmremoveduplicatenodes.h b/src/analysis/processing/qgsalgorithmremoveduplicatenodes.h index 6b2ddc6e2ed..58a87874557 100644 --- a/src/analysis/processing/qgsalgorithmremoveduplicatenodes.h +++ b/src/analysis/processing/qgsalgorithmremoveduplicatenodes.h @@ -38,6 +38,7 @@ class QgsAlgorithmRemoveDuplicateNodes : public QgsProcessingFeatureBasedAlgorit QString displayName() const override; virtual QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QgsAlgorithmRemoveDuplicateNodes *createInstance() const override SIP_FACTORY; void initParameters( const QVariantMap &configuration = QVariantMap() ) override; diff --git a/src/analysis/processing/qgsalgorithmremovenullgeometry.cpp b/src/analysis/processing/qgsalgorithmremovenullgeometry.cpp index 4d41e2182c6..6ff91765ffc 100644 --- a/src/analysis/processing/qgsalgorithmremovenullgeometry.cpp +++ b/src/analysis/processing/qgsalgorithmremovenullgeometry.cpp @@ -36,7 +36,12 @@ QStringList QgsRemoveNullGeometryAlgorithm::tags() const QString QgsRemoveNullGeometryAlgorithm::group() const { - return QObject::tr( "Vector selection" ); + return QObject::tr( "Vector geometry" ); +} + +QString QgsRemoveNullGeometryAlgorithm::groupId() const +{ + return QStringLiteral( "vectorgeometry" ); } void QgsRemoveNullGeometryAlgorithm::initAlgorithm( const QVariantMap & ) diff --git a/src/analysis/processing/qgsalgorithmremovenullgeometry.h b/src/analysis/processing/qgsalgorithmremovenullgeometry.h index a747e1910d1..2efacf2b575 100644 --- a/src/analysis/processing/qgsalgorithmremovenullgeometry.h +++ b/src/analysis/processing/qgsalgorithmremovenullgeometry.h @@ -39,6 +39,7 @@ class QgsRemoveNullGeometryAlgorithm : public QgsProcessingAlgorithm QString displayName() const override; virtual QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QgsRemoveNullGeometryAlgorithm *createInstance() const override SIP_FACTORY; diff --git a/src/analysis/processing/qgsalgorithmrenamelayer.cpp b/src/analysis/processing/qgsalgorithmrenamelayer.cpp index 759dc655025..396ffdfb741 100644 --- a/src/analysis/processing/qgsalgorithmrenamelayer.cpp +++ b/src/analysis/processing/qgsalgorithmrenamelayer.cpp @@ -44,6 +44,11 @@ QString QgsRenameLayerAlgorithm::group() const return QObject::tr( "Modeler tools" ); } +QString QgsRenameLayerAlgorithm::groupId() const +{ + return QStringLiteral( "modelertools" ); +} + QString QgsRenameLayerAlgorithm::shortHelpString() const { return QObject::tr( "This algorithm renames a layer." ); diff --git a/src/analysis/processing/qgsalgorithmrenamelayer.h b/src/analysis/processing/qgsalgorithmrenamelayer.h index 2a6f52db6fb..31b5ca1f13f 100644 --- a/src/analysis/processing/qgsalgorithmrenamelayer.h +++ b/src/analysis/processing/qgsalgorithmrenamelayer.h @@ -38,6 +38,7 @@ class QgsRenameLayerAlgorithm : public QgsProcessingAlgorithm QString displayName() const override; virtual QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QgsRenameLayerAlgorithm *createInstance() const override SIP_FACTORY; diff --git a/src/analysis/processing/qgsalgorithmsaveselectedfeatures.cpp b/src/analysis/processing/qgsalgorithmsaveselectedfeatures.cpp index b294ffd42f7..3182667480e 100644 --- a/src/analysis/processing/qgsalgorithmsaveselectedfeatures.cpp +++ b/src/analysis/processing/qgsalgorithmsaveselectedfeatures.cpp @@ -45,6 +45,11 @@ QString QgsSaveSelectedFeatures::group() const return QObject::tr( "Vector general" ); } +QString QgsSaveSelectedFeatures::groupId() const +{ + return QStringLiteral( "vectorgeneral" ); +} + QString QgsSaveSelectedFeatures::shortHelpString() const { return QObject::tr( "This algorithm creates a new layer with all the selected features in a given vector layer.\n\n" diff --git a/src/analysis/processing/qgsalgorithmsaveselectedfeatures.h b/src/analysis/processing/qgsalgorithmsaveselectedfeatures.h index 0058972c406..9f6b7656b23 100644 --- a/src/analysis/processing/qgsalgorithmsaveselectedfeatures.h +++ b/src/analysis/processing/qgsalgorithmsaveselectedfeatures.h @@ -39,6 +39,7 @@ class QgsSaveSelectedFeatures : public QgsProcessingAlgorithm QString displayName() const override; QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QgsSaveSelectedFeatures *createInstance() const override SIP_FACTORY; diff --git a/src/analysis/processing/qgsalgorithmsimplify.cpp b/src/analysis/processing/qgsalgorithmsimplify.cpp index 309f339be4d..1f4d1523189 100644 --- a/src/analysis/processing/qgsalgorithmsimplify.cpp +++ b/src/analysis/processing/qgsalgorithmsimplify.cpp @@ -39,6 +39,11 @@ QString QgsSimplifyAlgorithm::group() const return QObject::tr( "Vector geometry" ); } +QString QgsSimplifyAlgorithm::groupId() const +{ + return QStringLiteral( "vectorgeometry" ); +} + QString QgsSimplifyAlgorithm::outputName() const { return QObject::tr( "Simplified" ); diff --git a/src/analysis/processing/qgsalgorithmsimplify.h b/src/analysis/processing/qgsalgorithmsimplify.h index 005ee08efe6..02749ccc757 100644 --- a/src/analysis/processing/qgsalgorithmsimplify.h +++ b/src/analysis/processing/qgsalgorithmsimplify.h @@ -39,6 +39,7 @@ class QgsSimplifyAlgorithm : public QgsProcessingFeatureBasedAlgorithm QString displayName() const override; virtual QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QgsSimplifyAlgorithm *createInstance() const override SIP_FACTORY; QList inputLayerTypes() const override; diff --git a/src/analysis/processing/qgsalgorithmsmooth.cpp b/src/analysis/processing/qgsalgorithmsmooth.cpp index 714c6243058..b13555d090d 100644 --- a/src/analysis/processing/qgsalgorithmsmooth.cpp +++ b/src/analysis/processing/qgsalgorithmsmooth.cpp @@ -39,6 +39,11 @@ QString QgsSmoothAlgorithm::group() const return QObject::tr( "Vector geometry" ); } +QString QgsSmoothAlgorithm::groupId() const +{ + return QStringLiteral( "vectorgeometry" ); +} + QString QgsSmoothAlgorithm::outputName() const { return QObject::tr( "Smoothed" ); diff --git a/src/analysis/processing/qgsalgorithmsmooth.h b/src/analysis/processing/qgsalgorithmsmooth.h index b76063a924d..63ac2272031 100644 --- a/src/analysis/processing/qgsalgorithmsmooth.h +++ b/src/analysis/processing/qgsalgorithmsmooth.h @@ -38,6 +38,7 @@ class QgsSmoothAlgorithm : public QgsProcessingFeatureBasedAlgorithm QString displayName() const override; virtual QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QgsSmoothAlgorithm *createInstance() const override SIP_FACTORY; QList inputLayerTypes() const override; diff --git a/src/analysis/processing/qgsalgorithmsnaptogrid.cpp b/src/analysis/processing/qgsalgorithmsnaptogrid.cpp index d6fd690e02c..aefdfe9b18d 100644 --- a/src/analysis/processing/qgsalgorithmsnaptogrid.cpp +++ b/src/analysis/processing/qgsalgorithmsnaptogrid.cpp @@ -39,6 +39,11 @@ QString QgsSnapToGridAlgorithm::group() const return QObject::tr( "Vector geometry" ); } +QString QgsSnapToGridAlgorithm::groupId() const +{ + return QStringLiteral( "vectorgeometry" ); +} + QString QgsSnapToGridAlgorithm::outputName() const { return QObject::tr( "Snapped" ); diff --git a/src/analysis/processing/qgsalgorithmsnaptogrid.h b/src/analysis/processing/qgsalgorithmsnaptogrid.h index a9ba7a2ed83..609ef01366f 100644 --- a/src/analysis/processing/qgsalgorithmsnaptogrid.h +++ b/src/analysis/processing/qgsalgorithmsnaptogrid.h @@ -38,6 +38,7 @@ class QgsSnapToGridAlgorithm : public QgsProcessingFeatureBasedAlgorithm QString displayName() const override; virtual QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QgsSnapToGridAlgorithm *createInstance() const override SIP_FACTORY; void initParameters( const QVariantMap &configuration = QVariantMap() ) override; diff --git a/src/analysis/processing/qgsalgorithmsplitwithlines.cpp b/src/analysis/processing/qgsalgorithmsplitwithlines.cpp index af2cbf9d57b..4476dcbd0ef 100644 --- a/src/analysis/processing/qgsalgorithmsplitwithlines.cpp +++ b/src/analysis/processing/qgsalgorithmsplitwithlines.cpp @@ -40,6 +40,11 @@ QString QgsSplitWithLinesAlgorithm::group() const return QObject::tr( "Vector overlay" ); } +QString QgsSplitWithLinesAlgorithm::groupId() const +{ + return QStringLiteral( "vectoroverlay" ); +} + void QgsSplitWithLinesAlgorithm::initAlgorithm( const QVariantMap & ) { addParameter( new QgsProcessingParameterFeatureSource( QStringLiteral( "INPUT" ), diff --git a/src/analysis/processing/qgsalgorithmsplitwithlines.h b/src/analysis/processing/qgsalgorithmsplitwithlines.h index 5bf67bc26ce..0d4f791e41c 100644 --- a/src/analysis/processing/qgsalgorithmsplitwithlines.h +++ b/src/analysis/processing/qgsalgorithmsplitwithlines.h @@ -40,6 +40,7 @@ class QgsSplitWithLinesAlgorithm : public QgsProcessingAlgorithm QString displayName() const override; virtual QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QgsSplitWithLinesAlgorithm *createInstance() const override SIP_FACTORY; diff --git a/src/analysis/processing/qgsalgorithmstringconcatenation.cpp b/src/analysis/processing/qgsalgorithmstringconcatenation.cpp index 41a38edbc4a..9bc55b7ea7e 100644 --- a/src/analysis/processing/qgsalgorithmstringconcatenation.cpp +++ b/src/analysis/processing/qgsalgorithmstringconcatenation.cpp @@ -44,6 +44,11 @@ QString QgsStringConcatenationAlgorithm::group() const return QObject::tr( "Modeler tools" ); } +QString QgsStringConcatenationAlgorithm::groupId() const +{ + return QStringLiteral( "modelertools" ); +} + QString QgsStringConcatenationAlgorithm::shortHelpString() const { return QObject::tr( "This algorithm concatenates two strings together." ); diff --git a/src/analysis/processing/qgsalgorithmstringconcatenation.h b/src/analysis/processing/qgsalgorithmstringconcatenation.h index f97b8fb5126..0355f1cbfa6 100644 --- a/src/analysis/processing/qgsalgorithmstringconcatenation.h +++ b/src/analysis/processing/qgsalgorithmstringconcatenation.h @@ -38,6 +38,7 @@ class QgsStringConcatenationAlgorithm : public QgsProcessingAlgorithm QString displayName() const override; virtual QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QgsStringConcatenationAlgorithm *createInstance() const override SIP_FACTORY; diff --git a/src/analysis/processing/qgsalgorithmsubdivide.cpp b/src/analysis/processing/qgsalgorithmsubdivide.cpp index 0ac30f520de..ca4cf9419d1 100644 --- a/src/analysis/processing/qgsalgorithmsubdivide.cpp +++ b/src/analysis/processing/qgsalgorithmsubdivide.cpp @@ -46,6 +46,11 @@ QString QgsSubdivideAlgorithm::group() const return QObject::tr( "Vector geometry" ); } +QString QgsSubdivideAlgorithm::groupId() const +{ + return QStringLiteral( "vectorgeometry" ); +} + QString QgsSubdivideAlgorithm::shortHelpString() const { return QObject::tr( "Subdivides the geometry. The returned geometry will be a collection containing subdivided parts " diff --git a/src/analysis/processing/qgsalgorithmsubdivide.h b/src/analysis/processing/qgsalgorithmsubdivide.h index 17ff76f8cd8..8b4b366f62a 100644 --- a/src/analysis/processing/qgsalgorithmsubdivide.h +++ b/src/analysis/processing/qgsalgorithmsubdivide.h @@ -39,6 +39,7 @@ class QgsSubdivideAlgorithm : public QgsProcessingFeatureBasedAlgorithm QString displayName() const override; virtual QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QgsSubdivideAlgorithm *createInstance() const override SIP_FACTORY; diff --git a/src/analysis/processing/qgsalgorithmtransect.cpp b/src/analysis/processing/qgsalgorithmtransect.cpp index a38a57553d5..86582cfa3bc 100644 --- a/src/analysis/processing/qgsalgorithmtransect.cpp +++ b/src/analysis/processing/qgsalgorithmtransect.cpp @@ -41,6 +41,11 @@ QString QgsTransectAlgorithm::group() const return QObject::tr( "Vector geometry" ); } +QString QgsTransectAlgorithm::groupId() const +{ + return QStringLiteral( "vectorgeometry" ); +} + void QgsTransectAlgorithm::initAlgorithm( const QVariantMap & ) { addParameter( new QgsProcessingParameterFeatureSource( QStringLiteral( "INPUT" ), diff --git a/src/analysis/processing/qgsalgorithmtransect.h b/src/analysis/processing/qgsalgorithmtransect.h index 3f9f944587a..658731e0744 100644 --- a/src/analysis/processing/qgsalgorithmtransect.h +++ b/src/analysis/processing/qgsalgorithmtransect.h @@ -48,6 +48,7 @@ class QgsTransectAlgorithm : public QgsProcessingAlgorithm QString displayName() const override; virtual QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QgsTransectAlgorithm *createInstance() const override SIP_FACTORY; diff --git a/src/analysis/processing/qgsalgorithmtransform.cpp b/src/analysis/processing/qgsalgorithmtransform.cpp index f2748778ace..3d672047473 100644 --- a/src/analysis/processing/qgsalgorithmtransform.cpp +++ b/src/analysis/processing/qgsalgorithmtransform.cpp @@ -55,6 +55,11 @@ QString QgsTransformAlgorithm::group() const return QObject::tr( "Vector general" ); } +QString QgsTransformAlgorithm::groupId() const +{ + return QStringLiteral( "vectorgeneral" ); +} + QString QgsTransformAlgorithm::shortHelpString() const { return QObject::tr( "This algorithm reprojects a vector layer. It creates a new layer with the same features " diff --git a/src/analysis/processing/qgsalgorithmtransform.h b/src/analysis/processing/qgsalgorithmtransform.h index 79e51b1999c..7e55c8476f8 100644 --- a/src/analysis/processing/qgsalgorithmtransform.h +++ b/src/analysis/processing/qgsalgorithmtransform.h @@ -38,6 +38,7 @@ class QgsTransformAlgorithm : public QgsProcessingFeatureBasedAlgorithm QString displayName() const override; virtual QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QgsTransformAlgorithm *createInstance() const override SIP_FACTORY; diff --git a/src/analysis/processing/qgsalgorithmtranslate.cpp b/src/analysis/processing/qgsalgorithmtranslate.cpp index 71e0f282ec6..dc98e86e5af 100644 --- a/src/analysis/processing/qgsalgorithmtranslate.cpp +++ b/src/analysis/processing/qgsalgorithmtranslate.cpp @@ -39,6 +39,11 @@ QString QgsTranslateAlgorithm::group() const return QObject::tr( "Vector geometry" ); } +QString QgsTranslateAlgorithm::groupId() const +{ + return QStringLiteral( "vectorgeometry" ); +} + QString QgsTranslateAlgorithm::outputName() const { return QObject::tr( "Translated" ); diff --git a/src/analysis/processing/qgsalgorithmtranslate.h b/src/analysis/processing/qgsalgorithmtranslate.h index 9e6ca55ae66..37f0a797cc9 100644 --- a/src/analysis/processing/qgsalgorithmtranslate.h +++ b/src/analysis/processing/qgsalgorithmtranslate.h @@ -38,6 +38,7 @@ class QgsTranslateAlgorithm : public QgsProcessingFeatureBasedAlgorithm QString displayName() const override; virtual QStringList tags() const override; QString group() const override; + QString groupId() const override; QString shortHelpString() const override; QgsTranslateAlgorithm *createInstance() const override SIP_FACTORY; void initParameters( const QVariantMap &configuration = QVariantMap() ) override; diff --git a/src/core/processing/models/qgsprocessingmodelalgorithm.cpp b/src/core/processing/models/qgsprocessingmodelalgorithm.cpp index 1b0467b7351..da45513c4ee 100644 --- a/src/core/processing/models/qgsprocessingmodelalgorithm.cpp +++ b/src/core/processing/models/qgsprocessingmodelalgorithm.cpp @@ -26,9 +26,10 @@ ///@cond NOT_STABLE -QgsProcessingModelAlgorithm::QgsProcessingModelAlgorithm( const QString &name, const QString &group ) +QgsProcessingModelAlgorithm::QgsProcessingModelAlgorithm( const QString &name, const QString &group, const QString &groupId ) : mModelName( name.isEmpty() ? QObject::tr( "model" ) : name ) , mModelGroup( group ) + , mModelGroupId( groupId ) {} void QgsProcessingModelAlgorithm::initAlgorithm( const QVariantMap & ) @@ -50,6 +51,11 @@ QString QgsProcessingModelAlgorithm::group() const return mModelGroup; } +QString QgsProcessingModelAlgorithm::groupId() const +{ + return mModelGroupId; +} + QIcon QgsProcessingModelAlgorithm::icon() const { return QgsApplication::getThemeIcon( QStringLiteral( "/processingModel.svg" ) ); diff --git a/src/core/processing/models/qgsprocessingmodelalgorithm.h b/src/core/processing/models/qgsprocessingmodelalgorithm.h index a792ea52551..c04fbba75ac 100644 --- a/src/core/processing/models/qgsprocessingmodelalgorithm.h +++ b/src/core/processing/models/qgsprocessingmodelalgorithm.h @@ -40,13 +40,14 @@ class CORE_EXPORT QgsProcessingModelAlgorithm : public QgsProcessingAlgorithm /** * Constructor for QgsProcessingModelAlgorithm. */ - QgsProcessingModelAlgorithm( const QString &name = QString(), const QString &group = QString() ); + QgsProcessingModelAlgorithm( const QString &name = QString(), const QString &group = QString(), const QString &groupId = QString() ); void initAlgorithm( const QVariantMap &configuration = QVariantMap() ) override; //#spellok QString name() const override; QString displayName() const override; QString group() const override; + QString groupId() const override; QIcon icon() const override; QString svgIconPath() const override; QString shortHelpString() const override; @@ -360,6 +361,7 @@ class CORE_EXPORT QgsProcessingModelAlgorithm : public QgsProcessingAlgorithm QString mModelName; QString mModelGroup; + QString mModelGroupId; QMap< QString, QgsProcessingModelChildAlgorithm > mChildAlgorithms; diff --git a/src/core/processing/qgsprocessingalgorithm.h b/src/core/processing/qgsprocessingalgorithm.h index c8f4042b0f6..2eb5d894443 100644 --- a/src/core/processing/qgsprocessingalgorithm.h +++ b/src/core/processing/qgsprocessingalgorithm.h @@ -193,10 +193,20 @@ class CORE_EXPORT QgsProcessingAlgorithm /** * Returns the name of the group this algorithm belongs to. This string * should be localised. + * \see groupId() * \see tags() */ virtual QString group() const { return QString(); } + /** + * Returns the unique ID of the group this algorithm belongs to. This string + * should be fixed for the algorithm, and must not be localised. The group id + * should be unique within each provider. Group id should contain lowercase + * alphanumeric characters only and no spaces or other formatting characters. + * \see group() + */ + virtual QString groupId() const { return QString(); }; + /** * Returns the flags indicating how and when the algorithm operates and should be exposed to users. * Default flags are FlagSupportsBatch and FlagCanCancel. diff --git a/tests/testdata/polys_overlapping_with_id.dbf b/tests/testdata/polys_overlapping_with_id.dbf index 5aa32a87fc635f14b0eca411327123329c742a47..fd276803f68daf4abf4d7c79bc08a03393c38699 100644 GIT binary patch delta 13 UcmdnUwULX3xs-=*Ba1F802r+T^Z)<= delta 13 UcmdnUwULX3xs+RcBa1F802tH)`~Uy| From 6f439548390185a8396a683f07957f912d8929c3 Mon Sep 17 00:00:00 2001 From: Alexander Bruy Date: Thu, 14 Dec 2017 11:21:01 +0200 Subject: [PATCH 2/6] [processing] add group id to GRASS algorithms --- python/plugins/processing/algs/grass7/Grass7Algorithm.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/python/plugins/processing/algs/grass7/Grass7Algorithm.py b/python/plugins/processing/algs/grass7/Grass7Algorithm.py index 49cead9afcd..e840c2ba3cf 100644 --- a/python/plugins/processing/algs/grass7/Grass7Algorithm.py +++ b/python/plugins/processing/algs/grass7/Grass7Algorithm.py @@ -27,6 +27,7 @@ __revision__ = '$Format:%H$' import sys import os +import re import uuid import importlib @@ -98,6 +99,8 @@ class Grass7Algorithm(QgsProcessingAlgorithm): self._name = '' self._display_name = '' self._group = '' + self._groupId = '' + self.groupIdRegex = re.compile('^[^\s\(]+') self.grass7Name = '' self.params = [] self.hardcodedStrings = [] @@ -138,6 +141,9 @@ class Grass7Algorithm(QgsProcessingAlgorithm): def group(self): return self._group + def groupId(self): + return self._groupId + def icon(self): return QgsApplication.getThemeIcon("/providerGrass.svg") @@ -191,6 +197,7 @@ class Grass7Algorithm(QgsProcessingAlgorithm): # Read the grass group line = lines.readline().strip('\n').strip() self._group = QCoreApplication.translate("GrassAlgorithm", line) + self._groupId = self.groupIdRegex.search(line).group(0).lower() hasRasterOutput = False hasRasterInput = False hasVectorInput = False From 5e157c967d0e75909aca7b77d6d9ebe0c32da103 Mon Sep 17 00:00:00 2001 From: Alexander Bruy Date: Thu, 14 Dec 2017 11:42:24 +0200 Subject: [PATCH 3/6] [processing] add group id to SAGA algorithms --- python/plugins/processing/algs/saga/SagaAlgorithm.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/python/plugins/processing/algs/saga/SagaAlgorithm.py b/python/plugins/processing/algs/saga/SagaAlgorithm.py index cabba5a3bc1..869949f198c 100644 --- a/python/plugins/processing/algs/saga/SagaAlgorithm.py +++ b/python/plugins/processing/algs/saga/SagaAlgorithm.py @@ -73,6 +73,7 @@ class SagaAlgorithm(SagaAlgorithmBase): self._name = '' self._display_name = '' self._group = '' + self._groupId = '' self.params = [] self.defineCharacteristicsFromFile() @@ -92,6 +93,9 @@ class SagaAlgorithm(SagaAlgorithmBase): def group(self): return self._group + def groupId(self): + return self._groupId + def shortHelpString(self): return shortHelp.get(self.id(), None) @@ -119,6 +123,10 @@ class SagaAlgorithm(SagaAlgorithmBase): line = lines.readline().strip('\n').strip() self.undecorated_group = line self._group = self.tr(decoratedGroupName(self.undecorated_group)) + + validChars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789:' + grpName = decoratedGroupName(self.undecorated_group).lower() + self._groupId = ''.join(c for c in grpName if c in validChars) line = lines.readline().strip('\n').strip() while line != '': if line.startswith('Hardcoded'): From 53bc147dca006feb14dc903ea23a6e2c4177b127 Mon Sep 17 00:00:00 2001 From: Alexander Bruy Date: Thu, 14 Dec 2017 12:05:40 +0200 Subject: [PATCH 4/6] [processing] add group id to GDAL algorithms --- python/plugins/processing/algs/gdal/AssignProjection.py | 3 +++ python/plugins/processing/algs/gdal/Buffer.py | 3 +++ python/plugins/processing/algs/gdal/ClipRasterByExtent.py | 3 +++ python/plugins/processing/algs/gdal/ClipRasterByMask.py | 3 +++ python/plugins/processing/algs/gdal/ClipVectorByExtent.py | 3 +++ python/plugins/processing/algs/gdal/ClipVectorByMask.py | 3 +++ python/plugins/processing/algs/gdal/ColorRelief.py | 3 +++ python/plugins/processing/algs/gdal/Dissolve.py | 3 +++ python/plugins/processing/algs/gdal/ExecuteSql.py | 3 +++ python/plugins/processing/algs/gdal/GridAverage.py | 3 +++ python/plugins/processing/algs/gdal/GridDataMetrics.py | 3 +++ python/plugins/processing/algs/gdal/GridInverseDistance.py | 3 +++ .../processing/algs/gdal/GridInverseDistanceNearestNeighbor.py | 3 +++ python/plugins/processing/algs/gdal/GridLinear.py | 3 +++ python/plugins/processing/algs/gdal/GridNearestNeighbor.py | 3 +++ python/plugins/processing/algs/gdal/OffsetCurve.py | 3 +++ python/plugins/processing/algs/gdal/OgrToPostGis.py | 3 +++ python/plugins/processing/algs/gdal/OneSideBuffer.py | 3 +++ python/plugins/processing/algs/gdal/PointsAlongLines.py | 3 +++ python/plugins/processing/algs/gdal/aspect.py | 3 +++ python/plugins/processing/algs/gdal/buildvrt.py | 3 +++ python/plugins/processing/algs/gdal/contour.py | 3 +++ python/plugins/processing/algs/gdal/extractprojection.py | 3 +++ python/plugins/processing/algs/gdal/fillnodata.py | 3 +++ python/plugins/processing/algs/gdal/gdal2tiles.py | 3 +++ python/plugins/processing/algs/gdal/gdal2xyz.py | 3 +++ python/plugins/processing/algs/gdal/gdaladdo.py | 3 +++ python/plugins/processing/algs/gdal/gdalcalc.py | 3 +++ python/plugins/processing/algs/gdal/gdalinfo.py | 3 +++ python/plugins/processing/algs/gdal/gdaltindex.py | 3 +++ python/plugins/processing/algs/gdal/hillshade.py | 3 +++ python/plugins/processing/algs/gdal/merge.py | 3 +++ python/plugins/processing/algs/gdal/nearblack.py | 3 +++ python/plugins/processing/algs/gdal/ogr2ogr.py | 3 +++ .../plugins/processing/algs/gdal/ogr2ogrtabletopostgislist.py | 3 +++ python/plugins/processing/algs/gdal/ogr2ogrtopostgislist.py | 3 +++ python/plugins/processing/algs/gdal/ogrinfo.py | 3 +++ python/plugins/processing/algs/gdal/pct2rgb.py | 3 +++ python/plugins/processing/algs/gdal/polygonize.py | 3 +++ python/plugins/processing/algs/gdal/proximity.py | 3 +++ python/plugins/processing/algs/gdal/rasterize.py | 3 +++ python/plugins/processing/algs/gdal/rasterize_over.py | 3 +++ python/plugins/processing/algs/gdal/retile.py | 3 +++ python/plugins/processing/algs/gdal/rgb2pct.py | 3 +++ python/plugins/processing/algs/gdal/roughness.py | 3 +++ python/plugins/processing/algs/gdal/sieve.py | 3 +++ python/plugins/processing/algs/gdal/slope.py | 3 +++ python/plugins/processing/algs/gdal/tpi.py | 3 +++ python/plugins/processing/algs/gdal/translate.py | 3 +++ python/plugins/processing/algs/gdal/tri.py | 3 +++ python/plugins/processing/algs/gdal/warp.py | 3 +++ 51 files changed, 153 insertions(+) diff --git a/python/plugins/processing/algs/gdal/AssignProjection.py b/python/plugins/processing/algs/gdal/AssignProjection.py index fb9eb634e88..f2f04a6818f 100644 --- a/python/plugins/processing/algs/gdal/AssignProjection.py +++ b/python/plugins/processing/algs/gdal/AssignProjection.py @@ -70,6 +70,9 @@ class AssignProjection(GdalAlgorithm): def group(self): return self.tr('Raster projections') + def group(self): + return 'rasterprojections' + def getConsoleCommands(self, parameters, context, feedback, executing=True): inLayer = self.parameterAsRasterLayer(parameters, self.INPUT, context) fileName = inLayer.source() diff --git a/python/plugins/processing/algs/gdal/Buffer.py b/python/plugins/processing/algs/gdal/Buffer.py index 1e3b77c9d69..aa0ecf4d102 100644 --- a/python/plugins/processing/algs/gdal/Buffer.py +++ b/python/plugins/processing/algs/gdal/Buffer.py @@ -95,6 +95,9 @@ class Buffer(GdalAlgorithm): def group(self): return self.tr('Vector geoprocessing') + def groupId(self): + return 'vectorgeoprocessing' + def commandName(self): return 'ogr2ogr' diff --git a/python/plugins/processing/algs/gdal/ClipRasterByExtent.py b/python/plugins/processing/algs/gdal/ClipRasterByExtent.py index 033396e3825..b8be2da999a 100644 --- a/python/plugins/processing/algs/gdal/ClipRasterByExtent.py +++ b/python/plugins/processing/algs/gdal/ClipRasterByExtent.py @@ -99,6 +99,9 @@ class ClipRasterByExtent(GdalAlgorithm): def group(self): return self.tr('Raster extraction') + def groupId(self): + return 'rasterextraction' + def icon(self): return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'raster-clip.png')) diff --git a/python/plugins/processing/algs/gdal/ClipRasterByMask.py b/python/plugins/processing/algs/gdal/ClipRasterByMask.py index 5e19275c24d..494665e384f 100644 --- a/python/plugins/processing/algs/gdal/ClipRasterByMask.py +++ b/python/plugins/processing/algs/gdal/ClipRasterByMask.py @@ -116,6 +116,9 @@ class ClipRasterByMask(GdalAlgorithm): def group(self): return self.tr('Raster extraction') + def groupId(self): + return 'rasterextraction' + def getConsoleCommands(self, parameters, context, feedback, executing=True): inLayer = self.parameterAsRasterLayer(parameters, self.INPUT, context) diff --git a/python/plugins/processing/algs/gdal/ClipVectorByExtent.py b/python/plugins/processing/algs/gdal/ClipVectorByExtent.py index 3757b0e9f6e..71b0f443b75 100644 --- a/python/plugins/processing/algs/gdal/ClipVectorByExtent.py +++ b/python/plugins/processing/algs/gdal/ClipVectorByExtent.py @@ -71,6 +71,9 @@ class ClipVectorByExtent(GdalAlgorithm): def group(self): return self.tr('Vector geoprocessing') + def groupId(self): + return 'vectorgeoprocessing' + def commandName(self): return 'ogr2ogr' diff --git a/python/plugins/processing/algs/gdal/ClipVectorByMask.py b/python/plugins/processing/algs/gdal/ClipVectorByMask.py index 67eac651977..7389054480a 100644 --- a/python/plugins/processing/algs/gdal/ClipVectorByMask.py +++ b/python/plugins/processing/algs/gdal/ClipVectorByMask.py @@ -70,6 +70,9 @@ class ClipVectorByMask(GdalAlgorithm): def group(self): return self.tr('Vector geoprocessing') + def groupId(self): + return 'vectorgeoprocessing' + def commandName(self): return 'ogr2ogr' diff --git a/python/plugins/processing/algs/gdal/ColorRelief.py b/python/plugins/processing/algs/gdal/ColorRelief.py index 726d63eb0b7..577138636b2 100644 --- a/python/plugins/processing/algs/gdal/ColorRelief.py +++ b/python/plugins/processing/algs/gdal/ColorRelief.py @@ -92,6 +92,9 @@ class ColorRelief(GdalAlgorithm): def group(self): return self.tr('Raster analysis') + def groupId(self): + return 'rasteranalysis' + def getConsoleCommands(self, parameters, context, feedback, executing=True): arguments = ['color-relief'] inLayer = self.parameterAsRasterLayer(parameters, self.INPUT, context) diff --git a/python/plugins/processing/algs/gdal/Dissolve.py b/python/plugins/processing/algs/gdal/Dissolve.py index 306a0e6fcc6..2b03e71fd07 100644 --- a/python/plugins/processing/algs/gdal/Dissolve.py +++ b/python/plugins/processing/algs/gdal/Dissolve.py @@ -106,6 +106,9 @@ class Dissolve(GdalAlgorithm): def group(self): return self.tr('Vector geoprocessing') + def groupId(self): + return 'vectorgeoprocessing' + def commandName(self): return 'ogr2ogr' diff --git a/python/plugins/processing/algs/gdal/ExecuteSql.py b/python/plugins/processing/algs/gdal/ExecuteSql.py index f176a258ae7..698f706e4a5 100644 --- a/python/plugins/processing/algs/gdal/ExecuteSql.py +++ b/python/plugins/processing/algs/gdal/ExecuteSql.py @@ -82,6 +82,9 @@ class ExecuteSql(GdalAlgorithm): def group(self): return self.tr('Vector miscellaneous') + def groupId(self): + return 'vectormiscellaneous' + def getConsoleCommands(self, parameters, context, feedback, executing=True): ogrLayer, layerName = self.getOgrCompatibleSource(self.INPUT, parameters, context, feedback, executing) sql = self.parameterAsString(parameters, self.SQL, context) diff --git a/python/plugins/processing/algs/gdal/GridAverage.py b/python/plugins/processing/algs/gdal/GridAverage.py index 5567aecfdbb..32f9331e659 100644 --- a/python/plugins/processing/algs/gdal/GridAverage.py +++ b/python/plugins/processing/algs/gdal/GridAverage.py @@ -132,6 +132,9 @@ class GridAverage(GdalAlgorithm): def group(self): return self.tr('Raster analysis') + def groupId(self): + return 'rasteranalysis' + def icon(self): return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'grid.png')) diff --git a/python/plugins/processing/algs/gdal/GridDataMetrics.py b/python/plugins/processing/algs/gdal/GridDataMetrics.py index c382b8d41ae..f881fa2543d 100644 --- a/python/plugins/processing/algs/gdal/GridDataMetrics.py +++ b/python/plugins/processing/algs/gdal/GridDataMetrics.py @@ -149,6 +149,9 @@ class GridDataMetrics(GdalAlgorithm): def group(self): return self.tr('Raster analysis') + def groupId(self): + return 'rasteranalysis' + def getConsoleCommands(self, parameters, context, feedback, executing=True): ogrLayer, layerName = self.getOgrCompatibleSource(self.INPUT, parameters, context, feedback, executing) diff --git a/python/plugins/processing/algs/gdal/GridInverseDistance.py b/python/plugins/processing/algs/gdal/GridInverseDistance.py index 4cabda76318..2f9634584ee 100644 --- a/python/plugins/processing/algs/gdal/GridInverseDistance.py +++ b/python/plugins/processing/algs/gdal/GridInverseDistance.py @@ -152,6 +152,9 @@ class GridInverseDistance(GdalAlgorithm): def group(self): return self.tr('Raster analysis') + def groupId(self): + return 'rasteranalysis' + def icon(self): return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'grid.png')) diff --git a/python/plugins/processing/algs/gdal/GridInverseDistanceNearestNeighbor.py b/python/plugins/processing/algs/gdal/GridInverseDistanceNearestNeighbor.py index 7bdaef572a9..a1c860246c8 100644 --- a/python/plugins/processing/algs/gdal/GridInverseDistanceNearestNeighbor.py +++ b/python/plugins/processing/algs/gdal/GridInverseDistanceNearestNeighbor.py @@ -139,6 +139,9 @@ class GridInverseDistanceNearestNeighbor(GdalAlgorithm): def group(self): return self.tr('Raster analysis') + def groupId(self): + return 'rasteranalysis' + def icon(self): return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'grid.png')) diff --git a/python/plugins/processing/algs/gdal/GridLinear.py b/python/plugins/processing/algs/gdal/GridLinear.py index 07f1d2527f7..b32f9e8493f 100644 --- a/python/plugins/processing/algs/gdal/GridLinear.py +++ b/python/plugins/processing/algs/gdal/GridLinear.py @@ -114,6 +114,9 @@ class GridLinear(GdalAlgorithm): def group(self): return self.tr('Raster analysis') + def groupId(self): + return 'rasteranalysis' + def icon(self): return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'grid.png')) diff --git a/python/plugins/processing/algs/gdal/GridNearestNeighbor.py b/python/plugins/processing/algs/gdal/GridNearestNeighbor.py index 7a066ee09bc..41b27109f81 100644 --- a/python/plugins/processing/algs/gdal/GridNearestNeighbor.py +++ b/python/plugins/processing/algs/gdal/GridNearestNeighbor.py @@ -127,6 +127,9 @@ class GridNearestNeighbor(GdalAlgorithm): def group(self): return self.tr('Raster analysis') + def groupId(self): + return 'rasteranalysis' + def icon(self): return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'grid.png')) diff --git a/python/plugins/processing/algs/gdal/OffsetCurve.py b/python/plugins/processing/algs/gdal/OffsetCurve.py index 7346a0a60f5..f6b9bb22b2b 100644 --- a/python/plugins/processing/algs/gdal/OffsetCurve.py +++ b/python/plugins/processing/algs/gdal/OffsetCurve.py @@ -78,6 +78,9 @@ class OffsetCurve(GdalAlgorithm): def group(self): return self.tr('Vector geoprocessing') + def groupId(self): + return 'vectorgeoprocessing' + def commandName(self): return 'ogr2ogr' diff --git a/python/plugins/processing/algs/gdal/OgrToPostGis.py b/python/plugins/processing/algs/gdal/OgrToPostGis.py index 255c9b204d5..a65a29223ab 100644 --- a/python/plugins/processing/algs/gdal/OgrToPostGis.py +++ b/python/plugins/processing/algs/gdal/OgrToPostGis.py @@ -162,6 +162,9 @@ class OgrToPostGis(GdalAlgorithm): def group(self): return self.tr('Vector miscellaneous') + def groupId(self): + return 'vectormiscellaneous' + def getConnectionString(self, parameters, context): host = self.parameterAsString(parameters, self.HOST, context) port = self.parameterAsString(parameters, self.PORT, context) diff --git a/python/plugins/processing/algs/gdal/OneSideBuffer.py b/python/plugins/processing/algs/gdal/OneSideBuffer.py index b0c7b2e664f..913f27f2cc8 100644 --- a/python/plugins/processing/algs/gdal/OneSideBuffer.py +++ b/python/plugins/processing/algs/gdal/OneSideBuffer.py @@ -104,6 +104,9 @@ class OneSideBuffer(GdalAlgorithm): def group(self): return self.tr('Vector geoprocessing') + def groupId(self): + return 'vectorgeoprocessing' + def commandName(self): return 'ogr2ogr' diff --git a/python/plugins/processing/algs/gdal/PointsAlongLines.py b/python/plugins/processing/algs/gdal/PointsAlongLines.py index 362cd37c9cc..d0915e8f139 100644 --- a/python/plugins/processing/algs/gdal/PointsAlongLines.py +++ b/python/plugins/processing/algs/gdal/PointsAlongLines.py @@ -83,6 +83,9 @@ class PointsAlongLines(GdalAlgorithm): def group(self): return self.tr('Vector geoprocessing') + def groupId(self): + return 'vectorgeoprocessing' + def commandName(self): return 'ogr2ogr' diff --git a/python/plugins/processing/algs/gdal/aspect.py b/python/plugins/processing/algs/gdal/aspect.py index ccbc5b8ac20..9913b4c02b8 100644 --- a/python/plugins/processing/algs/gdal/aspect.py +++ b/python/plugins/processing/algs/gdal/aspect.py @@ -93,6 +93,9 @@ class aspect(GdalAlgorithm): def group(self): return self.tr('Raster analysis') + def groupId(self): + return 'rasteranalysis' + def getConsoleCommands(self, parameters, context, feedback, executing=True): arguments = ['aspect'] inLayer = self.parameterAsRasterLayer(parameters, self.INPUT, context) diff --git a/python/plugins/processing/algs/gdal/buildvrt.py b/python/plugins/processing/algs/gdal/buildvrt.py index a4d72572186..d5dc8b6f144 100644 --- a/python/plugins/processing/algs/gdal/buildvrt.py +++ b/python/plugins/processing/algs/gdal/buildvrt.py @@ -100,6 +100,9 @@ class buildvrt(GdalAlgorithm): def group(self): return self.tr('Raster miscellaneous') + def groupId(self): + return 'rastermiscellaneous' + def getConsoleCommands(self, parameters, context, feedback, executing=True): arguments = [] arguments.append('-resolution') diff --git a/python/plugins/processing/algs/gdal/contour.py b/python/plugins/processing/algs/gdal/contour.py index 07b7ce29e00..b12e24e0321 100644 --- a/python/plugins/processing/algs/gdal/contour.py +++ b/python/plugins/processing/algs/gdal/contour.py @@ -118,6 +118,9 @@ class contour(GdalAlgorithm): def group(self): return self.tr('Raster extraction') + def groupId(self): + return 'rasterextraction' + def getConsoleCommands(self, parameters, context, feedback, executing=True): inLayer = self.parameterAsRasterLayer(parameters, self.INPUT, context) fieldName = self.parameterAsString(parameters, self.FIELD_NAME, context) diff --git a/python/plugins/processing/algs/gdal/extractprojection.py b/python/plugins/processing/algs/gdal/extractprojection.py index 94c189cb02a..2c72b311ea6 100644 --- a/python/plugins/processing/algs/gdal/extractprojection.py +++ b/python/plugins/processing/algs/gdal/extractprojection.py @@ -63,6 +63,9 @@ class ExtractProjection(GdalAlgorithm): def group(self): return self.tr('Raster projections') + def groupId(self): + return 'rasterprojections' + def getConsoleCommands(self, parameters, context, feedback, executing=True): return ["extractprojection"] diff --git a/python/plugins/processing/algs/gdal/fillnodata.py b/python/plugins/processing/algs/gdal/fillnodata.py index 81cb2397085..fe36993e61f 100644 --- a/python/plugins/processing/algs/gdal/fillnodata.py +++ b/python/plugins/processing/algs/gdal/fillnodata.py @@ -86,6 +86,9 @@ class fillnodata(GdalAlgorithm): def group(self): return self.tr('Raster analysis') + def groupId(self): + return 'rasteranalysis' + def getConsoleCommands(self, parameters, context, feedback, executing=True): arguments = [] arguments.append('-md') diff --git a/python/plugins/processing/algs/gdal/gdal2tiles.py b/python/plugins/processing/algs/gdal/gdal2tiles.py index cf11db12202..02ca102480b 100644 --- a/python/plugins/processing/algs/gdal/gdal2tiles.py +++ b/python/plugins/processing/algs/gdal/gdal2tiles.py @@ -153,6 +153,9 @@ class gdal2tiles(GdalAlgorithm): def group(self): return self.tr('Raster miscellaneous') + def groupId(self): + return 'rastermiscellaneous' + def getConsoleCommands(self, parameters, context, feedback, executing=True): arguments = [] diff --git a/python/plugins/processing/algs/gdal/gdal2xyz.py b/python/plugins/processing/algs/gdal/gdal2xyz.py index facac8e9ec6..29b37a6b868 100644 --- a/python/plugins/processing/algs/gdal/gdal2xyz.py +++ b/python/plugins/processing/algs/gdal/gdal2xyz.py @@ -69,6 +69,9 @@ class gdal2xyz(GdalAlgorithm): def group(self): return self.tr('Raster conversion') + def groupId(self): + return 'rasterconversion' + def getConsoleCommands(self, parameters, context, feedback, executing=True): arguments = [] arguments = [] diff --git a/python/plugins/processing/algs/gdal/gdaladdo.py b/python/plugins/processing/algs/gdal/gdaladdo.py index 24ff23dc738..385d3c57646 100644 --- a/python/plugins/processing/algs/gdal/gdaladdo.py +++ b/python/plugins/processing/algs/gdal/gdaladdo.py @@ -99,6 +99,9 @@ class gdaladdo(GdalAlgorithm): def group(self): return self.tr('Raster miscellaneous') + def groupId(self): + return 'rastermiscellaneous' + def icon(self): return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'raster-overview.png')) diff --git a/python/plugins/processing/algs/gdal/gdalcalc.py b/python/plugins/processing/algs/gdal/gdalcalc.py index 8becf4fc7ca..0325f77904c 100644 --- a/python/plugins/processing/algs/gdal/gdalcalc.py +++ b/python/plugins/processing/algs/gdal/gdalcalc.py @@ -102,6 +102,9 @@ class gdalcalc(GdalAlgorithm): def group(self): return self.tr('Raster miscellaneous') + def groupId(self): + return 'rastermiscellaneous' + def getConsoleCommands(self, parameters, context, feedback, executing=True): out = self.getOutputValue(self.OUTPUT) extra = self.getParameterValue(self.EXTRA) diff --git a/python/plugins/processing/algs/gdal/gdalinfo.py b/python/plugins/processing/algs/gdal/gdalinfo.py index ff5d94d1a85..1096afe9b5e 100644 --- a/python/plugins/processing/algs/gdal/gdalinfo.py +++ b/python/plugins/processing/algs/gdal/gdalinfo.py @@ -80,6 +80,9 @@ class gdalinfo(GdalAlgorithm): def group(self): return self.tr('Raster miscellaneous') + def groupId(self): + return 'rastermiscellaneous' + def icon(self): return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'raster-info.png')) diff --git a/python/plugins/processing/algs/gdal/gdaltindex.py b/python/plugins/processing/algs/gdal/gdaltindex.py index 8d29b238211..c392ba27bf9 100644 --- a/python/plugins/processing/algs/gdal/gdaltindex.py +++ b/python/plugins/processing/algs/gdal/gdaltindex.py @@ -111,6 +111,9 @@ class gdaltindex(GdalAlgorithm): def group(self): return self.tr('Raster miscellaneous') + def groupId(self): + return 'rastermiscellaneous' + def icon(self): return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'tiles.png')) diff --git a/python/plugins/processing/algs/gdal/hillshade.py b/python/plugins/processing/algs/gdal/hillshade.py index e16ebfc7056..3737dd23ce2 100644 --- a/python/plugins/processing/algs/gdal/hillshade.py +++ b/python/plugins/processing/algs/gdal/hillshade.py @@ -120,6 +120,9 @@ class hillshade(GdalAlgorithm): def group(self): return self.tr('Raster analysis') + def groupId(self): + return 'rasteranalysis' + def getConsoleCommands(self, parameters, context, feedback, executing=True): arguments = ['hillshade'] inLayer = self.parameterAsRasterLayer(parameters, self.INPUT, context) diff --git a/python/plugins/processing/algs/gdal/merge.py b/python/plugins/processing/algs/gdal/merge.py index f1784078ff4..5f9fe423d58 100644 --- a/python/plugins/processing/algs/gdal/merge.py +++ b/python/plugins/processing/algs/gdal/merge.py @@ -98,6 +98,9 @@ class merge(GdalAlgorithm): def group(self): return self.tr('Raster miscellaneous') + def groupId(self): + return 'rastermiscellaneous' + def icon(self): return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'merge.png')) diff --git a/python/plugins/processing/algs/gdal/nearblack.py b/python/plugins/processing/algs/gdal/nearblack.py index de5b63143a3..712ea6370d3 100644 --- a/python/plugins/processing/algs/gdal/nearblack.py +++ b/python/plugins/processing/algs/gdal/nearblack.py @@ -86,6 +86,9 @@ class nearblack(GdalAlgorithm): def group(self): return self.tr('Raster analysis') + def groupId(self): + return 'rasteranalysis' + def icon(self): return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'nearblack.png')) diff --git a/python/plugins/processing/algs/gdal/ogr2ogr.py b/python/plugins/processing/algs/gdal/ogr2ogr.py index c81876e6338..22e031083dd 100644 --- a/python/plugins/processing/algs/gdal/ogr2ogr.py +++ b/python/plugins/processing/algs/gdal/ogr2ogr.py @@ -68,6 +68,9 @@ class ogr2ogr(GdalAlgorithm): def group(self): return self.tr('Vector conversion') + def groupId(self): + return 'vectorconversion' + def commandName(self): return 'ogr2ogr' diff --git a/python/plugins/processing/algs/gdal/ogr2ogrtabletopostgislist.py b/python/plugins/processing/algs/gdal/ogr2ogrtabletopostgislist.py index 41bbd8e661d..4c2e07731ec 100644 --- a/python/plugins/processing/algs/gdal/ogr2ogrtabletopostgislist.py +++ b/python/plugins/processing/algs/gdal/ogr2ogrtabletopostgislist.py @@ -119,6 +119,9 @@ class Ogr2OgrTableToPostGisList(GdalAlgorithm): def group(self): return self.tr('Vector miscellaneous') + def groupId(self): + return 'vectormiscellaneous' + def getConsoleCommands(self, parameters, context, feedback, executing=True): connection = self.DB_CONNECTIONS[self.getParameterValue(self.DATABASE)] uri = uri_from_name(connection) diff --git a/python/plugins/processing/algs/gdal/ogr2ogrtopostgislist.py b/python/plugins/processing/algs/gdal/ogr2ogrtopostgislist.py index f8a93e8c22e..2b4917ee59d 100644 --- a/python/plugins/processing/algs/gdal/ogr2ogrtopostgislist.py +++ b/python/plugins/processing/algs/gdal/ogr2ogrtopostgislist.py @@ -176,6 +176,9 @@ class Ogr2OgrToPostGisList(GdalAlgorithm): def group(self): return self.tr('Vector miscellaneous') + def groupId(self): + return 'vectormiscellaneous' + def getConsoleCommands(self, parameters, context, feedback, executing=True): connection = self.parameterAsString(parameters, self.DATABASE, context) uri = uri_from_name(connection) diff --git a/python/plugins/processing/algs/gdal/ogrinfo.py b/python/plugins/processing/algs/gdal/ogrinfo.py index c518ec607b4..52568d1d7e8 100644 --- a/python/plugins/processing/algs/gdal/ogrinfo.py +++ b/python/plugins/processing/algs/gdal/ogrinfo.py @@ -68,6 +68,9 @@ class ogrinfo(GdalAlgorithm): def group(self): return self.tr('Vector miscellaneous') + def group(self): + return 'vectormiscellaneous' + def getConsoleCommands(self, parameters, context, feedback, executing=True): arguments = ['ogrinfo'] arguments.append('-al') diff --git a/python/plugins/processing/algs/gdal/pct2rgb.py b/python/plugins/processing/algs/gdal/pct2rgb.py index 602722c2c99..0deda3c5dd0 100644 --- a/python/plugins/processing/algs/gdal/pct2rgb.py +++ b/python/plugins/processing/algs/gdal/pct2rgb.py @@ -71,6 +71,9 @@ class pct2rgb(GdalAlgorithm): def group(self): return self.tr('Raster conversion') + def groupId(self): + return 'rasterconversion' + def icon(self): return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', '8-to-24-bits.png')) diff --git a/python/plugins/processing/algs/gdal/polygonize.py b/python/plugins/processing/algs/gdal/polygonize.py index 6c545b2fe0b..e2672b01eb8 100644 --- a/python/plugins/processing/algs/gdal/polygonize.py +++ b/python/plugins/processing/algs/gdal/polygonize.py @@ -79,6 +79,9 @@ class polygonize(GdalAlgorithm): def group(self): return self.tr('Raster conversion') + def group(self): + return 'rasterconversion' + def icon(self): return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'polygonize.png')) diff --git a/python/plugins/processing/algs/gdal/proximity.py b/python/plugins/processing/algs/gdal/proximity.py index a7187bd0a54..eae4a7f36b0 100644 --- a/python/plugins/processing/algs/gdal/proximity.py +++ b/python/plugins/processing/algs/gdal/proximity.py @@ -128,6 +128,9 @@ class proximity(GdalAlgorithm): def group(self): return self.tr('Raster analysis') + def groupId(self): + return 'rasteranalysis' + def getConsoleCommands(self, parameters, context, feedback, executing=True): inLayer = self.parameterAsRasterLayer(parameters, self.INPUT, context) distance = self.parameterAsDouble(parameters, self.MAX_DISTANCE, context) diff --git a/python/plugins/processing/algs/gdal/rasterize.py b/python/plugins/processing/algs/gdal/rasterize.py index fa8440a6c4e..c46992ff2b1 100644 --- a/python/plugins/processing/algs/gdal/rasterize.py +++ b/python/plugins/processing/algs/gdal/rasterize.py @@ -94,6 +94,9 @@ class rasterize(GdalAlgorithm): def group(self): return self.tr('Vector conversion') + def groupId(self): + return 'vectorconversion' + def getConsoleCommands(self, parameters, context, feedback, executing=True): inLayer = self.getParameterValue(self.INPUT) noData = self.getParameterValue(self.NO_DATA) diff --git a/python/plugins/processing/algs/gdal/rasterize_over.py b/python/plugins/processing/algs/gdal/rasterize_over.py index d81417ad631..7c315eefe13 100644 --- a/python/plugins/processing/algs/gdal/rasterize_over.py +++ b/python/plugins/processing/algs/gdal/rasterize_over.py @@ -67,6 +67,9 @@ class rasterize_over(GdalAlgorithm): def group(self): return self.tr('Vector conversion') + def groupId(self): + return 'vectorconversion' + def getConsoleCommands(self, parameters, context, feedback, executing=True): context = dataobjects.createContext() inLayer = QgsProcessingUtils.mapLayerFromString(self.getParameterValue(self.INPUT), context) diff --git a/python/plugins/processing/algs/gdal/retile.py b/python/plugins/processing/algs/gdal/retile.py index b12e7e0a3e2..3a66fd88e8b 100644 --- a/python/plugins/processing/algs/gdal/retile.py +++ b/python/plugins/processing/algs/gdal/retile.py @@ -157,6 +157,9 @@ class retile(GdalAlgorithm): def group(self): return self.tr('Raster miscellaneous') + def groupId(self): + return 'rastermiscellaneous' + def commandName(self): return "gdal_retile" diff --git a/python/plugins/processing/algs/gdal/rgb2pct.py b/python/plugins/processing/algs/gdal/rgb2pct.py index c788521f7bf..d6eb566948c 100644 --- a/python/plugins/processing/algs/gdal/rgb2pct.py +++ b/python/plugins/processing/algs/gdal/rgb2pct.py @@ -70,6 +70,9 @@ class rgb2pct(GdalAlgorithm): def group(self): return self.tr('Raster conversion') + def groupId(self): + return 'rasterconversion' + def icon(self): return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', '24-to-8-bits.png')) diff --git a/python/plugins/processing/algs/gdal/roughness.py b/python/plugins/processing/algs/gdal/roughness.py index 1ef8458ef42..31f80d75053 100644 --- a/python/plugins/processing/algs/gdal/roughness.py +++ b/python/plugins/processing/algs/gdal/roughness.py @@ -82,6 +82,9 @@ class roughness(GdalAlgorithm): def group(self): return self.tr('Raster analysis') + def groupId(self): + return 'rasteranalysis' + def getConsoleCommands(self, parameters, context, feedback, executing=True): arguments = ['roughness'] inLayer = self.parameterAsRasterLayer(parameters, self.INPUT, context) diff --git a/python/plugins/processing/algs/gdal/sieve.py b/python/plugins/processing/algs/gdal/sieve.py index fea6f47591c..3bb13bd9327 100644 --- a/python/plugins/processing/algs/gdal/sieve.py +++ b/python/plugins/processing/algs/gdal/sieve.py @@ -81,6 +81,9 @@ class sieve(GdalAlgorithm): def group(self): return self.tr('Raster analysis') + def groupId(self): + return 'rasteranalysis' + def icon(self): return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'sieve.png')) diff --git a/python/plugins/processing/algs/gdal/slope.py b/python/plugins/processing/algs/gdal/slope.py index a915c659eca..2954f6dc11d 100644 --- a/python/plugins/processing/algs/gdal/slope.py +++ b/python/plugins/processing/algs/gdal/slope.py @@ -97,6 +97,9 @@ class slope(GdalAlgorithm): def group(self): return self.tr('Raster analysis') + def groupId(self): + return 'rasteranalysis' + def getConsoleCommands(self, parameters, context, feedback, executing=True): arguments = ['slope'] inLayer = self.parameterAsRasterLayer(parameters, self.INPUT, context) diff --git a/python/plugins/processing/algs/gdal/tpi.py b/python/plugins/processing/algs/gdal/tpi.py index 7700061262e..04de40a786e 100644 --- a/python/plugins/processing/algs/gdal/tpi.py +++ b/python/plugins/processing/algs/gdal/tpi.py @@ -81,6 +81,9 @@ class tpi(GdalAlgorithm): def group(self): return self.tr('Raster analysis') + def groupId(self): + return 'rasteranalysis' + def getConsoleCommands(self, parameters, context, feedback, executing=True): arguments = ['TPI'] inLayer = self.parameterAsRasterLayer(parameters, self.INPUT, context) diff --git a/python/plugins/processing/algs/gdal/translate.py b/python/plugins/processing/algs/gdal/translate.py index ee5e8bae18e..82d62c4b154 100644 --- a/python/plugins/processing/algs/gdal/translate.py +++ b/python/plugins/processing/algs/gdal/translate.py @@ -104,6 +104,9 @@ class translate(GdalAlgorithm): def group(self): return self.tr('Raster conversion') + def groupId(self): + return 'rasterconversion' + def icon(self): return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'translate.png')) diff --git a/python/plugins/processing/algs/gdal/tri.py b/python/plugins/processing/algs/gdal/tri.py index 55c3dd988dd..cbe536f5484 100644 --- a/python/plugins/processing/algs/gdal/tri.py +++ b/python/plugins/processing/algs/gdal/tri.py @@ -80,6 +80,9 @@ class tri(GdalAlgorithm): def group(self): return self.tr('Raster analysis') + def groupId(self): + return 'rasteranalysis' + def getConsoleCommands(self, parameters, context, feedback, executing=True): arguments = ['TRI'] inLayer = self.parameterAsRasterLayer(parameters, self.INPUT, context) diff --git a/python/plugins/processing/algs/gdal/warp.py b/python/plugins/processing/algs/gdal/warp.py index ef353a4639b..52f83a7f944 100644 --- a/python/plugins/processing/algs/gdal/warp.py +++ b/python/plugins/processing/algs/gdal/warp.py @@ -146,6 +146,9 @@ class warp(GdalAlgorithm): def group(self): return self.tr('Raster projections') + def groupId(self): + return 'rasterprojections' + def icon(self): return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'warp.png')) From dca37abd0e1452abedadb972e0627918136c124b Mon Sep 17 00:00:00 2001 From: Alexander Bruy Date: Thu, 14 Dec 2017 14:03:56 +0200 Subject: [PATCH 5/6] [processing] add group id to QGIS algorithms --- python/plugins/processing/algs/qgis/AddTableField.py | 3 +++ python/plugins/processing/algs/qgis/Aggregate.py | 3 +++ python/plugins/processing/algs/qgis/Aspect.py | 3 +++ python/plugins/processing/algs/qgis/BarPlot.py | 3 +++ python/plugins/processing/algs/qgis/BasicStatistics.py | 3 +++ python/plugins/processing/algs/qgis/BoxPlot.py | 3 +++ python/plugins/processing/algs/qgis/CheckValidity.py | 3 +++ python/plugins/processing/algs/qgis/ConcaveHull.py | 3 +++ python/plugins/processing/algs/qgis/CreateAttributeIndex.py | 3 +++ python/plugins/processing/algs/qgis/CreateConstantRaster.py | 3 +++ python/plugins/processing/algs/qgis/Datasources2Vrt.py | 3 +++ python/plugins/processing/algs/qgis/DefineProjection.py | 3 +++ python/plugins/processing/algs/qgis/Delaunay.py | 3 +++ python/plugins/processing/algs/qgis/DeleteColumn.py | 3 +++ .../processing/algs/qgis/DeleteDuplicateGeometries.py | 3 +++ python/plugins/processing/algs/qgis/DeleteHoles.py | 3 +++ python/plugins/processing/algs/qgis/DensifyGeometries.py | 3 +++ .../processing/algs/qgis/DensifyGeometriesInterval.py | 3 +++ python/plugins/processing/algs/qgis/Difference.py | 3 +++ python/plugins/processing/algs/qgis/EliminateSelection.py | 3 +++ python/plugins/processing/algs/qgis/EquivalentNumField.py | 3 +++ python/plugins/processing/algs/qgis/ExecuteSQL.py | 3 +++ python/plugins/processing/algs/qgis/Explode.py | 3 +++ python/plugins/processing/algs/qgis/ExportGeometryInfo.py | 3 +++ python/plugins/processing/algs/qgis/ExtendLines.py | 3 +++ python/plugins/processing/algs/qgis/ExtentFromLayer.py | 3 +++ python/plugins/processing/algs/qgis/ExtractSpecificNodes.py | 3 +++ python/plugins/processing/algs/qgis/FieldPyculator.py | 3 +++ python/plugins/processing/algs/qgis/FieldsCalculator.py | 3 +++ python/plugins/processing/algs/qgis/FieldsMapper.py | 3 +++ python/plugins/processing/algs/qgis/FindProjection.py | 3 +++ python/plugins/processing/algs/qgis/FixedDistanceBuffer.py | 3 +++ python/plugins/processing/algs/qgis/GeometryByExpression.py | 3 +++ python/plugins/processing/algs/qgis/GeometryConvert.py | 3 +++ python/plugins/processing/algs/qgis/GridLine.py | 3 +++ python/plugins/processing/algs/qgis/GridPolygon.py | 3 +++ python/plugins/processing/algs/qgis/Heatmap.py | 3 +++ python/plugins/processing/algs/qgis/Hillshade.py | 3 +++ python/plugins/processing/algs/qgis/HubDistanceLines.py | 3 +++ python/plugins/processing/algs/qgis/HubDistancePoints.py | 3 +++ python/plugins/processing/algs/qgis/HypsometricCurves.py | 3 +++ python/plugins/processing/algs/qgis/IdwInterpolation.py | 3 +++ python/plugins/processing/algs/qgis/ImportIntoPostGIS.py | 3 +++ python/plugins/processing/algs/qgis/ImportIntoSpatialite.py | 3 +++ python/plugins/processing/algs/qgis/Intersection.py | 3 +++ python/plugins/processing/algs/qgis/LinesToPolygons.py | 3 +++ python/plugins/processing/algs/qgis/MeanAndStdDevPlot.py | 3 +++ .../plugins/processing/algs/qgis/MinimumBoundingGeometry.py | 3 +++ .../processing/algs/qgis/NearestNeighbourAnalysis.py | 3 +++ python/plugins/processing/algs/qgis/OffsetLine.py | 3 +++ python/plugins/processing/algs/qgis/Orthogonalize.py | 3 +++ python/plugins/processing/algs/qgis/PointDistance.py | 3 +++ python/plugins/processing/algs/qgis/PointOnSurface.py | 3 +++ python/plugins/processing/algs/qgis/PointsAlongGeometry.py | 3 +++ python/plugins/processing/algs/qgis/PointsDisplacement.py | 3 +++ python/plugins/processing/algs/qgis/PointsFromLines.py | 3 +++ python/plugins/processing/algs/qgis/PointsFromPolygons.py | 3 +++ python/plugins/processing/algs/qgis/PointsInPolygon.py | 3 +++ python/plugins/processing/algs/qgis/PointsLayerFromTable.py | 3 +++ python/plugins/processing/algs/qgis/PointsToPaths.py | 3 +++ python/plugins/processing/algs/qgis/PolarPlot.py | 3 +++ .../plugins/processing/algs/qgis/PoleOfInaccessibility.py | 3 +++ python/plugins/processing/algs/qgis/Polygonize.py | 3 +++ python/plugins/processing/algs/qgis/PolygonsToLines.py | 3 +++ python/plugins/processing/algs/qgis/PostGISExecuteSQL.py | 3 +++ python/plugins/processing/algs/qgis/RandomExtract.py | 3 +++ .../processing/algs/qgis/RandomExtractWithinSubsets.py | 3 +++ .../plugins/processing/algs/qgis/RandomPointsAlongLines.py | 3 +++ python/plugins/processing/algs/qgis/RandomPointsExtent.py | 3 +++ python/plugins/processing/algs/qgis/RandomPointsLayer.py | 3 +++ python/plugins/processing/algs/qgis/RandomPointsPolygons.py | 3 +++ python/plugins/processing/algs/qgis/RandomSelection.py | 3 +++ .../processing/algs/qgis/RandomSelectionWithinSubsets.py | 3 +++ python/plugins/processing/algs/qgis/RasterCalculator.py | 6 ++++-- python/plugins/processing/algs/qgis/RasterLayerHistogram.py | 3 +++ .../plugins/processing/algs/qgis/RasterLayerStatistics.py | 3 +++ python/plugins/processing/algs/qgis/Rasterize.py | 3 +++ .../processing/algs/qgis/RectanglesOvalsDiamondsFixed.py | 3 +++ .../processing/algs/qgis/RectanglesOvalsDiamondsVariable.py | 3 +++ python/plugins/processing/algs/qgis/RegularPoints.py | 3 +++ python/plugins/processing/algs/qgis/Relief.py | 3 +++ python/plugins/processing/algs/qgis/ReverseLineDirection.py | 3 +++ python/plugins/processing/algs/qgis/Ruggedness.py | 3 +++ python/plugins/processing/algs/qgis/SelectByAttribute.py | 3 +++ python/plugins/processing/algs/qgis/SelectByExpression.py | 3 +++ python/plugins/processing/algs/qgis/ServiceAreaFromLayer.py | 3 +++ python/plugins/processing/algs/qgis/ServiceAreaFromPoint.py | 3 +++ python/plugins/processing/algs/qgis/SetMValue.py | 3 +++ python/plugins/processing/algs/qgis/SetRasterStyle.py | 3 +++ python/plugins/processing/algs/qgis/SetVectorStyle.py | 3 +++ python/plugins/processing/algs/qgis/SetZValue.py | 3 +++ .../processing/algs/qgis/ShortestPathLayerToPoint.py | 3 +++ .../processing/algs/qgis/ShortestPathPointToLayer.py | 3 +++ .../processing/algs/qgis/ShortestPathPointToPoint.py | 3 +++ python/plugins/processing/algs/qgis/SingleSidedBuffer.py | 3 +++ python/plugins/processing/algs/qgis/Slope.py | 3 +++ python/plugins/processing/algs/qgis/SnapGeometries.py | 3 +++ python/plugins/processing/algs/qgis/SpatialIndex.py | 3 +++ python/plugins/processing/algs/qgis/SpatialJoin.py | 3 +++ python/plugins/processing/algs/qgis/SpatialJoinSummary.py | 3 +++ python/plugins/processing/algs/qgis/SpatialiteExecuteSQL.py | 3 +++ .../plugins/processing/algs/qgis/StatisticsByCategories.py | 3 +++ python/plugins/processing/algs/qgis/SumLines.py | 3 +++ .../plugins/processing/algs/qgis/SymmetricalDifference.py | 3 +++ python/plugins/processing/algs/qgis/TextToFloat.py | 3 +++ python/plugins/processing/algs/qgis/TinInterpolation.py | 3 +++ python/plugins/processing/algs/qgis/TopoColors.py | 3 +++ python/plugins/processing/algs/qgis/TruncateTable.py | 3 +++ python/plugins/processing/algs/qgis/Union.py | 3 +++ python/plugins/processing/algs/qgis/UniqueValues.py | 3 +++ .../plugins/processing/algs/qgis/VariableDistanceBuffer.py | 3 +++ python/plugins/processing/algs/qgis/VectorLayerHistogram.py | 3 +++ .../plugins/processing/algs/qgis/VectorLayerScatterplot.py | 3 +++ .../processing/algs/qgis/VectorLayerScatterplot3D.py | 3 +++ python/plugins/processing/algs/qgis/VectorSplit.py | 3 +++ python/plugins/processing/algs/qgis/VoronoiPolygons.py | 3 +++ python/plugins/processing/algs/qgis/ZonalStatistics.py | 3 +++ 117 files changed, 352 insertions(+), 2 deletions(-) diff --git a/python/plugins/processing/algs/qgis/AddTableField.py b/python/plugins/processing/algs/qgis/AddTableField.py index d99d8608bb0..04578a4258f 100644 --- a/python/plugins/processing/algs/qgis/AddTableField.py +++ b/python/plugins/processing/algs/qgis/AddTableField.py @@ -46,6 +46,9 @@ class AddTableField(QgisFeatureBasedAlgorithm): def group(self): return self.tr('Vector table') + def groupId(self): + return 'vectortable' + def __init__(self): super().__init__() self.type_names = [self.tr('Integer'), diff --git a/python/plugins/processing/algs/qgis/Aggregate.py b/python/plugins/processing/algs/qgis/Aggregate.py index 6c5cf881204..530f6b74439 100644 --- a/python/plugins/processing/algs/qgis/Aggregate.py +++ b/python/plugins/processing/algs/qgis/Aggregate.py @@ -57,6 +57,9 @@ class Aggregate(QgisAlgorithm): def group(self): return self.tr('Vector geometry') + def groupId(self): + return 'vectorgeometry' + def name(self): return 'aggregate' diff --git a/python/plugins/processing/algs/qgis/Aspect.py b/python/plugins/processing/algs/qgis/Aspect.py index 70c08b4ffc3..0b9b19e65b0 100644 --- a/python/plugins/processing/algs/qgis/Aspect.py +++ b/python/plugins/processing/algs/qgis/Aspect.py @@ -51,6 +51,9 @@ class Aspect(QgisAlgorithm): def group(self): return self.tr('Raster terrain analysis') + def groupId(self): + return 'rasterterrainanalysis' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/BarPlot.py b/python/plugins/processing/algs/qgis/BarPlot.py index 388d83f96a9..e498c543645 100644 --- a/python/plugins/processing/algs/qgis/BarPlot.py +++ b/python/plugins/processing/algs/qgis/BarPlot.py @@ -47,6 +47,9 @@ class BarPlot(QgisAlgorithm): def group(self): return self.tr('Graphics') + def groupId(self): + return 'graphics' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/BasicStatistics.py b/python/plugins/processing/algs/qgis/BasicStatistics.py index 5ddeb15a3c6..0cc21efb614 100644 --- a/python/plugins/processing/algs/qgis/BasicStatistics.py +++ b/python/plugins/processing/algs/qgis/BasicStatistics.py @@ -83,6 +83,9 @@ class BasicStatisticsForField(QgisAlgorithm): def group(self): return self.tr('Vector analysis') + def groupId(self): + return 'vectoranalysis' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/BoxPlot.py b/python/plugins/processing/algs/qgis/BoxPlot.py index 642679aff61..d3c3d51be03 100644 --- a/python/plugins/processing/algs/qgis/BoxPlot.py +++ b/python/plugins/processing/algs/qgis/BoxPlot.py @@ -49,6 +49,9 @@ class BoxPlot(QgisAlgorithm): def group(self): return self.tr('Graphics') + def groupId(self): + return 'graphics' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/CheckValidity.py b/python/plugins/processing/algs/qgis/CheckValidity.py index 1c2187dc972..93f2988db14 100644 --- a/python/plugins/processing/algs/qgis/CheckValidity.py +++ b/python/plugins/processing/algs/qgis/CheckValidity.py @@ -68,6 +68,9 @@ class CheckValidity(QgisAlgorithm): def group(self): return self.tr('Vector geometry') + def groupId(self): + return 'vectorgeometry' + def tags(self): return self.tr('valid,invalid,detect').split(',') diff --git a/python/plugins/processing/algs/qgis/ConcaveHull.py b/python/plugins/processing/algs/qgis/ConcaveHull.py index 5d3d97557f0..ad14c4375ce 100644 --- a/python/plugins/processing/algs/qgis/ConcaveHull.py +++ b/python/plugins/processing/algs/qgis/ConcaveHull.py @@ -51,6 +51,9 @@ class ConcaveHull(QgisAlgorithm): def group(self): return self.tr('Vector geometry') + def groupId(self): + return 'vectorgeometry' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/CreateAttributeIndex.py b/python/plugins/processing/algs/qgis/CreateAttributeIndex.py index d7021d202de..b7d2f68823c 100644 --- a/python/plugins/processing/algs/qgis/CreateAttributeIndex.py +++ b/python/plugins/processing/algs/qgis/CreateAttributeIndex.py @@ -43,6 +43,9 @@ class CreateAttributeIndex(QgisAlgorithm): def group(self): return self.tr('Vector general') + def groupId(self): + return 'vectorgeneral' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/CreateConstantRaster.py b/python/plugins/processing/algs/qgis/CreateConstantRaster.py index 9e21b8d732a..003606f0f6b 100644 --- a/python/plugins/processing/algs/qgis/CreateConstantRaster.py +++ b/python/plugins/processing/algs/qgis/CreateConstantRaster.py @@ -50,6 +50,9 @@ class CreateConstantRaster(QgisAlgorithm): def group(self): return self.tr('Raster tools') + def groupId(self): + return 'rastertools' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/Datasources2Vrt.py b/python/plugins/processing/algs/qgis/Datasources2Vrt.py index c5e0b3f3660..d7a7351bdcd 100644 --- a/python/plugins/processing/algs/qgis/Datasources2Vrt.py +++ b/python/plugins/processing/algs/qgis/Datasources2Vrt.py @@ -49,6 +49,9 @@ class Datasources2Vrt(QgisAlgorithm): def group(self): return self.tr('Vector general') + def groupId(self): + return 'vectorgeneral' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/DefineProjection.py b/python/plugins/processing/algs/qgis/DefineProjection.py index 74b3eb5f401..21992263d8f 100644 --- a/python/plugins/processing/algs/qgis/DefineProjection.py +++ b/python/plugins/processing/algs/qgis/DefineProjection.py @@ -46,6 +46,9 @@ class DefineProjection(QgisAlgorithm): def group(self): return self.tr('Vector general') + def groupId(self): + return 'vectorgeneral' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/Delaunay.py b/python/plugins/processing/algs/qgis/Delaunay.py index 78973d45ed9..662150e5092 100644 --- a/python/plugins/processing/algs/qgis/Delaunay.py +++ b/python/plugins/processing/algs/qgis/Delaunay.py @@ -61,6 +61,9 @@ class Delaunay(QgisAlgorithm): def group(self): return self.tr('Vector geometry') + def groupId(self): + return 'vectorgeometry' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/DeleteColumn.py b/python/plugins/processing/algs/qgis/DeleteColumn.py index 81271b9f65d..2c7c0fcbea2 100644 --- a/python/plugins/processing/algs/qgis/DeleteColumn.py +++ b/python/plugins/processing/algs/qgis/DeleteColumn.py @@ -40,6 +40,9 @@ class DeleteColumn(QgisFeatureBasedAlgorithm): def group(self): return self.tr('Vector table') + def groupId(self): + return 'vectortable' + def __init__(self): super().__init__() self.fields_to_delete = [] diff --git a/python/plugins/processing/algs/qgis/DeleteDuplicateGeometries.py b/python/plugins/processing/algs/qgis/DeleteDuplicateGeometries.py index 9c6b3800a6a..3043264c697 100644 --- a/python/plugins/processing/algs/qgis/DeleteDuplicateGeometries.py +++ b/python/plugins/processing/algs/qgis/DeleteDuplicateGeometries.py @@ -40,6 +40,9 @@ class DeleteDuplicateGeometries(QgisAlgorithm): def group(self): return self.tr('Vector general') + def groupId(self): + return 'vectorgeneral' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/DeleteHoles.py b/python/plugins/processing/algs/qgis/DeleteHoles.py index 56461c079a6..023ba27b014 100644 --- a/python/plugins/processing/algs/qgis/DeleteHoles.py +++ b/python/plugins/processing/algs/qgis/DeleteHoles.py @@ -48,6 +48,9 @@ class DeleteHoles(QgisFeatureBasedAlgorithm): def group(self): return self.tr('Vector geometry') + def groupId(self): + return 'vectorgeometry' + def name(self): return 'deleteholes' diff --git a/python/plugins/processing/algs/qgis/DensifyGeometries.py b/python/plugins/processing/algs/qgis/DensifyGeometries.py index e0f2ec77afa..ddd11483f35 100755 --- a/python/plugins/processing/algs/qgis/DensifyGeometries.py +++ b/python/plugins/processing/algs/qgis/DensifyGeometries.py @@ -43,6 +43,9 @@ class DensifyGeometries(QgisFeatureBasedAlgorithm): def group(self): return self.tr('Vector geometry') + def groupId(self): + return 'vectorgeometry' + def __init__(self): super().__init__() self.vertices = None diff --git a/python/plugins/processing/algs/qgis/DensifyGeometriesInterval.py b/python/plugins/processing/algs/qgis/DensifyGeometriesInterval.py index cfb08edbd2d..c981856dbcf 100755 --- a/python/plugins/processing/algs/qgis/DensifyGeometriesInterval.py +++ b/python/plugins/processing/algs/qgis/DensifyGeometriesInterval.py @@ -39,6 +39,9 @@ class DensifyGeometriesInterval(QgisFeatureBasedAlgorithm): def group(self): return self.tr('Vector geometry') + def groupId(self): + return 'vectorgeometry' + def __init__(self): super().__init__() self.interval = None diff --git a/python/plugins/processing/algs/qgis/Difference.py b/python/plugins/processing/algs/qgis/Difference.py index fb4f4da4659..4715c5a91db 100644 --- a/python/plugins/processing/algs/qgis/Difference.py +++ b/python/plugins/processing/algs/qgis/Difference.py @@ -54,6 +54,9 @@ class Difference(QgisAlgorithm): def group(self): return self.tr('Vector overlay') + def groupId(self): + return 'vectoroverlay' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/EliminateSelection.py b/python/plugins/processing/algs/qgis/EliminateSelection.py index cec862a12e9..2cf08929317 100644 --- a/python/plugins/processing/algs/qgis/EliminateSelection.py +++ b/python/plugins/processing/algs/qgis/EliminateSelection.py @@ -61,6 +61,9 @@ class EliminateSelection(QgisAlgorithm): def group(self): return self.tr('Vector geometry') + def groupId(self): + return 'vectorgeometry' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/EquivalentNumField.py b/python/plugins/processing/algs/qgis/EquivalentNumField.py index 5f82900fd60..42129863073 100644 --- a/python/plugins/processing/algs/qgis/EquivalentNumField.py +++ b/python/plugins/processing/algs/qgis/EquivalentNumField.py @@ -43,6 +43,9 @@ class EquivalentNumField(QgisAlgorithm): def group(self): return self.tr('Vector table') + def groupId(self): + return 'vectortable' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/ExecuteSQL.py b/python/plugins/processing/algs/qgis/ExecuteSQL.py index dfa7baa9055..921e1762747 100644 --- a/python/plugins/processing/algs/qgis/ExecuteSQL.py +++ b/python/plugins/processing/algs/qgis/ExecuteSQL.py @@ -56,6 +56,9 @@ class ExecuteSQL(QgisAlgorithm): def group(self): return self.tr('Vector general') + def groupId(self): + return 'vectorgeneral' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/Explode.py b/python/plugins/processing/algs/qgis/Explode.py index 6269e0f7fef..e1af087d5a4 100644 --- a/python/plugins/processing/algs/qgis/Explode.py +++ b/python/plugins/processing/algs/qgis/Explode.py @@ -44,6 +44,9 @@ class Explode(QgisAlgorithm): def group(self): return self.tr('Vector geometry') + def groupId(self): + return 'vectorgeometry' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/ExportGeometryInfo.py b/python/plugins/processing/algs/qgis/ExportGeometryInfo.py index 7bfd7ed86cc..77a3997eb40 100644 --- a/python/plugins/processing/algs/qgis/ExportGeometryInfo.py +++ b/python/plugins/processing/algs/qgis/ExportGeometryInfo.py @@ -62,6 +62,9 @@ class ExportGeometryInfo(QgisAlgorithm): def group(self): return self.tr('Vector geometry') + def groupId(self): + return 'vectorgeometry' + def __init__(self): super().__init__() self.export_z = False diff --git a/python/plugins/processing/algs/qgis/ExtendLines.py b/python/plugins/processing/algs/qgis/ExtendLines.py index 127ee1a23b8..17e54a126fd 100644 --- a/python/plugins/processing/algs/qgis/ExtendLines.py +++ b/python/plugins/processing/algs/qgis/ExtendLines.py @@ -39,6 +39,9 @@ class ExtendLines(QgisFeatureBasedAlgorithm): def group(self): return self.tr('Vector geometry') + def groupId(self): + return 'vectorgeometry' + def __init__(self): super().__init__() self.start_distance = None diff --git a/python/plugins/processing/algs/qgis/ExtentFromLayer.py b/python/plugins/processing/algs/qgis/ExtentFromLayer.py index bf213fa586f..ec7dd5aa099 100644 --- a/python/plugins/processing/algs/qgis/ExtentFromLayer.py +++ b/python/plugins/processing/algs/qgis/ExtentFromLayer.py @@ -61,6 +61,9 @@ class ExtentFromLayer(QgisAlgorithm): def group(self): return self.tr('Layer tools') + def groupId(self): + return 'layertools' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/ExtractSpecificNodes.py b/python/plugins/processing/algs/qgis/ExtractSpecificNodes.py index a2cdd1ee3cc..e1b0d26c9ae 100644 --- a/python/plugins/processing/algs/qgis/ExtractSpecificNodes.py +++ b/python/plugins/processing/algs/qgis/ExtractSpecificNodes.py @@ -50,6 +50,9 @@ class ExtractSpecificNodes(QgisAlgorithm): def group(self): return self.tr('Vector geometry') + def groupId(self): + return 'vectorgeometry' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/FieldPyculator.py b/python/plugins/processing/algs/qgis/FieldPyculator.py index e4de834ca19..e66d1dcf4c8 100644 --- a/python/plugins/processing/algs/qgis/FieldPyculator.py +++ b/python/plugins/processing/algs/qgis/FieldPyculator.py @@ -56,6 +56,9 @@ class FieldsPyculator(QgisAlgorithm): def group(self): return self.tr('Vector table') + def groupId(self): + return 'vectortable' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/FieldsCalculator.py b/python/plugins/processing/algs/qgis/FieldsCalculator.py index d75a904c258..134505d6268 100644 --- a/python/plugins/processing/algs/qgis/FieldsCalculator.py +++ b/python/plugins/processing/algs/qgis/FieldsCalculator.py @@ -60,6 +60,9 @@ class FieldsCalculator(QgisAlgorithm): def group(self): return self.tr('Vector table') + def groupId(self): + return 'vectortable' + def __init__(self): super().__init__() self.type_names = [self.tr('Float'), diff --git a/python/plugins/processing/algs/qgis/FieldsMapper.py b/python/plugins/processing/algs/qgis/FieldsMapper.py index d70ea593d41..0e38aebbcf5 100644 --- a/python/plugins/processing/algs/qgis/FieldsMapper.py +++ b/python/plugins/processing/algs/qgis/FieldsMapper.py @@ -46,6 +46,9 @@ class FieldsMapper(QgisFeatureBasedAlgorithm): def group(self): return self.tr('Vector table') + def groupId(self): + return 'vectortable' + def initParameters(self, config=None): class ParameterFieldsMapping(QgsProcessingParameterDefinition): diff --git a/python/plugins/processing/algs/qgis/FindProjection.py b/python/plugins/processing/algs/qgis/FindProjection.py index 488039306f0..5ba700dec29 100644 --- a/python/plugins/processing/algs/qgis/FindProjection.py +++ b/python/plugins/processing/algs/qgis/FindProjection.py @@ -59,6 +59,9 @@ class FindProjection(QgisAlgorithm): def group(self): return self.tr('Vector general') + def groupId(self): + return 'vectorgeneral' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/FixedDistanceBuffer.py b/python/plugins/processing/algs/qgis/FixedDistanceBuffer.py index 45e385cb017..3cff99f5151 100644 --- a/python/plugins/processing/algs/qgis/FixedDistanceBuffer.py +++ b/python/plugins/processing/algs/qgis/FixedDistanceBuffer.py @@ -62,6 +62,9 @@ class FixedDistanceBuffer(QgisAlgorithm): def group(self): return self.tr('Vector geometry') + def groupId(self): + return 'vectorgeometry' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/GeometryByExpression.py b/python/plugins/processing/algs/qgis/GeometryByExpression.py index 0487036eeaa..0e7903a1d95 100755 --- a/python/plugins/processing/algs/qgis/GeometryByExpression.py +++ b/python/plugins/processing/algs/qgis/GeometryByExpression.py @@ -46,6 +46,9 @@ class GeometryByExpression(QgisFeatureBasedAlgorithm): def group(self): return self.tr('Vector geometry') + def groupId(self): + return 'vectorgeometry' + def __init__(self): super().__init__() self.geometry_types = [self.tr('Polygon'), diff --git a/python/plugins/processing/algs/qgis/GeometryConvert.py b/python/plugins/processing/algs/qgis/GeometryConvert.py index 549f3fd7ec2..c21465e9463 100644 --- a/python/plugins/processing/algs/qgis/GeometryConvert.py +++ b/python/plugins/processing/algs/qgis/GeometryConvert.py @@ -48,6 +48,9 @@ class GeometryConvert(QgisAlgorithm): def group(self): return self.tr('Vector geometry') + def groupId(self): + return 'vectorgeometry' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/GridLine.py b/python/plugins/processing/algs/qgis/GridLine.py index 274d041a247..76ba6a9014a 100644 --- a/python/plugins/processing/algs/qgis/GridLine.py +++ b/python/plugins/processing/algs/qgis/GridLine.py @@ -70,6 +70,9 @@ class GridLine(QgisAlgorithm): def group(self): return self.tr('Vector creation') + def groupId(self): + return 'vectorcreation' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/GridPolygon.py b/python/plugins/processing/algs/qgis/GridPolygon.py index cd0a1c3575c..23d5de695e3 100644 --- a/python/plugins/processing/algs/qgis/GridPolygon.py +++ b/python/plugins/processing/algs/qgis/GridPolygon.py @@ -69,6 +69,9 @@ class GridPolygon(QgisAlgorithm): def group(self): return self.tr('Vector creation') + def groupId(self): + return 'vectorcreation' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/Heatmap.py b/python/plugins/processing/algs/qgis/Heatmap.py index 1d40131a52b..677966e399a 100644 --- a/python/plugins/processing/algs/qgis/Heatmap.py +++ b/python/plugins/processing/algs/qgis/Heatmap.py @@ -69,6 +69,9 @@ class Heatmap(QgisAlgorithm): def group(self): return self.tr('Interpolation') + def groupId(self): + return 'interpolation' + def name(self): return 'heatmapkerneldensityestimation' diff --git a/python/plugins/processing/algs/qgis/Hillshade.py b/python/plugins/processing/algs/qgis/Hillshade.py index 7875408696d..e25e97d15fd 100644 --- a/python/plugins/processing/algs/qgis/Hillshade.py +++ b/python/plugins/processing/algs/qgis/Hillshade.py @@ -53,6 +53,9 @@ class Hillshade(QgisAlgorithm): def group(self): return self.tr('Raster terrain analysis') + def groupId(self): + return 'rasterterrainanalysis' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/HubDistanceLines.py b/python/plugins/processing/algs/qgis/HubDistanceLines.py index 02ba850fa40..20a98e6dfa0 100644 --- a/python/plugins/processing/algs/qgis/HubDistanceLines.py +++ b/python/plugins/processing/algs/qgis/HubDistanceLines.py @@ -66,6 +66,9 @@ class HubDistanceLines(QgisAlgorithm): def group(self): return self.tr('Vector analysis') + def groupId(self): + return 'vectoranalysis' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/HubDistancePoints.py b/python/plugins/processing/algs/qgis/HubDistancePoints.py index f8d9fb62662..b5e82280131 100644 --- a/python/plugins/processing/algs/qgis/HubDistancePoints.py +++ b/python/plugins/processing/algs/qgis/HubDistancePoints.py @@ -62,6 +62,9 @@ class HubDistancePoints(QgisAlgorithm): def group(self): return self.tr('Vector analysis') + def groupId(self): + return 'vectoranalysis' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/HypsometricCurves.py b/python/plugins/processing/algs/qgis/HypsometricCurves.py index 69de9d49415..9a2584d44c7 100644 --- a/python/plugins/processing/algs/qgis/HypsometricCurves.py +++ b/python/plugins/processing/algs/qgis/HypsometricCurves.py @@ -56,6 +56,9 @@ class HypsometricCurves(QgisAlgorithm): def group(self): return self.tr('Raster terrain analysis') + def groupId(self): + return 'rasterterrainanalysis' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/IdwInterpolation.py b/python/plugins/processing/algs/qgis/IdwInterpolation.py index eb0d2607a36..2707482f2de 100644 --- a/python/plugins/processing/algs/qgis/IdwInterpolation.py +++ b/python/plugins/processing/algs/qgis/IdwInterpolation.py @@ -98,6 +98,9 @@ class IdwInterpolation(QgisAlgorithm): def group(self): return self.tr('Interpolation') + def groupId(self): + return 'interpolation' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/ImportIntoPostGIS.py b/python/plugins/processing/algs/qgis/ImportIntoPostGIS.py index 8540ac9571b..c480c458b8a 100644 --- a/python/plugins/processing/algs/qgis/ImportIntoPostGIS.py +++ b/python/plugins/processing/algs/qgis/ImportIntoPostGIS.py @@ -57,6 +57,9 @@ class ImportIntoPostGIS(QgisAlgorithm): def group(self): return self.tr('Database') + def groupId(self): + return 'database' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/ImportIntoSpatialite.py b/python/plugins/processing/algs/qgis/ImportIntoSpatialite.py index a8db652456d..2f2e260354e 100644 --- a/python/plugins/processing/algs/qgis/ImportIntoSpatialite.py +++ b/python/plugins/processing/algs/qgis/ImportIntoSpatialite.py @@ -57,6 +57,9 @@ class ImportIntoSpatialite(QgisAlgorithm): def group(self): return self.tr('Database') + def groupId(self): + return 'database' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/Intersection.py b/python/plugins/processing/algs/qgis/Intersection.py index 379fbf9143d..89ed4d7fe9f 100644 --- a/python/plugins/processing/algs/qgis/Intersection.py +++ b/python/plugins/processing/algs/qgis/Intersection.py @@ -62,6 +62,9 @@ class Intersection(QgisAlgorithm): def group(self): return self.tr('Vector overlay') + def groupId(self): + return 'vectoroverlay' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/LinesToPolygons.py b/python/plugins/processing/algs/qgis/LinesToPolygons.py index 20fe1172d34..09f494363b4 100644 --- a/python/plugins/processing/algs/qgis/LinesToPolygons.py +++ b/python/plugins/processing/algs/qgis/LinesToPolygons.py @@ -59,6 +59,9 @@ class LinesToPolygons(QgisFeatureBasedAlgorithm): def group(self): return self.tr('Vector geometry') + def groupId(self): + return 'vectorgeometry' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/MeanAndStdDevPlot.py b/python/plugins/processing/algs/qgis/MeanAndStdDevPlot.py index f5e64299a96..5e44550a6de 100644 --- a/python/plugins/processing/algs/qgis/MeanAndStdDevPlot.py +++ b/python/plugins/processing/algs/qgis/MeanAndStdDevPlot.py @@ -48,6 +48,9 @@ class MeanAndStdDevPlot(QgisAlgorithm): def group(self): return self.tr('Graphics') + def groupId(self): + return 'graphics' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/MinimumBoundingGeometry.py b/python/plugins/processing/algs/qgis/MinimumBoundingGeometry.py index 267160db2b9..ead11f61c54 100644 --- a/python/plugins/processing/algs/qgis/MinimumBoundingGeometry.py +++ b/python/plugins/processing/algs/qgis/MinimumBoundingGeometry.py @@ -64,6 +64,9 @@ class MinimumBoundingGeometry(QgisAlgorithm): def group(self): return self.tr('Vector geometry') + def groupId(self): + return 'vectorgeometry' + def __init__(self): super().__init__() self.type_names = [self.tr('Envelope (Bounding Box)'), diff --git a/python/plugins/processing/algs/qgis/NearestNeighbourAnalysis.py b/python/plugins/processing/algs/qgis/NearestNeighbourAnalysis.py index 161c7b67e3b..09b2f71292e 100644 --- a/python/plugins/processing/algs/qgis/NearestNeighbourAnalysis.py +++ b/python/plugins/processing/algs/qgis/NearestNeighbourAnalysis.py @@ -62,6 +62,9 @@ class NearestNeighbourAnalysis(QgisAlgorithm): def group(self): return self.tr('Vector analysis') + def groupId(self): + return 'vectoranalysis' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/OffsetLine.py b/python/plugins/processing/algs/qgis/OffsetLine.py index 5ed780a9450..ad5ca3bed43 100644 --- a/python/plugins/processing/algs/qgis/OffsetLine.py +++ b/python/plugins/processing/algs/qgis/OffsetLine.py @@ -50,6 +50,9 @@ class OffsetLine(QgisFeatureBasedAlgorithm): def group(self): return self.tr('Vector geometry') + def groupId(self): + return 'vectorgeometry' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/Orthogonalize.py b/python/plugins/processing/algs/qgis/Orthogonalize.py index 6b31b5c37f0..69563e0bf2e 100644 --- a/python/plugins/processing/algs/qgis/Orthogonalize.py +++ b/python/plugins/processing/algs/qgis/Orthogonalize.py @@ -44,6 +44,9 @@ class Orthogonalize(QgisFeatureBasedAlgorithm): def group(self): return self.tr('Vector geometry') + def groupId(self): + return 'vectorgeometry' + def __init__(self): super().__init__() self.max_iterations = None diff --git a/python/plugins/processing/algs/qgis/PointDistance.py b/python/plugins/processing/algs/qgis/PointDistance.py index e9d32235aa9..a064c37506d 100644 --- a/python/plugins/processing/algs/qgis/PointDistance.py +++ b/python/plugins/processing/algs/qgis/PointDistance.py @@ -68,6 +68,9 @@ class PointDistance(QgisAlgorithm): def group(self): return self.tr('Vector analysis') + def groupId(self): + return 'vectoranalysis' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/PointOnSurface.py b/python/plugins/processing/algs/qgis/PointOnSurface.py index 7bc482fd643..8f6850ac941 100644 --- a/python/plugins/processing/algs/qgis/PointOnSurface.py +++ b/python/plugins/processing/algs/qgis/PointOnSurface.py @@ -46,6 +46,9 @@ class PointOnSurface(QgisFeatureBasedAlgorithm): def group(self): return self.tr('Vector geometry') + def groupId(self): + return 'vectorgeometry' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/PointsAlongGeometry.py b/python/plugins/processing/algs/qgis/PointsAlongGeometry.py index 2874cd6d57b..6b26c1d7711 100644 --- a/python/plugins/processing/algs/qgis/PointsAlongGeometry.py +++ b/python/plugins/processing/algs/qgis/PointsAlongGeometry.py @@ -63,6 +63,9 @@ class PointsAlongGeometry(QgisAlgorithm): def group(self): return self.tr('Vector geometry') + def groupId(self): + return 'vectorgeometry' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/PointsDisplacement.py b/python/plugins/processing/algs/qgis/PointsDisplacement.py index 692be3c01c6..fd8ce2ab869 100644 --- a/python/plugins/processing/algs/qgis/PointsDisplacement.py +++ b/python/plugins/processing/algs/qgis/PointsDisplacement.py @@ -50,6 +50,9 @@ class PointsDisplacement(QgisAlgorithm): def group(self): return self.tr('Vector geometry') + def groupId(self): + return 'vectorgeometry' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/PointsFromLines.py b/python/plugins/processing/algs/qgis/PointsFromLines.py index b2c855529df..8b95994683b 100644 --- a/python/plugins/processing/algs/qgis/PointsFromLines.py +++ b/python/plugins/processing/algs/qgis/PointsFromLines.py @@ -53,6 +53,9 @@ class PointsFromLines(QgisAlgorithm): def group(self): return self.tr('Vector creation') + def groupId(self): + return 'vectorcreation' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/PointsFromPolygons.py b/python/plugins/processing/algs/qgis/PointsFromPolygons.py index 2983c77af4e..0aa91b404ff 100644 --- a/python/plugins/processing/algs/qgis/PointsFromPolygons.py +++ b/python/plugins/processing/algs/qgis/PointsFromPolygons.py @@ -53,6 +53,9 @@ class PointsFromPolygons(QgisAlgorithm): def group(self): return self.tr('Vector creation') + def groupId(self): + return 'vectorcreation' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/PointsInPolygon.py b/python/plugins/processing/algs/qgis/PointsInPolygon.py index 869042b4763..9406fd64000 100644 --- a/python/plugins/processing/algs/qgis/PointsInPolygon.py +++ b/python/plugins/processing/algs/qgis/PointsInPolygon.py @@ -61,6 +61,9 @@ class PointsInPolygon(QgisAlgorithm): def group(self): return self.tr('Vector analysis') + def groupId(self): + return 'vectoranalysis' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/PointsLayerFromTable.py b/python/plugins/processing/algs/qgis/PointsLayerFromTable.py index ace996efa68..ccce2777c41 100644 --- a/python/plugins/processing/algs/qgis/PointsLayerFromTable.py +++ b/python/plugins/processing/algs/qgis/PointsLayerFromTable.py @@ -54,6 +54,9 @@ class PointsLayerFromTable(QgisAlgorithm): def group(self): return self.tr('Vector creation') + def groupId(self): + return 'vectorcreation' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/PointsToPaths.py b/python/plugins/processing/algs/qgis/PointsToPaths.py index fa544d94553..de3e1ad2c07 100644 --- a/python/plugins/processing/algs/qgis/PointsToPaths.py +++ b/python/plugins/processing/algs/qgis/PointsToPaths.py @@ -60,6 +60,9 @@ class PointsToPaths(QgisAlgorithm): def group(self): return self.tr('Vector creation') + def groupId(self): + return 'vectorcreation' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/PolarPlot.py b/python/plugins/processing/algs/qgis/PolarPlot.py index dd0b650786c..5d918edef63 100644 --- a/python/plugins/processing/algs/qgis/PolarPlot.py +++ b/python/plugins/processing/algs/qgis/PolarPlot.py @@ -47,6 +47,9 @@ class PolarPlot(QgisAlgorithm): def group(self): return self.tr('Graphics') + def groupId(self): + return 'graphics' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/PoleOfInaccessibility.py b/python/plugins/processing/algs/qgis/PoleOfInaccessibility.py index 65a2959bee3..d10542323aa 100644 --- a/python/plugins/processing/algs/qgis/PoleOfInaccessibility.py +++ b/python/plugins/processing/algs/qgis/PoleOfInaccessibility.py @@ -60,6 +60,9 @@ class PoleOfInaccessibility(QgisAlgorithm): def group(self): return self.tr('Vector geometry') + def groupId(self): + return 'vectorgeometry' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/Polygonize.py b/python/plugins/processing/algs/qgis/Polygonize.py index a2f1e769169..ddf485dda88 100644 --- a/python/plugins/processing/algs/qgis/Polygonize.py +++ b/python/plugins/processing/algs/qgis/Polygonize.py @@ -50,6 +50,9 @@ class Polygonize(QgisAlgorithm): def group(self): return self.tr('Vector geometry') + def groupId(self): + return 'vectorgeometry' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/PolygonsToLines.py b/python/plugins/processing/algs/qgis/PolygonsToLines.py index 225cfc7ce7c..0a887fd6ebf 100644 --- a/python/plugins/processing/algs/qgis/PolygonsToLines.py +++ b/python/plugins/processing/algs/qgis/PolygonsToLines.py @@ -52,6 +52,9 @@ class PolygonsToLines(QgisFeatureBasedAlgorithm): def group(self): return self.tr('Vector geometry') + def groupId(self): + return 'vectorgeometry' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/PostGISExecuteSQL.py b/python/plugins/processing/algs/qgis/PostGISExecuteSQL.py index 1cf309a97f3..a8e7f6f34a5 100644 --- a/python/plugins/processing/algs/qgis/PostGISExecuteSQL.py +++ b/python/plugins/processing/algs/qgis/PostGISExecuteSQL.py @@ -38,6 +38,9 @@ class PostGISExecuteSQL(QgisAlgorithm): def group(self): return self.tr('Database') + def groupId(self): + return 'database' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/RandomExtract.py b/python/plugins/processing/algs/qgis/RandomExtract.py index ca9d0dd5217..0d1d2088139 100644 --- a/python/plugins/processing/algs/qgis/RandomExtract.py +++ b/python/plugins/processing/algs/qgis/RandomExtract.py @@ -46,6 +46,9 @@ class RandomExtract(QgisAlgorithm): def group(self): return self.tr('Vector selection') + def groupId(self): + return 'vectorselection' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/RandomExtractWithinSubsets.py b/python/plugins/processing/algs/qgis/RandomExtractWithinSubsets.py index 167a9aaf2c6..4af660ab2e9 100644 --- a/python/plugins/processing/algs/qgis/RandomExtractWithinSubsets.py +++ b/python/plugins/processing/algs/qgis/RandomExtractWithinSubsets.py @@ -49,6 +49,9 @@ class RandomExtractWithinSubsets(QgisAlgorithm): def group(self): return self.tr('Vector selection') + def groupId(self): + return 'vectorselection' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/RandomPointsAlongLines.py b/python/plugins/processing/algs/qgis/RandomPointsAlongLines.py index 390c560e175..bef6d3687f6 100644 --- a/python/plugins/processing/algs/qgis/RandomPointsAlongLines.py +++ b/python/plugins/processing/algs/qgis/RandomPointsAlongLines.py @@ -60,6 +60,9 @@ class RandomPointsAlongLines(QgisAlgorithm): def group(self): return self.tr('Vector creation') + def groupId(self): + return 'vectorcreation' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/RandomPointsExtent.py b/python/plugins/processing/algs/qgis/RandomPointsExtent.py index fb4b90d5797..32739e7baa3 100644 --- a/python/plugins/processing/algs/qgis/RandomPointsExtent.py +++ b/python/plugins/processing/algs/qgis/RandomPointsExtent.py @@ -66,6 +66,9 @@ class RandomPointsExtent(QgisAlgorithm): def group(self): return self.tr('Vector creation') + def groupId(self): + return 'vectorcreation' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/RandomPointsLayer.py b/python/plugins/processing/algs/qgis/RandomPointsLayer.py index 53b74e8b11d..3df1698a0f4 100644 --- a/python/plugins/processing/algs/qgis/RandomPointsLayer.py +++ b/python/plugins/processing/algs/qgis/RandomPointsLayer.py @@ -65,6 +65,9 @@ class RandomPointsLayer(QgisAlgorithm): def group(self): return self.tr('Vector creation') + def groupId(self): + return 'vectorcreation' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/RandomPointsPolygons.py b/python/plugins/processing/algs/qgis/RandomPointsPolygons.py index a7a0bec60d6..0f9135a9e7f 100644 --- a/python/plugins/processing/algs/qgis/RandomPointsPolygons.py +++ b/python/plugins/processing/algs/qgis/RandomPointsPolygons.py @@ -71,6 +71,9 @@ class RandomPointsPolygons(QgisAlgorithm): def group(self): return self.tr('Vector creation') + def groupId(self): + return 'vectorcreation' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/RandomSelection.py b/python/plugins/processing/algs/qgis/RandomSelection.py index f1330b56d8c..7c504c3eb44 100644 --- a/python/plugins/processing/algs/qgis/RandomSelection.py +++ b/python/plugins/processing/algs/qgis/RandomSelection.py @@ -56,6 +56,9 @@ class RandomSelection(QgisAlgorithm): def group(self): return self.tr('Vector selection') + def groupId(self): + return 'vectorselection' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/RandomSelectionWithinSubsets.py b/python/plugins/processing/algs/qgis/RandomSelectionWithinSubsets.py index a467dfb3169..24687d6bfeb 100644 --- a/python/plugins/processing/algs/qgis/RandomSelectionWithinSubsets.py +++ b/python/plugins/processing/algs/qgis/RandomSelectionWithinSubsets.py @@ -59,6 +59,9 @@ class RandomSelectionWithinSubsets(QgisAlgorithm): def group(self): return self.tr('Vector selection') + def groupId(self): + return 'vectorselection' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/RasterCalculator.py b/python/plugins/processing/algs/qgis/RasterCalculator.py index c4bf2207d13..0d0f30b3990 100644 --- a/python/plugins/processing/algs/qgis/RasterCalculator.py +++ b/python/plugins/processing/algs/qgis/RasterCalculator.py @@ -17,8 +17,6 @@ *************************************************************************** """ -import os - __author__ = 'Victor Olaya' __date__ = 'November 2016' __copyright__ = '(C) 2016, Victor Olaya' @@ -27,6 +25,7 @@ __copyright__ = '(C) 2016, Victor Olaya' __revision__ = '$Format:%H$' +import os import math from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm from processing.algs.gdal.GdalUtils import GdalUtils @@ -54,6 +53,9 @@ class RasterCalculator(QgisAlgorithm): def group(self): return self.tr('Raster analysis') + def groupId(self): + return 'rasteranalysis' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/RasterLayerHistogram.py b/python/plugins/processing/algs/qgis/RasterLayerHistogram.py index 02488cc6361..b9e3c0b7095 100644 --- a/python/plugins/processing/algs/qgis/RasterLayerHistogram.py +++ b/python/plugins/processing/algs/qgis/RasterLayerHistogram.py @@ -47,6 +47,9 @@ class RasterLayerHistogram(QgisAlgorithm): def group(self): return self.tr('Graphics') + def groupId(self): + return 'graphics' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/RasterLayerStatistics.py b/python/plugins/processing/algs/qgis/RasterLayerStatistics.py index abc275596b8..492bbe514b6 100644 --- a/python/plugins/processing/algs/qgis/RasterLayerStatistics.py +++ b/python/plugins/processing/algs/qgis/RasterLayerStatistics.py @@ -54,6 +54,9 @@ class RasterLayerStatistics(QgisAlgorithm): def group(self): return self.tr('Raster analysis') + def groupId(self): + return 'rasteranalysis' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/Rasterize.py b/python/plugins/processing/algs/qgis/Rasterize.py index 0321a311d65..4d05d352756 100644 --- a/python/plugins/processing/algs/qgis/Rasterize.py +++ b/python/plugins/processing/algs/qgis/Rasterize.py @@ -140,6 +140,9 @@ class RasterizeAlgorithm(QgisAlgorithm): def group(self): return self.tr('Raster tools') + def groupId(self): + return 'rastertools' + def tags(self): return self.tr('layer,raster,convert,file,map themes,tiles,render').split(',') diff --git a/python/plugins/processing/algs/qgis/RectanglesOvalsDiamondsFixed.py b/python/plugins/processing/algs/qgis/RectanglesOvalsDiamondsFixed.py index 01a1a86c04c..592fb70d891 100644 --- a/python/plugins/processing/algs/qgis/RectanglesOvalsDiamondsFixed.py +++ b/python/plugins/processing/algs/qgis/RectanglesOvalsDiamondsFixed.py @@ -54,6 +54,9 @@ class RectanglesOvalsDiamondsFixed(QgisAlgorithm): def group(self): return self.tr('Vector geometry') + def groupId(self): + return 'vectorgeometry' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/RectanglesOvalsDiamondsVariable.py b/python/plugins/processing/algs/qgis/RectanglesOvalsDiamondsVariable.py index d45e086e37f..67a114c57f3 100644 --- a/python/plugins/processing/algs/qgis/RectanglesOvalsDiamondsVariable.py +++ b/python/plugins/processing/algs/qgis/RectanglesOvalsDiamondsVariable.py @@ -55,6 +55,9 @@ class RectanglesOvalsDiamondsVariable(QgisAlgorithm): def group(self): return self.tr('Vector geometry') + def groupId(self): + return 'vectorgeometry' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/RegularPoints.py b/python/plugins/processing/algs/qgis/RegularPoints.py index a06dfa3fc16..96e8d18504a 100644 --- a/python/plugins/processing/algs/qgis/RegularPoints.py +++ b/python/plugins/processing/algs/qgis/RegularPoints.py @@ -66,6 +66,9 @@ class RegularPoints(QgisAlgorithm): def group(self): return self.tr('Vector creation') + def groupId(self): + return 'vectorcreation' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/Relief.py b/python/plugins/processing/algs/qgis/Relief.py index 6140ddba8be..79feedb1571 100644 --- a/python/plugins/processing/algs/qgis/Relief.py +++ b/python/plugins/processing/algs/qgis/Relief.py @@ -97,6 +97,9 @@ class Relief(QgisAlgorithm): def group(self): return self.tr('Raster terrain analysis') + def groupId(self): + return 'rasterterrainanalysis' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/ReverseLineDirection.py b/python/plugins/processing/algs/qgis/ReverseLineDirection.py index 2919488aa22..b454c48b084 100644 --- a/python/plugins/processing/algs/qgis/ReverseLineDirection.py +++ b/python/plugins/processing/algs/qgis/ReverseLineDirection.py @@ -36,6 +36,9 @@ class ReverseLineDirection(QgisFeatureBasedAlgorithm): def group(self): return self.tr('Vector geometry') + def groupId(self): + return 'vectorgeometry' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/Ruggedness.py b/python/plugins/processing/algs/qgis/Ruggedness.py index d179a526230..679d5e9a1c1 100644 --- a/python/plugins/processing/algs/qgis/Ruggedness.py +++ b/python/plugins/processing/algs/qgis/Ruggedness.py @@ -51,6 +51,9 @@ class Ruggedness(QgisAlgorithm): def group(self): return self.tr('Raster terrain analysis') + def groupId(self): + return 'rasterterrainanalysis' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/SelectByAttribute.py b/python/plugins/processing/algs/qgis/SelectByAttribute.py index d6821129d75..509c222af24 100644 --- a/python/plugins/processing/algs/qgis/SelectByAttribute.py +++ b/python/plugins/processing/algs/qgis/SelectByAttribute.py @@ -65,6 +65,9 @@ class SelectByAttribute(QgisAlgorithm): def group(self): return self.tr('Vector selection') + def groupId(self): + return 'vectorselection' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/SelectByExpression.py b/python/plugins/processing/algs/qgis/SelectByExpression.py index 3ec16ab0b8c..163343862f8 100644 --- a/python/plugins/processing/algs/qgis/SelectByExpression.py +++ b/python/plugins/processing/algs/qgis/SelectByExpression.py @@ -44,6 +44,9 @@ class SelectByExpression(QgisAlgorithm): def group(self): return self.tr('Vector selection') + def groupId(self): + return 'vectorselection' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/ServiceAreaFromLayer.py b/python/plugins/processing/algs/qgis/ServiceAreaFromLayer.py index fabf8edb379..f559a56f849 100644 --- a/python/plugins/processing/algs/qgis/ServiceAreaFromLayer.py +++ b/python/plugins/processing/algs/qgis/ServiceAreaFromLayer.py @@ -83,6 +83,9 @@ class ServiceAreaFromLayer(QgisAlgorithm): def group(self): return self.tr('Network analysis') + def groupId(self): + return 'networkanalysis' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/ServiceAreaFromPoint.py b/python/plugins/processing/algs/qgis/ServiceAreaFromPoint.py index ce6596ada7a..dbbd5073795 100644 --- a/python/plugins/processing/algs/qgis/ServiceAreaFromPoint.py +++ b/python/plugins/processing/algs/qgis/ServiceAreaFromPoint.py @@ -81,6 +81,9 @@ class ServiceAreaFromPoint(QgisAlgorithm): def group(self): return self.tr('Network analysis') + def groupId(self): + return 'networkanalysis' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/SetMValue.py b/python/plugins/processing/algs/qgis/SetMValue.py index adaa1818a7a..dd030e16f17 100644 --- a/python/plugins/processing/algs/qgis/SetMValue.py +++ b/python/plugins/processing/algs/qgis/SetMValue.py @@ -46,6 +46,9 @@ class SetMValue(QgisFeatureBasedAlgorithm): def group(self): return self.tr('Vector geometry') + def groupId(self): + return 'vectorgeometry' + def __init__(self): super().__init__() self.m_value = 0 diff --git a/python/plugins/processing/algs/qgis/SetRasterStyle.py b/python/plugins/processing/algs/qgis/SetRasterStyle.py index 5d1d52a0ec1..bfffea64829 100644 --- a/python/plugins/processing/algs/qgis/SetRasterStyle.py +++ b/python/plugins/processing/algs/qgis/SetRasterStyle.py @@ -44,6 +44,9 @@ class SetRasterStyle(QgisAlgorithm): def group(self): return self.tr('Raster tools') + def groupId(self): + return 'rastertools' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/SetVectorStyle.py b/python/plugins/processing/algs/qgis/SetVectorStyle.py index 96058a6f1c7..7b58f6ab46e 100644 --- a/python/plugins/processing/algs/qgis/SetVectorStyle.py +++ b/python/plugins/processing/algs/qgis/SetVectorStyle.py @@ -40,6 +40,9 @@ class SetVectorStyle(QgisAlgorithm): def group(self): return self.tr('Vector general') + def groupId(self): + return 'vectorgeneral' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/SetZValue.py b/python/plugins/processing/algs/qgis/SetZValue.py index b9cc3f1c916..2775e6af6c2 100644 --- a/python/plugins/processing/algs/qgis/SetZValue.py +++ b/python/plugins/processing/algs/qgis/SetZValue.py @@ -47,6 +47,9 @@ class SetZValue(QgisFeatureBasedAlgorithm): def group(self): return self.tr('Vector geometry') + def groupId(self): + return 'vectorgeometry' + def __init__(self): super().__init__() self.z_value = 0 diff --git a/python/plugins/processing/algs/qgis/ShortestPathLayerToPoint.py b/python/plugins/processing/algs/qgis/ShortestPathLayerToPoint.py index c8a281e5ddf..0b4ab00dc14 100644 --- a/python/plugins/processing/algs/qgis/ShortestPathLayerToPoint.py +++ b/python/plugins/processing/algs/qgis/ShortestPathLayerToPoint.py @@ -82,6 +82,9 @@ class ShortestPathLayerToPoint(QgisAlgorithm): def group(self): return self.tr('Network analysis') + def groupId(self): + return 'networkanalysis' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/ShortestPathPointToLayer.py b/python/plugins/processing/algs/qgis/ShortestPathPointToLayer.py index 56323204ce9..bb768a1ac6b 100644 --- a/python/plugins/processing/algs/qgis/ShortestPathPointToLayer.py +++ b/python/plugins/processing/algs/qgis/ShortestPathPointToLayer.py @@ -83,6 +83,9 @@ class ShortestPathPointToLayer(QgisAlgorithm): def group(self): return self.tr('Network analysis') + def groupId(self): + return 'networkanalysis' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/ShortestPathPointToPoint.py b/python/plugins/processing/algs/qgis/ShortestPathPointToPoint.py index cfd23dbae13..f22b311d289 100644 --- a/python/plugins/processing/algs/qgis/ShortestPathPointToPoint.py +++ b/python/plugins/processing/algs/qgis/ShortestPathPointToPoint.py @@ -84,6 +84,9 @@ class ShortestPathPointToPoint(QgisAlgorithm): def group(self): return self.tr('Network analysis') + def groupId(self): + return 'networkanalysis' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/SingleSidedBuffer.py b/python/plugins/processing/algs/qgis/SingleSidedBuffer.py index 0d52977284b..451dbe0f161 100644 --- a/python/plugins/processing/algs/qgis/SingleSidedBuffer.py +++ b/python/plugins/processing/algs/qgis/SingleSidedBuffer.py @@ -45,6 +45,9 @@ class SingleSidedBuffer(QgisFeatureBasedAlgorithm): def group(self): return self.tr('Vector geometry') + def groupId(self): + return 'vectorgeometry' + def __init__(self): super().__init__() self.distance = None diff --git a/python/plugins/processing/algs/qgis/Slope.py b/python/plugins/processing/algs/qgis/Slope.py index b7d765dabc3..a7cde332c91 100644 --- a/python/plugins/processing/algs/qgis/Slope.py +++ b/python/plugins/processing/algs/qgis/Slope.py @@ -51,6 +51,9 @@ class Slope(QgisAlgorithm): def group(self): return self.tr('Raster terrain analysis') + def groupId(self): + return 'rasterterrainanalysis' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/SnapGeometries.py b/python/plugins/processing/algs/qgis/SnapGeometries.py index 109db8c448a..4ac1a3bfa27 100644 --- a/python/plugins/processing/algs/qgis/SnapGeometries.py +++ b/python/plugins/processing/algs/qgis/SnapGeometries.py @@ -48,6 +48,9 @@ class SnapGeometriesToLayer(QgisAlgorithm): def group(self): return self.tr('Vector geometry') + def groupId(self): + return 'vectorgeometry' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/SpatialIndex.py b/python/plugins/processing/algs/qgis/SpatialIndex.py index 38f393b8c69..5122bc3f3c6 100644 --- a/python/plugins/processing/algs/qgis/SpatialIndex.py +++ b/python/plugins/processing/algs/qgis/SpatialIndex.py @@ -45,6 +45,9 @@ class SpatialIndex(QgisAlgorithm): def group(self): return self.tr('Vector general') + def groupId(self): + return 'vectorgeneral' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/SpatialJoin.py b/python/plugins/processing/algs/qgis/SpatialJoin.py index c00f957dd70..89081371f40 100644 --- a/python/plugins/processing/algs/qgis/SpatialJoin.py +++ b/python/plugins/processing/algs/qgis/SpatialJoin.py @@ -62,6 +62,9 @@ class SpatialJoin(QgisAlgorithm): def group(self): return self.tr('Vector general') + def groupId(self): + return 'vectorgeneral' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/SpatialJoinSummary.py b/python/plugins/processing/algs/qgis/SpatialJoinSummary.py index daf45a6e6a5..9fa929e710d 100644 --- a/python/plugins/processing/algs/qgis/SpatialJoinSummary.py +++ b/python/plugins/processing/algs/qgis/SpatialJoinSummary.py @@ -70,6 +70,9 @@ class SpatialJoinSummary(QgisAlgorithm): def group(self): return self.tr('Vector general') + def groupId(self): + return 'vectorgeneral' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/SpatialiteExecuteSQL.py b/python/plugins/processing/algs/qgis/SpatialiteExecuteSQL.py index 0e9be2ffbc0..93c6bb203db 100644 --- a/python/plugins/processing/algs/qgis/SpatialiteExecuteSQL.py +++ b/python/plugins/processing/algs/qgis/SpatialiteExecuteSQL.py @@ -42,6 +42,9 @@ class SpatialiteExecuteSQL(QgisAlgorithm): def group(self): return self.tr('Database') + def groupId(self): + return 'database' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/StatisticsByCategories.py b/python/plugins/processing/algs/qgis/StatisticsByCategories.py index 79bcc9a2b9b..fb7cbf84fea 100644 --- a/python/plugins/processing/algs/qgis/StatisticsByCategories.py +++ b/python/plugins/processing/algs/qgis/StatisticsByCategories.py @@ -55,6 +55,9 @@ class StatisticsByCategories(QgisAlgorithm): def group(self): return self.tr('Vector analysis') + def groupId(self): + return 'vectoranalysis' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/SumLines.py b/python/plugins/processing/algs/qgis/SumLines.py index c5f6fc162d7..65fcb4fbf03 100644 --- a/python/plugins/processing/algs/qgis/SumLines.py +++ b/python/plugins/processing/algs/qgis/SumLines.py @@ -61,6 +61,9 @@ class SumLines(QgisAlgorithm): def group(self): return self.tr('Vector analysis') + def groupId(self): + return 'vectoranalysis' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/SymmetricalDifference.py b/python/plugins/processing/algs/qgis/SymmetricalDifference.py index 1b8444bdbc0..5a787ed1293 100644 --- a/python/plugins/processing/algs/qgis/SymmetricalDifference.py +++ b/python/plugins/processing/algs/qgis/SymmetricalDifference.py @@ -58,6 +58,9 @@ class SymmetricalDifference(QgisAlgorithm): def group(self): return self.tr('Vector overlay') + def groupId(self): + return 'vectoroverlay' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/TextToFloat.py b/python/plugins/processing/algs/qgis/TextToFloat.py index fb0e33a1213..54128285b9c 100644 --- a/python/plugins/processing/algs/qgis/TextToFloat.py +++ b/python/plugins/processing/algs/qgis/TextToFloat.py @@ -39,6 +39,9 @@ class TextToFloat(QgisFeatureBasedAlgorithm): def group(self): return self.tr('Vector table') + def groupId(self): + return 'vectortable' + def __init__(self): super().__init__() self.field_name = None diff --git a/python/plugins/processing/algs/qgis/TinInterpolation.py b/python/plugins/processing/algs/qgis/TinInterpolation.py index f27be4a2c9c..8cfd325b6d5 100644 --- a/python/plugins/processing/algs/qgis/TinInterpolation.py +++ b/python/plugins/processing/algs/qgis/TinInterpolation.py @@ -102,6 +102,9 @@ class TinInterpolation(QgisAlgorithm): def group(self): return self.tr('Interpolation') + def groupId(self): + return 'interpolation' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/TopoColors.py b/python/plugins/processing/algs/qgis/TopoColors.py index 8319185c291..7f5cd480ce4 100644 --- a/python/plugins/processing/algs/qgis/TopoColors.py +++ b/python/plugins/processing/algs/qgis/TopoColors.py @@ -63,6 +63,9 @@ class TopoColor(QgisAlgorithm): def group(self): return self.tr('Cartography') + def groupId(self): + return 'cartography' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/TruncateTable.py b/python/plugins/processing/algs/qgis/TruncateTable.py index cda6de6afb1..bcb110883b5 100644 --- a/python/plugins/processing/algs/qgis/TruncateTable.py +++ b/python/plugins/processing/algs/qgis/TruncateTable.py @@ -42,6 +42,9 @@ class TruncateTable(QgisAlgorithm): def group(self): return self.tr('Vector general') + def groupId(self): + return 'vectorgeneral' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/Union.py b/python/plugins/processing/algs/qgis/Union.py index 2f258da4078..1ca26236c83 100644 --- a/python/plugins/processing/algs/qgis/Union.py +++ b/python/plugins/processing/algs/qgis/Union.py @@ -57,6 +57,9 @@ class Union(QgisAlgorithm): def group(self): return self.tr('Vector overlay') + def groupId(self): + return 'vectoroverlay' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/UniqueValues.py b/python/plugins/processing/algs/qgis/UniqueValues.py index 451f194a4b0..2096ed29a40 100644 --- a/python/plugins/processing/algs/qgis/UniqueValues.py +++ b/python/plugins/processing/algs/qgis/UniqueValues.py @@ -63,6 +63,9 @@ class UniqueValues(QgisAlgorithm): def group(self): return self.tr('Vector analysis') + def groupId(self): + return 'vectoranalysis' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/VariableDistanceBuffer.py b/python/plugins/processing/algs/qgis/VariableDistanceBuffer.py index 4fff0e0fdaf..ee7aac1de28 100644 --- a/python/plugins/processing/algs/qgis/VariableDistanceBuffer.py +++ b/python/plugins/processing/algs/qgis/VariableDistanceBuffer.py @@ -61,6 +61,9 @@ class VariableDistanceBuffer(QgisAlgorithm): def group(self): return self.tr('Vector geometry') + def groupId(self): + return 'vectorgeometry' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/VectorLayerHistogram.py b/python/plugins/processing/algs/qgis/VectorLayerHistogram.py index ce0137baa56..cf5da168ecd 100644 --- a/python/plugins/processing/algs/qgis/VectorLayerHistogram.py +++ b/python/plugins/processing/algs/qgis/VectorLayerHistogram.py @@ -47,6 +47,9 @@ class VectorLayerHistogram(QgisAlgorithm): def group(self): return self.tr('Graphics') + def groupId(self): + return 'graphics' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/VectorLayerScatterplot.py b/python/plugins/processing/algs/qgis/VectorLayerScatterplot.py index b89a6226141..4019728a077 100644 --- a/python/plugins/processing/algs/qgis/VectorLayerScatterplot.py +++ b/python/plugins/processing/algs/qgis/VectorLayerScatterplot.py @@ -47,6 +47,9 @@ class VectorLayerScatterplot(QgisAlgorithm): def group(self): return self.tr('Graphics') + def groupId(self): + return 'graphics' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/VectorLayerScatterplot3D.py b/python/plugins/processing/algs/qgis/VectorLayerScatterplot3D.py index da5b27631c7..b0df450be99 100644 --- a/python/plugins/processing/algs/qgis/VectorLayerScatterplot3D.py +++ b/python/plugins/processing/algs/qgis/VectorLayerScatterplot3D.py @@ -49,6 +49,9 @@ class VectorLayerScatterplot3D(QgisAlgorithm): def group(self): return self.tr('Graphics') + def groupId(self): + return 'graphics' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/VectorSplit.py b/python/plugins/processing/algs/qgis/VectorSplit.py index 7929e4be1cd..9c07ab1fcf9 100644 --- a/python/plugins/processing/algs/qgis/VectorSplit.py +++ b/python/plugins/processing/algs/qgis/VectorSplit.py @@ -51,6 +51,9 @@ class VectorSplit(QgisAlgorithm): def group(self): return self.tr('Vector general') + def groupId(self): + return 'vectorgeneral' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/VoronoiPolygons.py b/python/plugins/processing/algs/qgis/VoronoiPolygons.py index 1e4ec846b2d..c27ca59cd9c 100644 --- a/python/plugins/processing/algs/qgis/VoronoiPolygons.py +++ b/python/plugins/processing/algs/qgis/VoronoiPolygons.py @@ -60,6 +60,9 @@ class VoronoiPolygons(QgisAlgorithm): def group(self): return self.tr('Vector geometry') + def groupId(self): + return 'vectorgeometry' + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/qgis/ZonalStatistics.py b/python/plugins/processing/algs/qgis/ZonalStatistics.py index dd3557e538a..d5a54565223 100644 --- a/python/plugins/processing/algs/qgis/ZonalStatistics.py +++ b/python/plugins/processing/algs/qgis/ZonalStatistics.py @@ -58,6 +58,9 @@ class ZonalStatistics(QgisAlgorithm): def group(self): return self.tr('Raster analysis') + def groupId(self): + return 'rasteranalysis' + def __init__(self): super().__init__() From 2674022b6cfbaab6754de3517024bc3ae9599b24 Mon Sep 17 00:00:00 2001 From: Alexander Bruy Date: Thu, 14 Dec 2017 18:07:01 +0200 Subject: [PATCH 6/6] [processing] add group id to scripts --- python/plugins/processing/script/ScriptAlgorithm.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/python/plugins/processing/script/ScriptAlgorithm.py b/python/plugins/processing/script/ScriptAlgorithm.py index d184d92c60e..9db970fdf3a 100644 --- a/python/plugins/processing/script/ScriptAlgorithm.py +++ b/python/plugins/processing/script/ScriptAlgorithm.py @@ -62,6 +62,7 @@ class ScriptAlgorithm(QgsProcessingAlgorithm): self._name = '' self._display_name = '' self._group = '' + self._groupId = '' self._flags = None self.script = script @@ -111,6 +112,7 @@ class ScriptAlgorithm(QgsProcessingAlgorithm): self._name = filename[:filename.rfind('.')].replace('_', ' ') self._display_name = self._name self._group = self.tr('User scripts', 'ScriptAlgorithm') + self._groupId = 'userscripts' with open(self.descriptionFile) as lines: line = lines.readline() while line != '': @@ -130,6 +132,7 @@ class ScriptAlgorithm(QgsProcessingAlgorithm): self._name = '[Unnamed algorithm]' self._display_name = self.tr('[Unnamed algorithm]', 'ScriptAlgorithm') self._group = self.tr('User scripts', 'ScriptAlgorithm') + self._groupId = 'userscripts' for line in lines: if line.startswith('##'): try: @@ -163,6 +166,8 @@ class ScriptAlgorithm(QgsProcessingAlgorithm): desc = self.createDescriptiveName(tokens[0]) if tokens[1].lower().strip() == 'group': self._group = tokens[0] + validChars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789:' + self._groupId = ''.join(c for c in tokens[0].lower() if c in validChars) return if tokens[1].lower().strip() == 'name': self._name = self._display_name = tokens[0]