Skip to content

Commit f82b41e

Browse files
nyalldawsonnyalldawson
committedJul 8, 2017
Move an enum to new QgsProcessing class
·
ltr-3_44final-3_0_0
1 parent febf0a0 commit f82b41e

34 files changed

+354
-244
lines changed
 

‎python/core/core_auto.sip‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@
161161
%Include layout/qgslayoutsize.sip
162162
%Include metadata/qgslayermetadata.sip
163163
%Include metadata/qgslayermetadatavalidator.sip
164+
%Include processing/qgsprocessing.sip
164165
%Include processing/qgsprocessingalgorithm.sip
165166
%Include processing/qgsprocessingcontext.sip
166167
%Include processing/qgsprocessingmodelalgorithm.sip

‎python/core/processing/qgsprocessing.sip‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/core/processing/qgsprocessing.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
10+
11+
12+
13+
14+
class QgsProcessing
15+
{
16+
%Docstring
17+
18+
Contains enumerations and other constants for use in processing algorithms
19+
and parameters.
20+
21+
.. versionadded:: 3.0
22+
%End
23+
24+
%TypeHeaderCode
25+
#include "qgsprocessing.h"
26+
%End
27+
public:
28+
29+
enum LayerType
30+
{
31+
TypeAny,
32+
TypeVectorAny,
33+
TypeVectorPoint,
34+
TypeVectorLine,
35+
TypeVectorPolygon,
36+
TypeRaster,
37+
TypeFile,
38+
TypeTable,
39+
};
40+
41+
42+
43+
};
44+
45+
/************************************************************************
46+
* This file has been generated automatically from *
47+
* *
48+
* src/core/processing/qgsprocessing.h *
49+
* *
50+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
51+
************************************************************************/

‎python/core/processing/qgsprocessingoutputs.sip‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ class QgsProcessingOutputVectorLayer : QgsProcessingOutputDefinition
106106
%End
107107
public:
108108

109-
QgsProcessingOutputVectorLayer( const QString &name, const QString &description = QString(), QgsProcessingParameterDefinition::LayerType type = QgsProcessingParameterDefinition::TypeVectorAny );
109+
QgsProcessingOutputVectorLayer( const QString &name, const QString &description = QString(), QgsProcessing::LayerType type = QgsProcessing::TypeVectorAny );
110110
%Docstring
111111
Constructor for QgsProcessingOutputVectorLayer.
112112
%End
@@ -118,14 +118,14 @@ class QgsProcessingOutputVectorLayer : QgsProcessingOutputDefinition
118118
%End
119119
virtual QString type() const;
120120

121-
QgsProcessingParameterDefinition::LayerType dataType() const;
121+
QgsProcessing::LayerType dataType() const;
122122
%Docstring
123123
Returns the layer type for the output layer.
124124
.. seealso:: setDataType()
125-
:rtype: QgsProcessingParameterDefinition.LayerType
125+
:rtype: QgsProcessing.LayerType
126126
%End
127127

128-
void setDataType( QgsProcessingParameterDefinition::LayerType type );
128+
void setDataType( QgsProcessing::LayerType type );
129129
%Docstring
130130
Sets the layer ``type`` for the output layer.
131131
.. seealso:: dataType()

‎python/core/processing/qgsprocessingparameters.sip‎

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -201,18 +201,6 @@ class QgsProcessingParameterDefinition
201201
typedef QFlags<QgsProcessingParameterDefinition::Flag> Flags;
202202

203203

204-
enum LayerType
205-
{
206-
TypeAny,
207-
TypeVectorAny,
208-
TypeVectorPoint,
209-
TypeVectorLine,
210-
TypeVectorPolygon,
211-
TypeRaster,
212-
TypeFile,
213-
TypeTable,
214-
};
215-
216204
QgsProcessingParameterDefinition( const QString &name, const QString &description = QString(), const QVariant &defaultValue = QVariant(),
217205
bool optional = false );
218206
%Docstring
@@ -963,7 +951,7 @@ class QgsProcessingParameterMultipleLayers : QgsProcessingParameterDefinition
963951
%End
964952
public:
965953

