Skip to content

Commit f82b41e

Browse files
committed
Move an enum to new QgsProcessing class
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
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

0 commit comments

Comments
 (0)