966-
QgsProcessingParameterMultipleLayers( const QString &name, const QString &description = QString(), QgsProcessingParameterDefinition::LayerType layerType = QgsProcessingParameterDefinition::TypeVectorAny,
954+
QgsProcessingParameterMultipleLayers( const QString &name, const QString &description = QString(), QgsProcessing::LayerType layerType = QgsProcessing::TypeVectorAny,
967955
const QVariant &defaultValue = QVariant(),
968956
bool optional = false );
969957
%Docstring
@@ -983,14 +971,14 @@ class QgsProcessingParameterMultipleLayers : QgsProcessingParameterDefinition
983971
virtual QString asScriptCode() const;
984972

985973

986-
QgsProcessingParameterDefinition::LayerType layerType() const;
974+
QgsProcessing::LayerType layerType() const;
987975
%Docstring
988976
Returns the layer type for layers acceptable by the parameter.
989977
.. seealso:: setLayerType()
990-
:rtype: QgsProcessingParameterDefinition.LayerType
978+
:rtype: QgsProcessing.LayerType
991979
%End
992980

993-
void setLayerType( QgsProcessingParameterDefinition::LayerType type );
981+
void setLayerType( QgsProcessing::LayerType type );
994982
%Docstring
995983
Sets the layer ``type`` for layers acceptable by the parameter.
996984
.. seealso:: layerType()
@@ -1665,7 +1653,7 @@ class QgsProcessingParameterFeatureSink : QgsProcessingDestinationParameter
16651653
%End
16661654
public:
16671655

1668-
QgsProcessingParameterFeatureSink( const QString &name, const QString &description = QString(), QgsProcessingParameterDefinition::LayerType type = QgsProcessingParameterDefinition::TypeVectorAny, const QVariant &defaultValue = QVariant(),
1656+
QgsProcessingParameterFeatureSink( const QString &name, const QString &description = QString(), QgsProcessing::LayerType type = QgsProcessing::TypeVectorAny, const QVariant &defaultValue = QVariant(),
16691657
bool optional = false );
16701658
%Docstring
16711659
Constructor for QgsProcessingParameterFeatureSink.
@@ -1688,11 +1676,11 @@ class QgsProcessingParameterFeatureSink : QgsProcessingDestinationParameter
16881676
virtual QString defaultFileExtension() const;
16891677

16901678

1691-
QgsProcessingParameterDefinition::LayerType dataType() const;
1679+
QgsProcessing::LayerType dataType() const;
16921680
%Docstring
16931681
Returns the layer type for sinks associated with the parameter.
16941682
.. seealso:: setDataType()
1695-
:rtype: QgsProcessingParameterDefinition.LayerType
1683+
:rtype: QgsProcessing.LayerType
16961684
%End
16971685

16981686
bool hasGeometry() const;
@@ -1702,7 +1690,7 @@ class QgsProcessingParameterFeatureSink : QgsProcessingDestinationParameter
17021690
:rtype: bool
17031691
%End
17041692

1705-
void setDataType( QgsProcessingParameterDefinition::LayerType type );
1693+
void setDataType( QgsProcessing::LayerType type );
17061694
%Docstring
17071695
Sets the layer ``type`` for the sinks associated with the parameter.
17081696
.. seealso:: dataType()
@@ -1737,7 +1725,7 @@ class QgsProcessingParameterVectorOutput : QgsProcessingDestinationParameter
17371725
%End
17381726
public:
17391727

1740-
QgsProcessingParameterVectorOutput( const QString &name, const QString &description = QString(), QgsProcessingParameterDefinition::LayerType type = QgsProcessingParameterDefinition::TypeVectorAny, const QVariant &defaultValue = QVariant(),
1728+
QgsProcessingParameterVectorOutput( const QString &name, const QString &description = QString(), QgsProcessing::LayerType type = QgsProcessing::TypeVectorAny, const QVariant &defaultValue = QVariant(),
17411729
bool optional = false );
17421730
%Docstring
17431731
Constructor for QgsProcessingParameterVectorOutput.
@@ -1760,11 +1748,11 @@ class QgsProcessingParameterVectorOutput : QgsProcessingDestinationParameter
17601748
virtual QString defaultFileExtension() const;
17611749

17621750

1763-
QgsProcessingParameterDefinition::LayerType dataType() const;
1751+
QgsProcessing::LayerType dataType() const;
17641752
%Docstring
17651753
Returns the layer type for layers associated with the parameter.
17661754
.. seealso:: setDataType()
1767-
:rtype: QgsProcessingParameterDefinition.LayerType
1755+
:rtype: QgsProcessing.LayerType
17681756
%End
17691757

17701758
bool hasGeometry() const;
@@ -1774,7 +1762,7 @@ class QgsProcessingParameterVectorOutput : QgsProcessingDestinationParameter
17741762
:rtype: bool
17751763
%End
17761764

1777-
void setDataType( QgsProcessingParameterDefinition::LayerType type );
1765+
void setDataType( QgsProcessing::LayerType type );
17781766
%Docstring
17791767
Sets the layer ``type`` for the layers associated with the parameter.
17801768
.. seealso:: dataType()

‎python/plugins/processing/algs/qgis/Boundary.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
from qgis.core import (QgsGeometry,
3131
QgsWkbTypes,
3232
QgsFeatureSink,
33+
QgsProcessing,
3334
QgsProcessingUtils,
3435
QgsProcessingParameterDefinition,
3536
QgsProcessingParameterFeatureSource,
@@ -54,7 +55,7 @@ class Boundary(QgisAlgorithm):
5455

5556
def __init__(self):
5657
super().__init__()
57-
self.addParameter(QgsProcessingParameterFeatureSource(self.INPUT_LAYER, self.tr('Input layer'), [QgsProcessingParameterDefinition.TypeVectorLine, QgsProcessingParameterDefinition.TypeVectorPolygon]))
58+
self.addParameter(QgsProcessingParameterFeatureSource(self.INPUT_LAYER, self.tr('Input layer'), [QgsProcessing.TypeVectorLine, QgsProcessing.TypeVectorPolygon]))
5859
self.addParameter(QgsProcessingParameterFeatureSink(self.OUTPUT_LAYER, self.tr('Boundary')))
5960
self.addOutput(QgsProcessingOutputVectorLayer(self.OUTPUT_LAYER, self.tr("Boundaries")))
6061

‎python/plugins/processing/algs/qgis/BoundingBox.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
from qgis.core import (QgsGeometry,
3131
QgsWkbTypes,
3232
QgsFeatureSink,
33+
QgsProcessing,
3334
QgsProcessingUtils,
3435
QgsProcessingParameterFeatureSource,
3536
QgsProcessingParameterFeatureSink,
@@ -63,7 +64,7 @@ def __init__(self):
6364
super().__init__()
6465

6566
self.addParameter(QgsProcessingParameterFeatureSource(self.INPUT_LAYER, self.tr('Input layer')))
66-
self.addParameter(QgsProcessingParameterFeatureSink(self.OUTPUT_LAYER, self.tr('Bounds'), QgsProcessingParameterDefinition.TypeVectorPolygon))
67+
self.addParameter(QgsProcessingParameterFeatureSink(self.OUTPUT_LAYER, self.tr('Bounds'), QgsProcessing.TypeVectorPolygon))
6768
self.addOutput(QgsProcessingOutputVectorLayer(self.OUTPUT_LAYER, self.tr("Bounds")))
6869

6970
def name(self):

‎python/plugins/processing/algs/qgis/CheckValidity.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
QgsWkbTypes,
4040
QgsProcessingUtils,
4141
QgsFields,
42+
QgsProcessing,
4243
QgsProcessingFeatureSource,
4344
QgsProcessingParameterFeatureSource,
4445
QgsProcessingParameterEnum,
@@ -81,15 +82,15 @@ def __init__(self):
8182
self.addParameter(QgsProcessingParameterEnum(self.METHOD,
8283
self.tr('Method'), self.methods))
8384

84-
self.addParameter(QgsProcessingParameterFeatureSink(self.VALID_OUTPUT, self.tr('Valid output'), QgsProcessingParameterDefinition.TypeVectorAny, '', True))
85+
self.addParameter(QgsProcessingParameterFeatureSink(self.VALID_OUTPUT, self.tr('Valid output'), QgsProcessing.TypeVectorAny, '', True))
8586
self.addOutput(QgsProcessingOutputVectorLayer(self.VALID_OUTPUT, self.tr('Valid output')))
8687
self.addOutput(QgsProcessingOutputNumber(self.VALID_COUNT, self.tr('Count of valid features')))
8788

88-
self.addParameter(QgsProcessingParameterFeatureSink(self.INVALID_OUTPUT, self.tr('Invalid output'), QgsProcessingParameterDefinition.TypeVectorAny, '', True))
89+
self.addParameter(QgsProcessingParameterFeatureSink(self.INVALID_OUTPUT, self.tr('Invalid output'), QgsProcessing.TypeVectorAny, '', True))
8990
self.addOutput(QgsProcessingOutputVectorLayer(self.INVALID_OUTPUT, self.tr('Invalid output')))
9091
self.addOutput(QgsProcessingOutputNumber(self.INVALID_COUNT, self.tr('Count of invalid features')))
9192

92-
self.addParameter(QgsProcessingParameterFeatureSink(self.ERROR_OUTPUT, self.tr('Error output'), QgsProcessingParameterDefinition.TypeVectorAny, '', True))
93+
self.addParameter(QgsProcessingParameterFeatureSink(self.ERROR_OUTPUT, self.tr('Error output'), QgsProcessing.TypeVectorAny, '', True))
9394
self.addOutput(QgsProcessingOutputVectorLayer(self.ERROR_OUTPUT, self.tr('Error output')))
9495
self.addOutput(QgsProcessingOutputNumber(self.ERROR_COUNT, self.tr('Count of errors')))
9596

‎python/plugins/processing/algs/qgis/ConcaveHull.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
QgsFeatureSink,
3333
QgsWkbTypes,
3434
QgsApplication,
35+
QgsProcessing,
3536
QgsProcessingUtils,
3637
QgsProcessingParameterFeatureSource,
3738
QgsProcessingParameterVectorLayer,
@@ -60,7 +61,7 @@ def group(self):
6061
def __init__(self):
6162
super().__init__()
6263

63-
self.addParameter(QgsProcessingParameterFeatureSource(self.INPUT, self.tr('Input point layer'), [QgsProcessingParameterDefinition.TypeVectorPoint]))
64+
self.addParameter(QgsProcessingParameterFeatureSource(self.INPUT, self.tr('Input point layer'), [QgsProcessing.TypeVectorPoint]))
6465
self.addParameter(QgsProcessingParameterNumber(self.ALPHA,
6566
self.tr('Threshold (0-1, where 1 is equivalent with Convex Hull)'),
6667
minValue=0, maxValue=1, defaultValue=0.3, type=QgsProcessingParameterNumber.Double))
@@ -70,8 +71,8 @@ def __init__(self):
7071
self.addParameter(QgsProcessingParameterBoolean(self.NO_MULTIGEOMETRY,
7172
self.tr('Split multipart geometry into singleparts geometries'), defaultValue=False))
7273

73-
self.addParameter(QgsProcessingParameterFeatureSink(self.OUTPUT, self.tr('Concave hull'), type=QgsProcessingParameterDefinition.TypeVectorPolygon))
74-
self.addOutput(QgsProcessingOutputVectorLayer(self.OUTPUT, self.tr("Concave hull"), type=QgsProcessingParameterDefinition.TypeVectorPolygon))
74+
self.addParameter(QgsProcessingParameterFeatureSink(self.OUTPUT, self.tr('Concave hull'), type=QgsProcessing.TypeVectorPolygon))
75+
self.addOutput(QgsProcessingOutputVectorLayer(self.OUTPUT, self.tr("Concave hull"), type=QgsProcessing.TypeVectorPolygon))
7576

7677
def name(self):
7778
return 'concavehull'

‎python/plugins/processing/algs/qgis/Delaunay.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
QgsGeometry,
3939
QgsPointXY,
4040
QgsWkbTypes,
41+
QgsProcessing,
4142
QgsProcessingUtils,
4243
QgsFields,
4344
QgsProcessingParameterFeatureSource,
@@ -67,9 +68,9 @@ def group(self):
6768
def __init__(self):
6869
super().__init__()
6970

70-
self.addParameter(QgsProcessingParameterFeatureSource(self.INPUT, self.tr('Input layer'), [QgsProcessingParameterDefinition.TypeVectorPoint]))
71-
self.addParameter(QgsProcessingParameterFeatureSink(self.OUTPUT, self.tr('Delaunay triangulation'), type=QgsProcessingParameterDefinition.TypeVectorPolygon))
72-
self.addOutput(QgsProcessingOutputVectorLayer(self.OUTPUT, self.tr("Delaunay triangulation"), type=QgsProcessingParameterDefinition.TypeVectorPolygon))
71+
self.addParameter(QgsProcessingParameterFeatureSource(self.INPUT, self.tr('Input layer'), [QgsProcessing.TypeVectorPoint]))
72+
self.addParameter(QgsProcessingParameterFeatureSink(self.OUTPUT, self.tr('Delaunay triangulation'), type=QgsProcessing.TypeVectorPolygon))
73+
self.addOutput(QgsProcessingOutputVectorLayer(self.OUTPUT, self.tr("Delaunay triangulation"), type=QgsProcessing.TypeVectorPolygon))
7374

7475
def name(self):
7576
return 'delaunaytriangulation'

‎python/plugins/processing/algs/qgis/DeleteHoles.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
from qgis.core import (QgsApplication,
2828
QgsFeatureSink,
29+
QgsProcessing,
2930
QgsProcessingUtils,
3031
QgsProcessingParameterFeatureSource,
3132
QgsProcessingParameterNumber,
@@ -50,13 +51,13 @@ def group(self):
5051
def __init__(self):
5152
super().__init__()
5253
self.addParameter(QgsProcessingParameterFeatureSource(self.INPUT,
53-
self.tr('Input layer'), [QgsProcessingParameterDefinition.TypeVectorPolygon]))
54+
self.tr('Input layer'), [QgsProcessing.TypeVectorPolygon]))
5455
self.addParameter(QgsProcessingParameterNumber(self.MIN_AREA,
5556
self.tr('Remove holes with area less than'), QgsProcessingParameterNumber.Double,
5657
0, True, 0.0, 10000000.0))
5758

58-
self.addParameter(QgsProcessingParameterFeatureSink(self.OUTPUT, self.tr('Cleaned'), QgsProcessingParameterDefinition.TypeVectorPolygon))
59-
self.addOutput(QgsProcessingOutputVectorLayer(self.OUTPUT, self.tr('Cleaned'), QgsProcessingParameterDefinition.TypeVectorPolygon))
59+
self.addParameter(QgsProcessingParameterFeatureSink(self.OUTPUT, self.tr('Cleaned'), QgsProcessing.TypeVectorPolygon))
60+
self.addOutput(QgsProcessingOutputVectorLayer(self.OUTPUT, self.tr('Cleaned'), QgsProcessing.TypeVectorPolygon))
6061

6162
def name(self):
6263
return 'deleteholes'

‎python/plugins/processing/algs/qgis/DensifyGeometries.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
from qgis.core import (QgsWkbTypes,
3232
QgsFeatureSink,
3333
QgsApplication,
34+
QgsProcessing,
3435
QgsProcessingParameterFeatureSource,
3536
QgsProcessingParameterNumber,
3637
QgsProcessingParameterFeatureSink,
@@ -55,7 +56,7 @@ def __init__(self):
5556
super().__init__()
5657

5758
self.addParameter(QgsProcessingParameterFeatureSource(self.INPUT,
58-
self.tr('Input layer'), [QgsProcessingParameterDefinition.TypeVectorPolygon, QgsProcessingParameterDefinition.TypeVectorLine]))
59+
self.tr('Input layer'), [QgsProcessing.TypeVectorPolygon, QgsProcessing.TypeVectorLine]))
5960
self.addParameter(QgsProcessingParameterNumber(self.VERTICES,
6061
self.tr('Vertices to add'), QgsProcessingParameterNumber.Integer,
6162
1, False, 1, 10000000))

‎python/plugins/processing/algs/qgis/DensifyGeometriesInterval.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
from qgis.core import (QgsWkbTypes,
3333
QgsApplication,
3434
QgsFeatureSink,
35+
QgsProcessing,
3536
QgsProcessingParameterFeatureSource,
3637
QgsProcessingParameterNumber,
3738
QgsProcessingParameterFeatureSink,
@@ -53,7 +54,7 @@ def __init__(self):
5354
super().__init__()
5455

5556
self.addParameter(QgsProcessingParameterFeatureSource(self.INPUT,
56-
self.tr('Input layer'), [QgsProcessingParameterDefinition.TypeVectorPolygon, QgsProcessingParameterDefinition.TypeVectorLine]))
57+
self.tr('Input layer'), [QgsProcessing.TypeVectorPolygon, QgsProcessing.TypeVectorLine]))
5758
self.addParameter(QgsProcessingParameterNumber(self.INTERVAL,
5859
self.tr('Interval between vertices to add'), QgsProcessingParameterNumber.Double,
5960
1, False, 0, 10000000))

‎python/plugins/processing/algs/qgis/DropGeometry.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
QgsFeatureSink,
3131
QgsCoordinateReferenceSystem,
3232
QgsApplication,
33+
QgsProcessing,
3334
QgsProcessingParameterDefinition,
3435
QgsProcessingParameterFeatureSource,
3536
QgsProcessingParameterFeatureSink,
@@ -51,7 +52,7 @@ def group(self):
5152
def __init__(self):
5253
super().__init__()
5354

54-
self.addParameter(QgsProcessingParameterFeatureSource(self.INPUT, self.tr('Input layer'), [QgsProcessingParameterDefinition.TypeVectorPoint, QgsProcessingParameterDefinition.TypeVectorLine, QgsProcessingParameterDefinition.TypeVectorPolygon]))
55+
self.addParameter(QgsProcessingParameterFeatureSource(self.INPUT, self.tr('Input layer'), [QgsProcessing.TypeVectorPoint, QgsProcessing.TypeVectorLine, QgsProcessing.TypeVectorPolygon]))
5556
self.addParameter(QgsProcessingParameterFeatureSink(self.OUTPUT, self.tr('Dropped geometry')))
5657
self.addOutput(QgsProcessingOutputVectorLayer(self.OUTPUT, self.tr("Dropped geometry")))
5758

‎python/plugins/processing/algs/qgis/ExtentFromLayer.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
QgsGeometry,
3737
QgsFeature,
3838
QgsWkbTypes,
39+
QgsProcessing,
3940
QgsProcessingUtils,
4041
QgsProcessingParameterFeatureSource,
4142
QgsProcessingParameterFeatureSink,
@@ -77,7 +78,7 @@ def __init__(self):
7778
self.tr('Calculate extent for each feature separately'), False))
7879

7980
self.addParameter(QgsProcessingParameterFeatureSink(self.OUTPUT, self.tr('Extent')))
80-
self.addOutput(QgsProcessingOutputVectorLayer(self.OUTPUT, self.tr("Extent"), QgsProcessingParameterDefinition.TypeVectorPolygon))
81+
self.addOutput(QgsProcessingOutputVectorLayer(self.OUTPUT, self.tr("Extent"), QgsProcessing.TypeVectorPolygon))
8182

8283
def name(self):
8384
return 'polygonfromlayerextent'

‎python/plugins/processing/algs/qgis/FixGeometry.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
QgsFeatureRequest,
3131
QgsProcessingFeatureSource,
3232
QgsGeometry,
33+
QgsProcessing,
3334
QgsProcessingParameterDefinition,
3435
QgsProcessingParameterFeatureSource,
3536
QgsProcessingParameterFeatureSink,
@@ -51,7 +52,7 @@ def group(self):
5152

5253
def __init__(self):
5354
super().__init__()
54-
self.addParameter(QgsProcessingParameterFeatureSource(self.INPUT, self.tr('Input layer'), [QgsProcessingParameterDefinition.TypeVectorLine, QgsProcessingParameterDefinition.TypeVectorPolygon]))
55+
self.addParameter(QgsProcessingParameterFeatureSource(self.INPUT, self.tr('Input layer'), [QgsProcessing.TypeVectorLine, QgsProcessing.TypeVectorPolygon]))
5556
self.addParameter(QgsProcessingParameterFeatureSink(self.OUTPUT, self.tr('Fixed geometries')))
5657
self.addOutput(QgsProcessingOutputVectorLayer(self.OUTPUT, self.tr("Fixed geometries")))
5758

‎python/plugins/processing/algs/qgis/GridPolygon.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
QgsGeometry,
3939
QgsPointXY,
4040
QgsWkbTypes,
41+
QgsProcessing,
4142
QgsProcessingParameterEnum,
4243
QgsProcessingParameterExtent,
4344
QgsProcessingParameterNumber,
@@ -100,7 +101,7 @@ def __init__(self):
100101
self.addParameter(QgsProcessingParameterCrs(self.CRS, 'Grid CRS', 'ProjectCrs'))
101102

102103
self.addParameter(QgsProcessingParameterFeatureSink(self.OUTPUT, self.tr('Grid')))
103-
self.addOutput(QgsProcessingOutputVectorLayer(self.OUTPUT, self.tr('Grid'), QgsProcessingParameterDefinition.TypeVectorPolygon))
104+
self.addOutput(QgsProcessingOutputVectorLayer(self.OUTPUT, self.tr('Grid'), QgsProcessing.TypeVectorPolygon))
104105

105106
def name(self):
106107
return 'creategridpolygon'

‎python/plugins/processing/algs/qgis/Merge.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
QgsField,
3434
QgsFeatureRequest,
3535
QgsFeatureSink,
36+
QgsProcessing,
3637
QgsProcessingUtils,
3738
QgsProcessingParameterMultipleLayers,
3839
QgsProcessingParameterDefinition,
@@ -63,7 +64,7 @@ def __init__(self):
6364
super().__init__()
6465
self.addParameter(QgsProcessingParameterMultipleLayers(self.LAYERS,
6566
self.tr('Layers to merge'),
66-
QgsProcessingParameterDefinition.TypeVectorAny))
67+
QgsProcessing.TypeVectorAny))
6768

6869
self.addParameter(QgsProcessingParameterFeatureSink(self.OUTPUT, self.tr('Merged')))
6970
self.addOutput(QgsProcessingOutputVectorLayer(self.OUTPUT, self.tr('Merged')))

‎python/plugins/processing/algs/qgis/PointsLayerFromTable.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
QgsPoint,
3131
QgsFeatureRequest,
3232
QgsGeometry,
33+
QgsProcessing,
3334
QgsProcessingParameterDefinition,
3435
QgsProcessingParameterFeatureSink,
3536
QgsProcessingParameterFeatureSource,
@@ -64,7 +65,7 @@ def group(self):
6465
def __init__(self):
6566
super().__init__()
6667

67-
self.addParameter(QgsProcessingParameterFeatureSource(self.INPUT, self.tr('Input layer'), types=[QgsProcessingParameterField.TypeTable]))
68+
self.addParameter(QgsProcessingParameterFeatureSource(self.INPUT, self.tr('Input layer'), types=[QgsProcessing.TypeTable]))
6869

6970
self.addParameter(QgsProcessingParameterField(self.XFIELD,
7071
self.tr('X field'), parentLayerParameterName=self.INPUT, type=QgsProcessingParameterField.Any))
@@ -77,8 +78,8 @@ def __init__(self):
7778
self.addParameter(QgsProcessingParameterCrs(self.TARGET_CRS,
7879
self.tr('Target CRS'), defaultValue='EPSG:4326'))
7980

80-
self.addParameter(QgsProcessingParameterFeatureSink(self.OUTPUT, self.tr('Points from table'), type=QgsProcessingParameterDefinition.TypeVectorPoint))
81-
self.addOutput(QgsProcessingOutputVectorLayer(self.OUTPUT, self.tr('Points from table'), type=QgsProcessingParameterDefinition.TypeVectorPoint))
81+
self.addParameter(QgsProcessingParameterFeatureSink(self.OUTPUT, self.tr('Points from table'), type=QgsProcessing.TypeVectorPoint))
82+
self.addOutput(QgsProcessingOutputVectorLayer(self.OUTPUT, self.tr('Points from table'), type=QgsProcessing.TypeVectorPoint))
8283

8384
def name(self):
8485
return 'createpointslayerfromtable'

‎python/plugins/processing/algs/qgis/RegularPoints.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
from qgis.PyQt.QtCore import QVariant
3535
from qgis.core import (QgsRectangle, QgsFields, QgsFeatureSink, QgsField, QgsFeature, QgsWkbTypes,
3636
QgsGeometry, QgsPointXY, QgsCoordinateReferenceSystem,
37+
QgsProcessing,
3738
QgsProcessingParameterExtent,
3839
QgsProcessingParameterNumber,
3940
QgsProcessingParameterBoolean,
@@ -78,8 +79,8 @@ def __init__(self):
7879
self.addParameter(QgsProcessingParameterCrs(self.CRS,
7980
self.tr('Output layer CRS'), 'ProjectCrs'))
8081

81-
self.addParameter(QgsProcessingParameterFeatureSink(self.OUTPUT, self.tr('Regular points'), QgsProcessingParameterDefinition.TypeVectorPoint))
82-
self.addOutput(QgsProcessingOutputVectorLayer(self.OUTPUT, self.tr('Regular points'), QgsProcessingParameterDefinition.TypeVectorPoint))
82+
self.addParameter(QgsProcessingParameterFeatureSink(self.OUTPUT, self.tr('Regular points'), QgsProcessing.TypeVectorPoint))
83+
self.addOutput(QgsProcessingOutputVectorLayer(self.OUTPUT, self.tr('Regular points'), QgsProcessing.TypeVectorPoint))
8384

8485
def name(self):
8586
return 'regularpoints'

‎python/plugins/processing/algs/qgis/SnapGeometries.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
from qgis.analysis import (QgsGeometrySnapper,
2929
QgsInternalGeometrySnapper)
3030
from qgis.core import (QgsFeatureSink,
31+
QgsProcessing,
3132
QgsProcessingParameterDefinition,
3233
QgsProcessingParameterFeatureSource,
3334
QgsProcessingParameterFeatureSink,
@@ -52,11 +53,11 @@ def group(self):
5253
def __init__(self):
5354
super().__init__()
5455

55-
self.addParameter(QgsProcessingParameterFeatureSource(self.INPUT, self.tr('Input layer'), [QgsProcessingParameterDefinition.TypeVectorPoint, QgsProcessingParameterDefinition.TypeVectorLine, QgsProcessingParameterDefinition.TypeVectorPolygon]))
56+
self.addParameter(QgsProcessingParameterFeatureSource(self.INPUT, self.tr('Input layer'), [QgsProcessing.TypeVectorPoint, QgsProcessing.TypeVectorLine, QgsProcessing.TypeVectorPolygon]))
5657
self.addParameter(QgsProcessingParameterFeatureSource(self.REFERENCE_LAYER, self.tr('Reference layer'),
57-
[QgsProcessingParameterDefinition.TypeVectorPoint,
58-
QgsProcessingParameterDefinition.TypeVectorLine,
59-
QgsProcessingParameterDefinition.TypeVectorPolygon]))
58+
[QgsProcessing.TypeVectorPoint,
59+
QgsProcessing.TypeVectorLine,
60+
QgsProcessing.TypeVectorPolygon]))
6061

6162
self.addParameter(QgsProcessingParameterNumber(self.TOLERANCE, self.tr('Tolerance (layer units)'), type=QgsProcessingParameterNumber.Double,
6263
minValue=0.00000001, maxValue=9999999999, defaultValue=10.0))

‎python/plugins/processing/algs/qgis/VoronoiPolygons.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
QgsGeometry,
3737
QgsPointXY,
3838
QgsWkbTypes,
39+
QgsProcessing,
3940
QgsProcessingUtils,
4041
QgsProcessingParameterFeatureSource,
4142
QgsProcessingParameterDefinition,
@@ -66,12 +67,12 @@ def group(self):
6667
def __init__(self):
6768
super().__init__()
6869

69-
self.addParameter(QgsProcessingParameterFeatureSource(self.INPUT, self.tr('Input layer'), [QgsProcessingParameterDefinition.TypeVectorPoint]))
70+
self.addParameter(QgsProcessingParameterFeatureSource(self.INPUT, self.tr('Input layer'), [QgsProcessing.TypeVectorPoint]))
7071
self.addParameter(QgsProcessingParameterNumber(self.BUFFER, self.tr('Buffer region'), type=QgsProcessingParameterNumber.Double,
7172
minValue=0.0, maxValue=9999999999, defaultValue=0.0))
7273

73-
self.addParameter(QgsProcessingParameterFeatureSink(self.OUTPUT, self.tr('Voronoi polygons'), type=QgsProcessingParameterDefinition.TypeVectorPolygon))
74-
self.addOutput(QgsProcessingOutputVectorLayer(self.OUTPUT, self.tr("Voronoi polygons"), type=QgsProcessingParameterDefinition.TypeVectorPolygon))
74+
self.addParameter(QgsProcessingParameterFeatureSink(self.OUTPUT, self.tr('Voronoi polygons'), type=QgsProcessing.TypeVectorPolygon))
75+
self.addOutput(QgsProcessingOutputVectorLayer(self.OUTPUT, self.tr("Voronoi polygons"), type=QgsProcessing.TypeVectorPolygon))
7576

7677
def name(self):
7778
return 'voronoipolygons'

‎python/plugins/processing/algs/qgis/ZonalStatistics.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232

3333
from qgis.analysis import QgsZonalStatistics
3434
from qgis.core import (QgsFeatureSink,
35+
QgsProcessing,
3536
QgsProcessingUtils,
3637
QgsProcessingParameterDefinition,
3738
QgsProcessingParameterVectorLayer,
@@ -83,7 +84,7 @@ def __init__(self):
8384
minValue=1, maxValue=999, defaultValue=1))
8485
self.addParameter(QgsProcessingParameterVectorLayer(self.INPUT_VECTOR,
8586
self.tr('Vector layer containing zones'),
86-
[QgsProcessingParameterDefinition.TypeVectorPolygon]))
87+
[QgsProcessing.TypeVectorPolygon]))
8788
self.addParameter(QgsProcessingParameterString(self.COLUMN_PREFIX,
8889
self.tr('Output column prefix'), '_'))
8990
keys = list(self.STATS.keys())
@@ -93,7 +94,7 @@ def __init__(self):
9394
allowMultiple=True, defaultValue=[0, 1, 2]))
9495
self.addOutput(QgsProcessingOutputVectorLayer(self.INPUT_VECTOR,
9596
self.tr('Zonal statistics'),
96-
QgsProcessingParameterDefinition.TypeVectorPolygon))
97+
QgsProcessing.TypeVectorPolygon))
9798

9899
self.bandNumber = None
99100
self.columnPrefix = None

‎python/plugins/processing/gui/BatchInputSelectionPanel.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
from qgis.core import (QgsMapLayer,
3737
QgsSettings,
3838
QgsProject,
39+
QgsProcessing,
3940
QgsProcessingUtils,
4041
QgsProcessingParameterMultipleLayers,
4142
QgsProcessingParameterRasterLayer,
@@ -103,18 +104,18 @@ def showLayerSelectionDialog(self):
103104
layers = []
104105
if (isinstance(self.param, QgsProcessingParameterRasterLayer) or
105106
(isinstance(self.param, QgsProcessingParameterMultipleLayers) and
106-
self.param.layerType() == QgsProcessingParameterDefinition.TypeRaster)):
107+
self.param.layerType() == QgsProcessing.TypeRaster)):
107108
layers = QgsProcessingUtils.compatibleRasterLayers(QgsProject.instance())
108109
elif isinstance(self.param, QgsProcessingParameterVectorLayer):
109110
layers = QgsProcessingUtils.compatibleVectorLayers(QgsProject.instance())
110111
else:
111-
datatypes = [QgsProcessingParameterDefinition.TypeVectorAny]
112+
datatypes = [QgsProcessing.TypeVectorAny]
112113
if isinstance(self.param, QgsProcessingParameterFeatureSource):
113114
datatypes = self.param.dataTypes()
114115
elif isinstance(self.param, QgsProcessingParameterMultipleLayers):
115116
datatypes = [self.param.layerType()]
116117

117-
if QgsProcessingParameterDefinition.TypeVectorAny not in datatypes:
118+
if QgsProcessing.TypeVectorAny not in datatypes:
118119
layers = QgsProcessingUtils.compatibleVectorLayers(QgsProject.instance(), datatypes)
119120
else:
120121
layers = QgsProcessingUtils.compatibleVectorLayers(QgsProject.instance())

‎python/plugins/processing/gui/ParameterGuiUtils.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626

2727
__revision__ = '$Format:%H$'
2828

29-
from qgis.core import (
30-
QgsProcessingParameterDefinition,
31-
QgsProcessingFeatureSourceDefinition,
32-
QgsVectorFileWriter)
29+
from qgis.core import (QgsProcessing,
30+
QgsProcessingParameterDefinition,
31+
QgsProcessingFeatureSourceDefinition,
32+
QgsVectorFileWriter)
3333
from qgis.PyQt.QtCore import QCoreApplication
3434
from processing.tools import dataobjects
3535

@@ -47,9 +47,9 @@ def getFileFilter(param):
4747
:return:
4848
"""
4949
if param.type() == 'multilayer':
50-
if param.layerType() == QgsProcessingParameterDefinition.TypeRaster:
50+
if param.layerType() == QgsProcessing.TypeRaster:
5151
exts = dataobjects.getSupportedOutputRasterLayerExtensions()
52-
elif param.layerType() == QgsProcessingParameterDefinition.TypeFile:
52+
elif param.layerType() == QgsProcessing.TypeFile:
5353
return tr('All files (*.*)', 'QgsProcessingParameterMultipleLayers')
5454
else:
5555
exts = QgsVectorFileWriter.supportedFormatExtensions()

‎python/plugins/processing/gui/wrappers.py‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
QgsSettings,
4646
QgsProject,
4747
QgsMapLayer,
48+
QgsProcessing,
4849
QgsProcessingUtils,
4950
QgsProcessingParameterDefinition,
5051
QgsProcessingParameterBoolean,
@@ -517,20 +518,20 @@ def value(self):
517518
class MultipleInputWidgetWrapper(WidgetWrapper):
518519

519520
def _getOptions(self):
520-
if self.param.layerType() == QgsProcessingParameterDefinition.TypeVectorAny:
521+
if self.param.layerType() == QgsProcessing.TypeVectorAny:
521522
options = self.dialog.getAvailableValuesOfType(QgsProcessingParameterFeatureSource, QgsProcessingOutputVectorLayer)
522-
elif self.param.layerType() == QgsProcessingParameterDefinition.TypeVectorPoint:
523+
elif self.param.layerType() == QgsProcessing.TypeVectorPoint:
523524
options = self.dialog.getAvailableValuesOfType(QgsProcessingParameterFeatureSource, QgsProcessingOutputVectorLayer,
524-
[QgsProcessingParameterDefinition.TypeVectorPoint, QgsProcessingParameterDefinition.TypeVectorAny])
525-
elif self.param.layerType() == QgsProcessingParameterDefinition.TypeVectorLine:
525+
[QgsProcessing.TypeVectorPoint, QgsProcessing.TypeVectorAny])
526+
elif self.param.layerType() == QgsProcessing.TypeVectorLine:
526527
options = self.dialog.getAvailableValuesOfType(QgsProcessingParameterFeatureSource, QgsProcessingOutputVectorLayer,
527-
[QgsProcessingParameterDefinition.TypeVectorLine, QgsProcessingParameterDefinition.TypeVectorAny])
528-
elif self.param.layerType() == QgsProcessingParameterDefinition.TypeVectorPolygon:
528+
[QgsProcessing.TypeVectorLine, QgsProcessing.TypeVectorAny])
529+
elif self.param.layerType() == QgsProcessing.TypeVectorPolygon:
529530
options = self.dialog.getAvailableValuesOfType(QgsProcessingParameterFeatureSource, QgsProcessingOutputVectorLayer,
530-
[QgsProcessingParameterDefinition.TypeVectorPolygon, QgsProcessingParameterDefinition.TypeVectorAny])
531-
elif self.param.layerType() == QgsProcessingParameterDefinition.TypeRaster:
531+
[QgsProcessing.TypeVectorPolygon, QgsProcessing.TypeVectorAny])
532+
elif self.param.layerType() == QgsProcessing.TypeRaster:
532533
options = self.dialog.getAvailableValuesOfType(QgsProcessingParameterRasterLayer, QgsProcessingOutputRasterLayer)
533-
elif self.param.layerType() == QgsProcessingParameterDefinition.TypeTable:
534+
elif self.param.layerType() == QgsProcessing.TypeTable:
534535
options = self.dialog.getAvailableValuesOfType(QgsProcessingParameterVectorLayer, OutputTable)
535536
else:
536537
options = self.dialog.getAvailableValuesOfType(QgsProcessingParameterFile, OutputFile)
@@ -539,12 +540,12 @@ def _getOptions(self):
539540

540541
def createWidget(self):
541542
if self.dialogType == DIALOG_STANDARD:
542-
if self.param.layerType() == QgsProcessingParameterDefinition.TypeFile:
543+
if self.param.layerType() == QgsProcessing.TypeFile:
543544
return MultipleInputPanel(datatype=dataobjects.TYPE_FILE)
544545
else:
545-
if self.param.layerType() == QgsProcessingParameterDefinition.TypeRaster:
546+
if self.param.layerType() == QgsProcessing.TypeRaster:
546547
options = QgsProcessingUtils.compatibleRasterLayers(QgsProject.instance(), False)
547-
elif self.param.layerType() in (QgsProcessingParameterDefinition.TypeVectorAny, QgsProcessingParameterDefinition.TypeTable):
548+
elif self.param.layerType() in (QgsProcessing.TypeVectorAny, QgsProcessing.TypeTable):
548549
options = QgsProcessingUtils.compatibleVectorLayers(QgsProject.instance(), [], False)
549550
else:
550551
options = QgsProcessingUtils.compatibleVectorLayers(QgsProject.instance(), [self.param.layerType()], False)
@@ -559,10 +560,10 @@ def createWidget(self):
559560
return MultipleInputPanel(options)
560561

561562
def refresh(self):
562-
if self.param.layerType() != QgsProcessingParameterDefinition.TypeFile:
563-
if self.param.layerType() == QgsProcessingParameterDefinition.TypeRaster:
563+
if self.param.layerType() != QgsProcessing.TypeFile:
564+
if self.param.layerType() == QgsProcessing.TypeRaster:
564565
options = QgsProcessingUtils.compatibleRasterLayers(QgsProject.instance(), False)
565-
elif self.param.layerType() in (QgsProcessingParameterDefinition.TypeVectorAny, QgsProcessingParameterDefinition.TypeTable):
566+
elif self.param.layerType() in (QgsProcessing.TypeVectorAny, QgsProcessing.TypeTable):
566567
options = QgsProcessingUtils.compatibleVectorLayers(QgsProject.instance(), [], False)
567568
else:
568569
options = QgsProcessingUtils.compatibleVectorLayers(QgsProject.instance(), [self.param.layerType()], False)
@@ -584,12 +585,12 @@ def setValue(self, value):
584585

585586
def value(self):
586587
if self.dialogType == DIALOG_STANDARD:
587-
if self.param.layerType() == QgsProcessingParameterDefinition.TypeFile:
588+
if self.param.layerType() == QgsProcessing.TypeFile:
588589
return self.param.setValue(self.widget.selectedoptions)
589590
else:
590-
if self.param.layerType() == QgsProcessingParameterDefinition.TypeRaster:
591+
if self.param.layerType() == QgsProcessing.TypeRaster:
591592
options = QgsProcessingUtils.compatibleRasterLayers(QgsProject.instance(), False)
592-
elif self.param.layerType() in (QgsProcessingParameterDefinition.TypeVectorAny, QgsProcessingParameterDefinition.TypeTable):
593+
elif self.param.layerType() in (QgsProcessing.TypeVectorAny, QgsProcessing.TypeTable):
593594
options = QgsProcessingUtils.compatibleVectorLayers(QgsProject.instance(), [], False)
594595
else:
595596
options = QgsProcessingUtils.compatibleVectorLayers(QgsProject.instance(), [self.param.layerType()], False)
@@ -599,7 +600,7 @@ def value(self):
599600
else:
600601
options = self._getOptions()
601602
values = [options[i] for i in self.widget.selectedoptions]
602-
if len(values) == 0 and not self.param.flags() & QgsProcessingParameterDefinition.FlagOptional:
603+
if len(values) == 0 and not self.param.flags() & QgsProcessing.FlagOptional:
603604
raise InvalidParameterValue()
604605
return values
605606

@@ -784,13 +785,13 @@ def createWidget(self):
784785
widget.setLayout(vl)
785786

786787
filters = QgsMapLayerProxyModel.Filters()
787-
if QgsProcessingParameterDefinition.TypeVectorAny in self.param.dataTypes() or len(self.param.dataTypes()) == 0:
788+
if QgsProcessing.TypeVectorAny in self.param.dataTypes() or len(self.param.dataTypes()) == 0:
788789
filters = QgsMapLayerProxyModel.HasGeometry
789-
if QgsProcessingParameterDefinition.TypeVectorPoint in self.param.dataTypes():
790+
if QgsProcessing.TypeVectorPoint in self.param.dataTypes():
790791
filters |= QgsMapLayerProxyModel.PointLayer
791-
if QgsProcessingParameterDefinition.TypeVectorLine in self.param.dataTypes():
792+
if QgsProcessing.TypeVectorLine in self.param.dataTypes():
792793
filters |= QgsMapLayerProxyModel.LineLayer
793-
if QgsProcessingParameterDefinition.TypeVectorPolygon in self.param.dataTypes():
794+
if QgsProcessing.TypeVectorPolygon in self.param.dataTypes():
794795
filters |= QgsMapLayerProxyModel.PolygonLayer
795796

796797
try:

‎src/core/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -922,6 +922,7 @@ SET(QGIS_CORE_HDRS
922922
metadata/qgslayermetadatavalidator.h
923923

924924
processing/qgsnativealgorithms.h
925+
processing/qgsprocessing.h
925926
processing/qgsprocessingalgorithm.h
926927
processing/qgsprocessingcontext.h
927928
processing/qgsprocessingmodelalgorithm.h

‎src/core/processing/qgsnativealgorithms.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ void QgsNativeAlgorithms::loadAlgorithms()
7474
QgsCentroidAlgorithm::QgsCentroidAlgorithm()
7575
{
7676
addParameter( new QgsProcessingParameterFeatureSource( QStringLiteral( "INPUT" ), QObject::tr( "Input layer" ) ) );
77-
addParameter( new QgsProcessingParameterFeatureSink( QStringLiteral( "OUTPUT" ), QObject::tr( "Centroids" ), QgsProcessingParameterDefinition::TypeVectorPoint ) );
78-
addOutput( new QgsProcessingOutputVectorLayer( QStringLiteral( "OUTPUT" ), QObject::tr( "Centroids" ), QgsProcessingParameterDefinition::TypeVectorPoint ) );
77+
addParameter( new QgsProcessingParameterFeatureSink( QStringLiteral( "OUTPUT" ), QObject::tr( "Centroids" ), QgsProcessing::TypeVectorPoint ) );
78+
addOutput( new QgsProcessingOutputVectorLayer( QStringLiteral( "OUTPUT" ), QObject::tr( "Centroids" ), QgsProcessing::TypeVectorPoint ) );
7979
}
8080

8181
QString QgsCentroidAlgorithm::shortHelpString() const
@@ -151,8 +151,8 @@ QgsBufferAlgorithm::QgsBufferAlgorithm()
151151
addParameter( new QgsProcessingParameterNumber( QStringLiteral( "MITRE_LIMIT" ), QObject::tr( "Miter limit" ), QgsProcessingParameterNumber::Double, 2, false, 1 ) );
152152

153153
addParameter( new QgsProcessingParameterBoolean( QStringLiteral( "DISSOLVE" ), QObject::tr( "Dissolve result" ), false ) );
154-
addParameter( new QgsProcessingParameterFeatureSink( QStringLiteral( "OUTPUT" ), QObject::tr( "Buffered" ), QgsProcessingParameterDefinition::TypeVectorPolygon ) );
155-
addOutput( new QgsProcessingOutputVectorLayer( QStringLiteral( "OUTPUT" ), QObject::tr( "Buffered" ), QgsProcessingParameterDefinition::TypeVectorPoint ) );
154+
addParameter( new QgsProcessingParameterFeatureSink( QStringLiteral( "OUTPUT" ), QObject::tr( "Buffered" ), QgsProcessing::TypeVectorPolygon ) );
155+
addOutput( new QgsProcessingOutputVectorLayer( QStringLiteral( "OUTPUT" ), QObject::tr( "Buffered" ), QgsProcessing::TypeVectorPoint ) );
156156
}
157157

158158
QString QgsBufferAlgorithm::shortHelpString() const
@@ -415,7 +415,7 @@ QVariantMap QgsDissolveAlgorithm::processAlgorithm( const QVariantMap &parameter
415415
QgsClipAlgorithm::QgsClipAlgorithm()
416416
{
417417
addParameter( new QgsProcessingParameterFeatureSource( QStringLiteral( "INPUT" ), QObject::tr( "Input layer" ) ) );
418-
addParameter( new QgsProcessingParameterFeatureSource( QStringLiteral( "OVERLAY" ), QObject::tr( "Clip layer" ), QList< int >() << QgsProcessingParameterDefinition::TypeVectorPolygon ) );
418+
addParameter( new QgsProcessingParameterFeatureSource( QStringLiteral( "OVERLAY" ), QObject::tr( "Clip layer" ), QList< int >() << QgsProcessing::TypeVectorPolygon ) );
419419

420420
addParameter( new QgsProcessingParameterFeatureSink( QStringLiteral( "OUTPUT" ), QObject::tr( "Clipped" ) ) );
421421
addOutput( new QgsProcessingOutputVectorLayer( QStringLiteral( "OUTPUT" ), QObject::tr( "Clipped" ) ) );
@@ -799,7 +799,7 @@ QgsExtractByExpressionAlgorithm::QgsExtractByExpressionAlgorithm()
799799
addParameter( new QgsProcessingParameterFeatureSink( QStringLiteral( "OUTPUT" ), QObject::tr( "Matching features" ) ) );
800800
addOutput( new QgsProcessingOutputVectorLayer( QStringLiteral( "OUTPUT" ), QObject::tr( "Matching (expression)" ) ) );
801801
addParameter( new QgsProcessingParameterFeatureSink( QStringLiteral( "FAIL_OUTPUT" ), QObject::tr( "Non-matching" ),
802-
QgsProcessingParameterDefinition::TypeVectorAny, QVariant(), true ) );
802+
QgsProcessing::TypeVectorAny, QVariant(), true ) );
803803
addOutput( new QgsProcessingOutputVectorLayer( QStringLiteral( "FAIL_OUTPUT" ), QObject::tr( "Non-matching (expression)" ) ) );
804804
}
805805

@@ -930,7 +930,7 @@ QgsExtractByAttributeAlgorithm::QgsExtractByAttributeAlgorithm()
930930
addParameter( new QgsProcessingParameterFeatureSink( QStringLiteral( "OUTPUT" ), QObject::tr( "Extracted (attribute)" ) ) );
931931
addOutput( new QgsProcessingOutputVectorLayer( QStringLiteral( "OUTPUT" ), QObject::tr( "Matching (attribute)" ) ) );
932932
addParameter( new QgsProcessingParameterFeatureSink( QStringLiteral( "FAIL_OUTPUT" ), QObject::tr( "Extracted (non-matching)" ),
933-
QgsProcessingParameterDefinition::TypeVectorAny, QVariant(), true ) );
933+
QgsProcessing::TypeVectorAny, QVariant(), true ) );
934934
addOutput( new QgsProcessingOutputVectorLayer( QStringLiteral( "FAIL_OUTPUT" ), QObject::tr( "Non-matching (attribute)" ) ) );
935935
}
936936

‎src/core/processing/qgsprocessing.h‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
/***************************************************************************
2+
qgsprocessing.h
3+
---------------
4+
begin : July 2017
5+
copyright : (C) 2017 by Nyall Dawson
6+
email : nyall dot dawson at gmail dot com
7+
***************************************************************************/
8+
9+
/***************************************************************************
10+
* *
11+
* This program is free software; you can redistribute it and/or modify *
12+
* it under the terms of the GNU General Public License as published by *
13+
* the Free Software Foundation; either version 2 of the License, or *
14+
* (at your option) any later version. *
15+
* *
16+
***************************************************************************/
17+
18+
#ifndef QGSPROCESSING_H
19+
#define QGSPROCESSING_H
20+
21+
#include "qgis_core.h"
22+
#include "qgis.h"
23+
#include "qgsprocessingparameters.h"
24+
25+
//
26+
// Output definitions
27+
//
28+
29+
/**
30+
* \class QgsProcessing
31+
* \ingroup core
32+
*
33+
* Contains enumerations and other constants for use in processing algorithms
34+
* and parameters.
35+
*
36+
* \since QGIS 3.0
37+
*/
38+
39+
class CORE_EXPORT QgsProcessing
40+
{
41+
42+
public:
43+
44+
//! Layer types enum
45+
enum LayerType
46+
{
47+
TypeAny = -2, //!< Any layer
48+
TypeVectorAny = -1, //!< Any vector layer with geometry
49+
TypeVectorPoint = 0, //!< Vector point layers
50+
TypeVectorLine = 1, //!< Vector line layers
51+
TypeVectorPolygon = 2, //!< Vector polygon layers
52+
TypeRaster = 3, //!< Raster layers
53+
TypeFile = 4, //!< Files
54+
TypeTable = 5, //!< Tables (i.e. vector layers with or without geometry). When used for a sink this indicates the sink has no geometry.
55+
};
56+
57+
58+
59+
};
60+
61+
#endif // QGSPROCESSING_H

‎src/core/processing/qgsprocessingmodelalgorithm.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -874,7 +874,7 @@ QgsProcessingModelAlgorithm::ChildParameterSources QgsProcessingModelAlgorithm::
874874
bool ok = !sourceDef->dataTypes().isEmpty();
875875
Q_FOREACH ( int type, sourceDef->dataTypes() )
876876
{
877-
if ( dataTypes.contains( type ) || type == QgsProcessingParameterDefinition::TypeAny )
877+
if ( dataTypes.contains( type ) || type == QgsProcessing::TypeAny )
878878
{
879879
ok = true;
880880
break;
@@ -914,7 +914,7 @@ QgsProcessingModelAlgorithm::ChildParameterSources QgsProcessingModelAlgorithm::
914914
if ( out->type() == QgsProcessingOutputVectorLayer::typeName() )
915915
{
916916
const QgsProcessingOutputVectorLayer *vectorOut = static_cast< const QgsProcessingOutputVectorLayer *>( out );
917-
if ( !( dataTypes.contains( vectorOut->dataType() ) || vectorOut->dataType() == QgsProcessingParameterDefinition::TypeAny ) )
917+
if ( !( dataTypes.contains( vectorOut->dataType() ) || vectorOut->dataType() == QgsProcessing::TypeAny ) )
918918
{
919919
continue;
920920
}

‎src/core/processing/qgsprocessingoutputs.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@ QgsProcessingOutputDefinition::QgsProcessingOutputDefinition( const QString &nam
2424

2525
}
2626

27-
QgsProcessingOutputVectorLayer::QgsProcessingOutputVectorLayer( const QString &name, const QString &description, QgsProcessingParameterDefinition::LayerType type )
27+
QgsProcessingOutputVectorLayer::QgsProcessingOutputVectorLayer( const QString &name, const QString &description, QgsProcessing::LayerType type )
2828
: QgsProcessingOutputDefinition( name, description )
2929
, mDataType( type )
3030
{}
3131

32-
QgsProcessingParameterDefinition::LayerType QgsProcessingOutputVectorLayer::dataType() const
32+
QgsProcessing::LayerType QgsProcessingOutputVectorLayer::dataType() const
3333
{
3434
return mDataType;
3535
}
3636

37-
void QgsProcessingOutputVectorLayer::setDataType( QgsProcessingParameterDefinition::LayerType type )
37+
void QgsProcessingOutputVectorLayer::setDataType( QgsProcessing::LayerType type )
3838
{
3939
mDataType = type;
4040
}

‎src/core/processing/qgsprocessingoutputs.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ class CORE_EXPORT QgsProcessingOutputVectorLayer : public QgsProcessingOutputDef
126126
/**
127127
* Constructor for QgsProcessingOutputVectorLayer.
128128
*/
129-
QgsProcessingOutputVectorLayer( const QString &name, const QString &description = QString(), QgsProcessingParameterDefinition::LayerType type = QgsProcessingParameterDefinition::TypeVectorAny );
129+
QgsProcessingOutputVectorLayer( const QString &name, const QString &description = QString(), QgsProcessing::LayerType type = QgsProcessing::TypeVectorAny );
130130

131131
/**
132132
* Returns the type name for the output class.
@@ -138,17 +138,17 @@ class CORE_EXPORT QgsProcessingOutputVectorLayer : public QgsProcessingOutputDef
138138
* Returns the layer type for the output layer.
139139
* \see setDataType()
140140
*/
141-
QgsProcessingParameterDefinition::LayerType dataType() const;
141+
QgsProcessing::LayerType dataType() const;
142142

143143
/**
144144
* Sets the layer \a type for the output layer.
145145
* \see dataType()
146146
*/
147-
void setDataType( QgsProcessingParameterDefinition::LayerType type );
147+
void setDataType( QgsProcessing::LayerType type );
148148

149149
private:
150150

151-
QgsProcessingParameterDefinition::LayerType mDataType = QgsProcessingParameterDefinition::TypeVectorAny;
151+
QgsProcessing::LayerType mDataType = QgsProcessing::TypeVectorAny;
152152
};
153153

154154
/**

‎src/core/processing/qgsprocessingparameters.cpp‎

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1421,7 +1421,7 @@ QgsProcessingParameterMatrix *QgsProcessingParameterMatrix::fromScriptCode( cons
14211421
return new QgsProcessingParameterMatrix( name, description, 0, false, QStringList(), definition.isEmpty() ? QVariant() : definition, isOptional );
14221422
}
14231423

1424-
QgsProcessingParameterMultipleLayers::QgsProcessingParameterMultipleLayers( const QString &name, const QString &description, LayerType layerType, const QVariant &defaultValue, bool optional )
1424+
QgsProcessingParameterMultipleLayers::QgsProcessingParameterMultipleLayers( const QString &name, const QString &description, QgsProcessing::LayerType layerType, const QVariant &defaultValue, bool optional )
14251425
: QgsProcessingParameterDefinition( name, description, defaultValue, optional )
14261426
, mLayerType( layerType )
14271427
{
@@ -1521,11 +1521,11 @@ QString QgsProcessingParameterMultipleLayers::asScriptCode() const
15211521
code += QStringLiteral( "optional " );
15221522
switch ( mLayerType )
15231523
{
1524-
case TypeRaster:
1524+
case QgsProcessing::TypeRaster:
15251525
code += QStringLiteral( "multiple raster" );
15261526
break;
15271527

1528-
case TypeFile:
1528+
case QgsProcessing::TypeFile:
15291529
code += QStringLiteral( "multiple file" );
15301530
break;
15311531

@@ -1554,12 +1554,12 @@ QString QgsProcessingParameterMultipleLayers::asScriptCode() const
15541554
return code.trimmed();
15551555
}
15561556

1557-
QgsProcessingParameterDefinition::LayerType QgsProcessingParameterMultipleLayers::layerType() const
1557+
QgsProcessing::LayerType QgsProcessingParameterMultipleLayers::layerType() const
15581558
{
15591559
return mLayerType;
15601560
}
15611561

1562-
void QgsProcessingParameterMultipleLayers::setLayerType( LayerType type )
1562+
void QgsProcessingParameterMultipleLayers::setLayerType( QgsProcessing::LayerType type )
15631563
{
15641564
mLayerType = type;
15651565
}
@@ -1586,7 +1586,7 @@ QVariantMap QgsProcessingParameterMultipleLayers::toVariantMap() const
15861586
bool QgsProcessingParameterMultipleLayers::fromVariantMap( const QVariantMap &map )
15871587
{
15881588
QgsProcessingParameterDefinition::fromVariantMap( map );
1589-
mLayerType = static_cast< LayerType >( map.value( QStringLiteral( "layer_type" ) ).toInt() );
1589+
mLayerType = static_cast< QgsProcessing::LayerType >( map.value( QStringLiteral( "layer_type" ) ).toInt() );
15901590
mMinimumNumberInputs = map.value( QStringLiteral( "min_inputs" ) ).toInt();
15911591
return true;
15921592
}
@@ -1602,13 +1602,13 @@ QgsProcessingParameterMultipleLayers *QgsProcessingParameterMultipleLayers::from
16021602
type = m.captured( 1 ).toLower().trimmed();
16031603
defaultVal = m.captured( 2 );
16041604
}
1605-
LayerType layerType = TypeVectorAny;
1605+
QgsProcessing::LayerType layerType = QgsProcessing::TypeVectorAny;
16061606
if ( type == QStringLiteral( "vector" ) )
1607-
layerType = TypeVectorAny;
1607+
layerType = QgsProcessing::TypeVectorAny;
16081608
else if ( type == QStringLiteral( "raster" ) )
1609-
layerType = TypeRaster;
1609+
layerType = QgsProcessing::TypeRaster;
16101610
else if ( type == QStringLiteral( "file" ) )
1611-
layerType = TypeFile;
1611+
layerType = QgsProcessing::TypeFile;
16121612
return new QgsProcessingParameterMultipleLayers( name, description, layerType, defaultVal.isEmpty() ? QVariant() : defaultVal, isOptional );
16131613
}
16141614

@@ -2476,15 +2476,15 @@ QString QgsProcessingParameterFeatureSource::asScriptCode() const
24762476
{
24772477
switch ( type )
24782478
{
2479-
case TypeVectorPoint:
2479+
case QgsProcessing::TypeVectorPoint:
24802480
code += QStringLiteral( "point " );
24812481
break;
24822482

2483-
case TypeVectorLine:
2483+
case QgsProcessing::TypeVectorLine:
24842484
code += QStringLiteral( "line " );
24852485
break;
24862486

2487-
case TypeVectorPolygon:
2487+
case QgsProcessing::TypeVectorPolygon:
24882488
code += QStringLiteral( "polygon " );
24892489
break;
24902490

@@ -2537,19 +2537,19 @@ QgsProcessingParameterFeatureSource *QgsProcessingParameterFeatureSource::fromSc
25372537
{
25382538
if ( def.startsWith( QStringLiteral( "point" ), Qt::CaseInsensitive ) )
25392539
{
2540-
types << QgsProcessingParameterDefinition::TypeVectorPoint;
2540+
types << QgsProcessing::TypeVectorPoint;
25412541
def = def.mid( 6 );
25422542
continue;
25432543
}
25442544
else if ( def.startsWith( QStringLiteral( "line" ), Qt::CaseInsensitive ) )
25452545
{
2546-
types << QgsProcessingParameterDefinition::TypeVectorLine;
2546+
types << QgsProcessing::TypeVectorLine;
25472547
def = def.mid( 5 );
25482548
continue;
25492549
}
25502550
else if ( def.startsWith( QStringLiteral( "polygon" ), Qt::CaseInsensitive ) )
25512551
{
2552-
types << QgsProcessingParameterDefinition::TypeVectorPolygon;
2552+
types << QgsProcessing::TypeVectorPolygon;
25532553
def = def.mid( 8 );
25542554
continue;
25552555
}
@@ -2559,7 +2559,7 @@ QgsProcessingParameterFeatureSource *QgsProcessingParameterFeatureSource::fromSc
25592559
return new QgsProcessingParameterFeatureSource( name, description, types, def, isOptional );
25602560
}
25612561

2562-
QgsProcessingParameterFeatureSink::QgsProcessingParameterFeatureSink( const QString &name, const QString &description, QgsProcessingParameterDefinition::LayerType type, const QVariant &defaultValue, bool optional )
2562+
QgsProcessingParameterFeatureSink::QgsProcessingParameterFeatureSink( const QString &name, const QString &description, QgsProcessing::LayerType type, const QVariant &defaultValue, bool optional )
25632563
: QgsProcessingDestinationParameter( name, description, defaultValue, optional )
25642564
, mDataType( type )
25652565
{
@@ -2622,19 +2622,19 @@ QString QgsProcessingParameterFeatureSink::asScriptCode() const
26222622

26232623
switch ( mDataType )
26242624
{
2625-
case TypeVectorPoint:
2625+
case QgsProcessing::TypeVectorPoint:
26262626
code += QStringLiteral( "point " );
26272627
break;
26282628

2629-
case TypeVectorLine:
2629+
case QgsProcessing::TypeVectorLine:
26302630
code += QStringLiteral( "line " );
26312631
break;
26322632

2633-
case TypeVectorPolygon:
2633+
case QgsProcessing::TypeVectorPolygon:
26342634
code += QStringLiteral( "polygon " );
26352635
break;
26362636

2637-
case TypeTable:
2637+
case QgsProcessing::TypeTable:
26382638
code += QStringLiteral( "table " );
26392639
break;
26402640

@@ -2664,7 +2664,7 @@ QString QgsProcessingParameterFeatureSink::defaultFileExtension() const
26642664
}
26652665
}
26662666

2667-
QgsProcessingParameterDefinition::LayerType QgsProcessingParameterFeatureSink::dataType() const
2667+
QgsProcessing::LayerType QgsProcessingParameterFeatureSink::dataType() const
26682668
{
26692669
return mDataType;
26702670
}
@@ -2673,22 +2673,22 @@ bool QgsProcessingParameterFeatureSink::hasGeometry() const
26732673
{
26742674
switch ( mDataType )
26752675
{
2676-
case TypeAny:
2677-
case TypeVectorAny:
2678-
case TypeVectorPoint:
2679-
case TypeVectorLine:
2680-
case TypeVectorPolygon:
2681-
case TypeTable:
2676+
case QgsProcessing::TypeAny:
2677+
case QgsProcessing::TypeVectorAny:
2678+
case QgsProcessing::TypeVectorPoint:
2679+
case QgsProcessing::TypeVectorLine:
2680+
case QgsProcessing::TypeVectorPolygon:
2681+
case QgsProcessing::TypeTable:
26822682
return true;
26832683

2684-
case TypeRaster:
2685-
case TypeFile:
2684+
case QgsProcessing::TypeRaster:
2685+
case QgsProcessing::TypeFile:
26862686
return false;
26872687
}
26882688
return true;
26892689
}
26902690

2691-
void QgsProcessingParameterFeatureSink::setDataType( QgsProcessingParameterDefinition::LayerType type )
2691+
void QgsProcessingParameterFeatureSink::setDataType( QgsProcessing::LayerType type )
26922692
{
26932693
mDataType = type;
26942694
}
@@ -2703,7 +2703,7 @@ QVariantMap QgsProcessingParameterFeatureSink::toVariantMap() const
27032703
bool QgsProcessingParameterFeatureSink::fromVariantMap( const QVariantMap &map )
27042704
{
27052705
QgsProcessingDestinationParameter::fromVariantMap( map );
2706-
mDataType = static_cast< QgsProcessingParameterDefinition::LayerType >( map.value( QStringLiteral( "data_type" ) ).toInt() );
2706+
mDataType = static_cast< QgsProcessing::LayerType >( map.value( QStringLiteral( "data_type" ) ).toInt() );
27072707
return true;
27082708
}
27092709

@@ -2717,26 +2717,26 @@ QString QgsProcessingParameterFeatureSink::generateTemporaryDestination() const
27172717

27182718
QgsProcessingParameterFeatureSink *QgsProcessingParameterFeatureSink::fromScriptCode( const QString &name, const QString &description, bool isOptional, const QString &definition )
27192719
{
2720-
QgsProcessingParameterDefinition::LayerType type = QgsProcessingParameterDefinition::TypeVectorAny;
2720+
QgsProcessing::LayerType type = QgsProcessing::TypeVectorAny;
27212721
QString def = definition;
27222722
if ( def.startsWith( QStringLiteral( "point" ), Qt::CaseInsensitive ) )
27232723
{
2724-
type = QgsProcessingParameterDefinition::TypeVectorPoint;
2724+
type = QgsProcessing::TypeVectorPoint;
27252725
def = def.mid( 6 );
27262726
}
27272727
else if ( def.startsWith( QStringLiteral( "line" ), Qt::CaseInsensitive ) )
27282728
{
2729-
type = QgsProcessingParameterDefinition::TypeVectorLine;
2729+
type = QgsProcessing::TypeVectorLine;
27302730
def = def.mid( 5 );
27312731
}
27322732
else if ( def.startsWith( QStringLiteral( "polygon" ), Qt::CaseInsensitive ) )
27332733
{
2734-
type = QgsProcessingParameterDefinition::TypeVectorPolygon;
2734+
type = QgsProcessing::TypeVectorPolygon;
27352735
def = def.mid( 8 );
27362736
}
27372737
else if ( def.startsWith( QStringLiteral( "table" ), Qt::CaseInsensitive ) )
27382738
{
2739-
type = QgsProcessingParameterDefinition::TypeTable;
2739+
type = QgsProcessing::TypeTable;
27402740
def = def.mid( 6 );
27412741
}
27422742

@@ -2980,7 +2980,7 @@ QString QgsProcessingDestinationParameter::generateTemporaryDestination() const
29802980
return QgsProcessingUtils::generateTempFilename( name() + '.' + defaultFileExtension() );
29812981
}
29822982

2983-
QgsProcessingParameterVectorOutput::QgsProcessingParameterVectorOutput( const QString &name, const QString &description, QgsProcessingParameterDefinition::LayerType type, const QVariant &defaultValue, bool optional )
2983+
QgsProcessingParameterVectorOutput::QgsProcessingParameterVectorOutput( const QString &name, const QString &description, QgsProcessing::LayerType type, const QVariant &defaultValue, bool optional )
29842984
: QgsProcessingDestinationParameter( name, description, defaultValue, optional )
29852985
, mDataType( type )
29862986
{
@@ -3043,15 +3043,15 @@ QString QgsProcessingParameterVectorOutput::asScriptCode() const
30433043

30443044
switch ( mDataType )
30453045
{
3046-
case TypeVectorPoint:
3046+
case QgsProcessing::TypeVectorPoint:
30473047
code += QStringLiteral( "point " );
30483048
break;
30493049

3050-
case TypeVectorLine:
3050+
case QgsProcessing::TypeVectorLine:
30513051
code += QStringLiteral( "line " );
30523052
break;
30533053

3054-
case TypeVectorPolygon:
3054+
case QgsProcessing::TypeVectorPolygon:
30553055
code += QStringLiteral( "polygon " );
30563056
break;
30573057

@@ -3081,7 +3081,7 @@ QString QgsProcessingParameterVectorOutput::defaultFileExtension() const
30813081
}
30823082
}
30833083

3084-
QgsProcessingParameterDefinition::LayerType QgsProcessingParameterVectorOutput::dataType() const
3084+
QgsProcessing::LayerType QgsProcessingParameterVectorOutput::dataType() const
30853085
{
30863086
return mDataType;
30873087
}
@@ -3090,22 +3090,22 @@ bool QgsProcessingParameterVectorOutput::hasGeometry() const
30903090
{
30913091
switch ( mDataType )
30923092
{
3093-
case TypeAny:
3094-
case TypeVectorAny:
3095-
case TypeVectorPoint:
3096-
case TypeVectorLine:
3097-
case TypeVectorPolygon:
3098-
case TypeTable:
3093+
case QgsProcessing::TypeAny:
3094+
case QgsProcessing::TypeVectorAny:
3095+
case QgsProcessing::TypeVectorPoint:
3096+
case QgsProcessing::TypeVectorLine:
3097+
case QgsProcessing::TypeVectorPolygon:
3098+
case QgsProcessing::TypeTable:
30993099
return true;
31003100

3101-
case TypeRaster:
3102-
case TypeFile:
3101+
case QgsProcessing::TypeRaster:
3102+
case QgsProcessing::TypeFile:
31033103
return false;
31043104
}
31053105
return true;
31063106
}
31073107

3108-
void QgsProcessingParameterVectorOutput::setDataType( QgsProcessingParameterDefinition::LayerType type )
3108+
void QgsProcessingParameterVectorOutput::setDataType( QgsProcessing::LayerType type )
31093109
{
31103110
mDataType = type;
31113111
}
@@ -3120,27 +3120,27 @@ QVariantMap QgsProcessingParameterVectorOutput::toVariantMap() const
31203120
bool QgsProcessingParameterVectorOutput::fromVariantMap( const QVariantMap &map )
31213121
{
31223122
QgsProcessingDestinationParameter::fromVariantMap( map );
3123-
mDataType = static_cast< QgsProcessingParameterDefinition::LayerType >( map.value( QStringLiteral( "data_type" ) ).toInt() );
3123+
mDataType = static_cast< QgsProcessing::LayerType >( map.value( QStringLiteral( "data_type" ) ).toInt() );
31243124
return true;
31253125
}
31263126

31273127
QgsProcessingParameterVectorOutput *QgsProcessingParameterVectorOutput::fromScriptCode( const QString &name, const QString &description, bool isOptional, const QString &definition )
31283128
{
3129-
QgsProcessingParameterDefinition::LayerType type = QgsProcessingParameterDefinition::TypeVectorAny;
3129+
QgsProcessing::LayerType type = QgsProcessing::TypeVectorAny;
31303130
QString def = definition;
31313131
if ( def.startsWith( QStringLiteral( "point" ), Qt::CaseInsensitive ) )
31323132
{
3133-
type = QgsProcessingParameterDefinition::TypeVectorPoint;
3133+
type = QgsProcessing::TypeVectorPoint;
31343134
def = def.mid( 6 );
31353135
}
31363136
else if ( def.startsWith( QStringLiteral( "line" ), Qt::CaseInsensitive ) )
31373137
{
3138-
type = QgsProcessingParameterDefinition::TypeVectorLine;
3138+
type = QgsProcessing::TypeVectorLine;
31393139
def = def.mid( 5 );
31403140
}
31413141
else if ( def.startsWith( QStringLiteral( "polygon" ), Qt::CaseInsensitive ) )
31423142
{
3143-
type = QgsProcessingParameterDefinition::TypeVectorPolygon;
3143+
type = QgsProcessing::TypeVectorPolygon;
31443144
def = def.mid( 8 );
31453145
}
31463146

‎src/core/processing/qgsprocessingparameters.h‎

Lines changed: 14 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
#include "qgis_core.h"
2222
#include "qgis.h"
23+
#include "qgsprocessing.h"
2324
#include "qgsproperty.h"
2425
#include "qgscoordinatereferencesystem.h"
2526
#include <QMap>
@@ -244,19 +245,6 @@ class CORE_EXPORT QgsProcessingParameterDefinition
244245
};
245246
Q_DECLARE_FLAGS( Flags, Flag )
246247

247-
//! Layer types enum
248-
enum LayerType
249-
{
250-
TypeAny = -2, //!< Any layer
251-
TypeVectorAny = -1, //!< Any vector layer with geometry
252-
TypeVectorPoint = 0, //!< Vector point layers
253-
TypeVectorLine = 1, //!< Vector line layers
254-
TypeVectorPolygon = 2, //!< Vector polygon layers
255-
TypeRaster = 3, //!< Raster layers
256-
TypeFile = 4, //!< Files
257-
TypeTable = 5, //!< Tables (i.e. vector layers with or without geometry). When used for a sink this indicates the sink has no geometry.
258-
};
259-
260248
/**
261249
* Constructor for QgsProcessingParameterDefinition.
262250
*/
@@ -948,7 +936,7 @@ class CORE_EXPORT QgsProcessingParameterMultipleLayers : public QgsProcessingPar
948936
/**
949937
* Constructor for QgsProcessingParameterMultipleLayers.
950938
*/
951-
QgsProcessingParameterMultipleLayers( const QString &name, const QString &description = QString(), QgsProcessingParameterDefinition::LayerType layerType = QgsProcessingParameterDefinition::TypeVectorAny,
939+
QgsProcessingParameterMultipleLayers( const QString &name, const QString &description = QString(), QgsProcessing::LayerType layerType = QgsProcessing::TypeVectorAny,
952940
const QVariant &defaultValue = QVariant(),
953941
bool optional = false );
954942

@@ -965,13 +953,13 @@ class CORE_EXPORT QgsProcessingParameterMultipleLayers : public QgsProcessingPar
965953
* Returns the layer type for layers acceptable by the parameter.
966954
* \see setLayerType()
967955
*/
968-
QgsProcessingParameterDefinition::LayerType layerType() const;
956+
QgsProcessing::LayerType layerType() const;
969957

970958
/**
971959
* Sets the layer \a type for layers acceptable by the parameter.
972960
* \see layerType()
973961
*/
974-
void setLayerType( QgsProcessingParameterDefinition::LayerType type );
962+
void setLayerType( QgsProcessing::LayerType type );
975963

976964
/**
977965
* Returns the minimum number of layers required for the parameter. If the return value is < 1
@@ -997,7 +985,7 @@ class CORE_EXPORT QgsProcessingParameterMultipleLayers : public QgsProcessingPar
997985

998986
private:
999987

1000-
LayerType mLayerType = TypeVectorAny;
988+
QgsProcessing::LayerType mLayerType = QgsProcessing::TypeVectorAny;
1001989
int mMinimumNumberInputs = 0;
1002990

1003991
};
@@ -1509,7 +1497,7 @@ class CORE_EXPORT QgsProcessingParameterFeatureSource : public QgsProcessingPara
15091497

15101498
private:
15111499

1512-
QList< int > mDataTypes = QList< int >() << QgsProcessingParameterDefinition::TypeVectorAny;
1500+
QList< int > mDataTypes = QList< int >() << QgsProcessing::TypeVectorAny;
15131501

15141502
};
15151503

@@ -1589,7 +1577,7 @@ class CORE_EXPORT QgsProcessingParameterFeatureSink : public QgsProcessingDestin
15891577
/**
15901578
* Constructor for QgsProcessingParameterFeatureSink.
15911579
*/
1592-
QgsProcessingParameterFeatureSink( const QString &name, const QString &description = QString(), QgsProcessingParameterDefinition::LayerType type = QgsProcessingParameterDefinition::TypeVectorAny, const QVariant &defaultValue = QVariant(),
1580+
QgsProcessingParameterFeatureSink( const QString &name, const QString &description = QString(), QgsProcessing::LayerType type = QgsProcessing::TypeVectorAny, const QVariant &defaultValue = QVariant(),
15931581
bool optional = false );
15941582

15951583
/**
@@ -1607,7 +1595,7 @@ class CORE_EXPORT QgsProcessingParameterFeatureSink : public QgsProcessingDestin
16071595
* Returns the layer type for sinks associated with the parameter.
16081596
* \see setDataType()
16091597
*/
1610-
QgsProcessingParameterDefinition::LayerType dataType() const;
1598+
QgsProcessing::LayerType dataType() const;
16111599

16121600
/**
16131601
* Returns true if sink is likely to include geometries. In cases were presence of geometry
@@ -1619,7 +1607,7 @@ class CORE_EXPORT QgsProcessingParameterFeatureSink : public QgsProcessingDestin
16191607
* Sets the layer \a type for the sinks associated with the parameter.
16201608
* \see dataType()
16211609
*/
1622-
void setDataType( QgsProcessingParameterDefinition::LayerType type );
1610+
void setDataType( QgsProcessing::LayerType type );
16231611

16241612
QVariantMap toVariantMap() const override;
16251613
bool fromVariantMap( const QVariantMap &map ) override;
@@ -1632,7 +1620,7 @@ class CORE_EXPORT QgsProcessingParameterFeatureSink : public QgsProcessingDestin
16321620

16331621
private:
16341622

1635-
QgsProcessingParameterDefinition::LayerType mDataType = QgsProcessingParameterDefinition::TypeVectorAny;
1623+
QgsProcessing::LayerType mDataType = QgsProcessing::TypeVectorAny;
16361624
};
16371625

16381626

@@ -1650,7 +1638,7 @@ class CORE_EXPORT QgsProcessingParameterVectorOutput : public QgsProcessingDesti
16501638
/**
16511639
* Constructor for QgsProcessingParameterVectorOutput.
16521640
*/
1653-
QgsProcessingParameterVectorOutput( const QString &name, const QString &description = QString(), QgsProcessingParameterDefinition::LayerType type = QgsProcessingParameterDefinition::TypeVectorAny, const QVariant &defaultValue = QVariant(),
1641+
QgsProcessingParameterVectorOutput( const QString &name, const QString &description = QString(), QgsProcessing::LayerType type = QgsProcessing::TypeVectorAny, const QVariant &defaultValue = QVariant(),
16541642
bool optional = false );
16551643

16561644
/**
@@ -1668,7 +1656,7 @@ class CORE_EXPORT QgsProcessingParameterVectorOutput : public QgsProcessingDesti
16681656
* Returns the layer type for layers associated with the parameter.
16691657
* \see setDataType()
16701658
*/
1671-
QgsProcessingParameterDefinition::LayerType dataType() const;
1659+
QgsProcessing::LayerType dataType() const;
16721660

16731661
/**
16741662
* Returns true if the layer is likely to include geometries. In cases were presence of geometry
@@ -1680,7 +1668,7 @@ class CORE_EXPORT QgsProcessingParameterVectorOutput : public QgsProcessingDesti
16801668
* Sets the layer \a type for the layers associated with the parameter.
16811669
* \see dataType()
16821670
*/
1683-
void setDataType( QgsProcessingParameterDefinition::LayerType type );
1671+
void setDataType( QgsProcessing::LayerType type );
16841672

16851673
QVariantMap toVariantMap() const override;
16861674
bool fromVariantMap( const QVariantMap &map ) override;
@@ -1693,7 +1681,7 @@ class CORE_EXPORT QgsProcessingParameterVectorOutput : public QgsProcessingDesti
16931681

16941682
private:
16951683

1696-
QgsProcessingParameterDefinition::LayerType mDataType = QgsProcessingParameterDefinition::TypeVectorAny;
1684+
QgsProcessing::LayerType mDataType = QgsProcessing::TypeVectorAny;
16971685
};
16981686

16991687
/**

‎tests/src/core/testqgsprocessing.cpp‎

Lines changed: 51 additions & 51 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)
Please sign in to comment.