Skip to content

Commit ebda2fd

Browse files
nyalldawsonnyalldawson
committedAug 18, 2017
Rename some enum values for clarity
·
ltr-3_40final-3_0_0
1 parent 076fdc9 commit ebda2fd

23 files changed

+127
-127
lines changed
 

‎python/core/processing/qgsprocessing.sip

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@ class QgsProcessing
2626
%End
2727
public:
2828

29-
enum LayerType
29+
enum SourceType
3030
{
31-
TypeAny,
32-
TypeVectorAny,
31+
TypeMapLayer,
32+
TypeVectorAnyGeometry,
3333
TypeVectorPoint,
3434
TypeVectorLine,
3535
TypeVectorPolygon,
3636
TypeRaster,
3737
TypeFile,
38-
TypeTable,
38+
TypeVector,
3939
};
4040

4141

‎python/core/processing/qgsprocessingalgorithm.sip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -760,11 +760,11 @@ class QgsProcessingFeatureBasedAlgorithm : QgsProcessingAlgorithm
760760
:rtype: str
761761
%End
762762

763-
virtual QgsProcessing::LayerType outputLayerType() const;
763+
virtual QgsProcessing::SourceType outputLayerType() const;
764764
%Docstring
765765
Returns the layer type for layers generated by this algorithm, if
766766
this is possible to determine in advance.
767-
:rtype: QgsProcessing.LayerType
767+
:rtype: QgsProcessing.SourceType
768768
%End
769769

770770
virtual QgsWkbTypes::Type outputWkbType( QgsWkbTypes::Type inputWkbType ) const;

‎python/core/processing/qgsprocessingoutputs.sip

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

111-
QgsProcessingOutputVectorLayer( const QString &name, const QString &description = QString(), QgsProcessing::LayerType type = QgsProcessing::TypeVectorAny );
111+
QgsProcessingOutputVectorLayer( const QString &name, const QString &description = QString(), QgsProcessing::SourceType type = QgsProcessing::TypeVectorAnyGeometry );
112112
%Docstring
113113
Constructor for QgsProcessingOutputVectorLayer.
114114
%End
@@ -120,14 +120,14 @@ class QgsProcessingOutputVectorLayer : QgsProcessingOutputDefinition
120120
%End
121121
virtual QString type() const;
122122

123-
QgsProcessing::LayerType dataType() const;
123+
QgsProcessing::SourceType dataType() const;
124124
%Docstring
125125
Returns the layer type for the output layer.
126126
.. seealso:: setDataType()
127-
:rtype: QgsProcessing.LayerType
127+
:rtype: QgsProcessing.SourceType
128128
%End
129129

130-
void setDataType( QgsProcessing::LayerType type );
130+
void setDataType( QgsProcessing::SourceType type );
131131
%Docstring
132132
Sets the layer ``type`` for the output layer.
133133
.. seealso:: dataType()

‎python/core/processing/qgsprocessingparameters.sip

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -975,7 +975,7 @@ class QgsProcessingParameterMultipleLayers : QgsProcessingParameterDefinition
975975
%End
976976
public:
977977

978-
QgsProcessingParameterMultipleLayers( const QString &name, const QString &description = QString(), QgsProcessing::LayerType layerType = QgsProcessing::TypeVectorAny,
978+
QgsProcessingParameterMultipleLayers( const QString &name, const QString &description = QString(), QgsProcessing::SourceType layerType = QgsProcessing::TypeVectorAnyGeometry,
979979
const QVariant &defaultValue = QVariant(),
980980
bool optional = false );
981981
%Docstring
@@ -997,14 +997,14 @@ class QgsProcessingParameterMultipleLayers : QgsProcessingParameterDefinition
997997
virtual QString asScriptCode() const;
998998

999999

1000-
QgsProcessing::LayerType layerType() const;
1000+
QgsProcessing::SourceType layerType() const;
10011001
%Docstring
10021002
Returns the layer type for layers acceptable by the parameter.
10031003
.. seealso:: setLayerType()
1004-
:rtype: QgsProcessing.LayerType
1004+
:rtype: QgsProcessing.SourceType
10051005
%End
10061006

1007-
void setLayerType( QgsProcessing::LayerType type );
1007+
void setLayerType( QgsProcessing::SourceType type );
10081008
%Docstring
10091009
Sets the layer ``type`` for layers acceptable by the parameter.
10101010
.. seealso:: layerType()
@@ -1733,7 +1733,7 @@ class QgsProcessingParameterFeatureSink : QgsProcessingDestinationParameter
17331733
%End
17341734
public:
17351735

1736-
QgsProcessingParameterFeatureSink( const QString &name, const QString &description = QString(), QgsProcessing::LayerType type = QgsProcessing::TypeVectorAny, const QVariant &defaultValue = QVariant(),
1736+
QgsProcessingParameterFeatureSink( const QString &name, const QString &description = QString(), QgsProcessing::SourceType type = QgsProcessing::TypeVectorAnyGeometry, const QVariant &defaultValue = QVariant(),
17371737
bool optional = false );
17381738
%Docstring
17391739
Constructor for QgsProcessingParameterFeatureSink.
@@ -1758,11 +1758,11 @@ class QgsProcessingParameterFeatureSink : QgsProcessingDestinationParameter
17581758
virtual QString defaultFileExtension() const;
17591759

17601760

1761-
QgsProcessing::LayerType dataType() const;
1761+
QgsProcessing::SourceType dataType() const;
17621762
%Docstring
17631763
Returns the layer type for sinks associated with the parameter.
17641764
.. seealso:: setDataType()
1765-
:rtype: QgsProcessing.LayerType
1765+
:rtype: QgsProcessing.SourceType
17661766
%End
17671767

17681768
bool hasGeometry() const;
@@ -1772,7 +1772,7 @@ class QgsProcessingParameterFeatureSink : QgsProcessingDestinationParameter
17721772
:rtype: bool
17731773
%End
17741774

1775-
void setDataType( QgsProcessing::LayerType type );
1775+
void setDataType( QgsProcessing::SourceType type );
17761776
%Docstring
17771777
Sets the layer ``type`` for the sinks associated with the parameter.
17781778
.. seealso:: dataType()
@@ -1812,7 +1812,7 @@ class QgsProcessingParameterVectorDestination : QgsProcessingDestinationParamete
18121812
%End
18131813
public:
18141814

1815-
QgsProcessingParameterVectorDestination( const QString &name, const QString &description = QString(), QgsProcessing::LayerType type = QgsProcessing::TypeVectorAny, const QVariant &defaultValue = QVariant(),
1815+
QgsProcessingParameterVectorDestination( const QString &name, const QString &description = QString(), QgsProcessing::SourceType type = QgsProcessing::TypeVectorAnyGeometry, const QVariant &defaultValue = QVariant(),
18161816
bool optional = false );
18171817
%Docstring
18181818
Constructor for QgsProcessingParameterVectorDestination.
@@ -1837,11 +1837,11 @@ class QgsProcessingParameterVectorDestination : QgsProcessingDestinationParamete
18371837
virtual QString defaultFileExtension() const;
18381838

18391839

1840-
QgsProcessing::LayerType dataType() const;
1840+
QgsProcessing::SourceType dataType() const;
18411841
%Docstring
18421842
Returns the layer type for this created vector layer.
18431843
.. seealso:: setDataType()
1844-
:rtype: QgsProcessing.LayerType
1844+
:rtype: QgsProcessing.SourceType
18451845
%End
18461846

18471847
bool hasGeometry() const;
@@ -1851,7 +1851,7 @@ class QgsProcessingParameterVectorDestination : QgsProcessingDestinationParamete
18511851
:rtype: bool
18521852
%End
18531853

1854-
void setDataType( QgsProcessing::LayerType type );
1854+
void setDataType( QgsProcessing::SourceType type );
18551855
%Docstring
18561856
Sets the layer ``type`` for the created vector layer.
18571857
.. seealso:: dataType()

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,13 @@ def initAlgorithm(self, config=None):
8181
self.addParameter(QgsProcessingParameterEnum(self.METHOD,
8282
self.tr('Method'), self.methods))
8383

84-
self.addParameter(QgsProcessingParameterFeatureSink(self.VALID_OUTPUT, self.tr('Valid output'), QgsProcessing.TypeVectorAny, '', True))
84+
self.addParameter(QgsProcessingParameterFeatureSink(self.VALID_OUTPUT, self.tr('Valid output'), QgsProcessing.TypeVectorAnyGeometry, '', True))
8585
self.addOutput(QgsProcessingOutputNumber(self.VALID_COUNT, self.tr('Count of valid features')))
8686

87-
self.addParameter(QgsProcessingParameterFeatureSink(self.INVALID_OUTPUT, self.tr('Invalid output'), QgsProcessing.TypeVectorAny, '', True))
87+
self.addParameter(QgsProcessingParameterFeatureSink(self.INVALID_OUTPUT, self.tr('Invalid output'), QgsProcessing.TypeVectorAnyGeometry, '', True))
8888
self.addOutput(QgsProcessingOutputNumber(self.INVALID_COUNT, self.tr('Count of invalid features')))
8989

90-
self.addParameter(QgsProcessingParameterFeatureSink(self.ERROR_OUTPUT, self.tr('Error output'), QgsProcessing.TypeVectorAny, '', True))
90+
self.addParameter(QgsProcessingParameterFeatureSink(self.ERROR_OUTPUT, self.tr('Error output'), QgsProcessing.TypeVectorAnyGeometry, '', True))
9191
self.addOutput(QgsProcessingOutputNumber(self.ERROR_COUNT, self.tr('Count of errors')))
9292

9393
def name(self):

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def __init__(self):
5656
def initAlgorithm(self, config=None):
5757
self.addParameter(QgsProcessingParameterMultipleLayers(self.INPUT,
5858
self.tr('Input datasources'),
59-
QgsProcessing.TypeTable))
59+
QgsProcessing.TypeVector))
6060
self.addParameter(QgsProcessingParameterBoolean(self.UNIONED,
6161
self.tr('Create "unioned" VRT'),
6262
defaultValue=False))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def __init__(self):
5454

5555
def initAlgorithm(self, config=None):
5656
self.addParameter(QgsProcessingParameterFeatureSource(self.INPUT,
57-
self.tr('Input layer'), [QgsProcessing.TypeVectorAny]))
57+
self.tr('Input layer'), [QgsProcessing.TypeVectorAnyGeometry]))
5858
self.addParameter(QgsProcessingParameterString(self.NODES,
5959
self.tr('Node indices'), defaultValue='0'))
6060

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def __init__(self):
6060
def initAlgorithm(self, config=None):
6161
self.addParameter(QgsProcessingParameterMultipleLayers(self.LAYERS,
6262
self.tr('Layers to merge'),
63-
QgsProcessing.TypeVectorAny))
63+
QgsProcessing.TypeVectorAnyGeometry))
6464

6565
self.addParameter(QgsProcessingParameterFeatureSink(self.OUTPUT, self.tr('Merged')))
6666

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def __init__(self):
5656

5757
def initAlgorithm(self, config=None):
5858
self.addParameter(QgsProcessingParameterFeatureSource(self.INPUT,
59-
self.tr('Input layer'), [QgsProcessing.TypeVectorAny]))
59+
self.tr('Input layer'), [QgsProcessing.TypeVectorAnyGeometry]))
6060
self.addParameter(QgsProcessingParameterBoolean(self.BY_FEATURE,
6161
self.tr('Calculate bounds for each feature separately'), defaultValue=True))
6262

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def __init__(self):
6464
super().__init__()
6565

6666
def initAlgorithm(self, config=None):
67-
self.addParameter(QgsProcessingParameterFeatureSource(self.INPUT, self.tr('Input layer'), types=[QgsProcessing.TypeTable]))
67+
self.addParameter(QgsProcessingParameterFeatureSource(self.INPUT, self.tr('Input layer'), types=[QgsProcessing.TypeVector]))
6868

6969
self.addParameter(QgsProcessingParameterField(self.XFIELD,
7070
self.tr('X field'), parentLayerParameterName=self.INPUT, type=QgsProcessingParameterField.Any))

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,13 @@ def showLayerSelectionDialog(self):
109109
elif isinstance(self.param, QgsProcessingParameterVectorLayer):
110110
layers = QgsProcessingUtils.compatibleVectorLayers(QgsProject.instance())
111111
else:
112-
datatypes = [QgsProcessing.TypeVectorAny]
112+
datatypes = [QgsProcessing.TypeVectorAnyGeometry]
113113
if isinstance(self.param, QgsProcessingParameterFeatureSource):
114114
datatypes = self.param.dataTypes()
115115
elif isinstance(self.param, QgsProcessingParameterMultipleLayers):
116116
datatypes = [self.param.layerType()]
117117

118-
if QgsProcessing.TypeVectorAny not in datatypes:
118+
if QgsProcessing.TypeVectorAnyGeometry not in datatypes:
119119
layers = QgsProcessingUtils.compatibleVectorLayers(QgsProject.instance(), datatypes)
120120
else:
121121
layers = QgsProcessingUtils.compatibleVectorLayers(QgsProject.instance())

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ def createTest(text):
184184

185185
# Handle datatype detection
186186
dataType = param.layerType()
187-
if dataType in [QgsProcessing.TypeVectorAny, QgsProcessing.TypeVectorPoint, QgsProcessing.TypeVectorLine, QgsProcessing.TypeVectorPolygon, QgsProcessing.TypeTable]:
187+
if dataType in [QgsProcessing.TypeVectorAnyGeometry, QgsProcessing.TypeVectorPoint, QgsProcessing.TypeVectorLine, QgsProcessing.TypeVectorPolygon, QgsProcessing.TypeVector]:
188188
dataType = 'vector'
189189
else:
190190
dataType = 'raster'

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -524,20 +524,20 @@ def value(self):
524524
class MultipleInputWidgetWrapper(WidgetWrapper):
525525

526526
def _getOptions(self):
527-
if self.param.layerType() == QgsProcessing.TypeVectorAny:
527+
if self.param.layerType() == QgsProcessing.TypeVectorAnyGeometry:
528528
options = self.dialog.getAvailableValuesOfType((QgsProcessingParameterFeatureSource, QgsProcessingParameterVectorLayer, QgsProcessingParameterMultipleLayers), QgsProcessingOutputVectorLayer)
529529
elif self.param.layerType() == QgsProcessing.TypeVectorPoint:
530530
options = self.dialog.getAvailableValuesOfType((QgsProcessingParameterFeatureSource, QgsProcessingParameterVectorLayer, QgsProcessingParameterMultipleLayers), QgsProcessingOutputVectorLayer,
531-
[QgsProcessing.TypeVectorPoint, QgsProcessing.TypeVectorAny])
531+
[QgsProcessing.TypeVectorPoint, QgsProcessing.TypeVectorAnyGeometry])
532532
elif self.param.layerType() == QgsProcessing.TypeVectorLine:
533533
options = self.dialog.getAvailableValuesOfType((QgsProcessingParameterFeatureSource, QgsProcessingParameterVectorLayer, QgsProcessingParameterMultipleLayers), QgsProcessingOutputVectorLayer,
534-
[QgsProcessing.TypeVectorLine, QgsProcessing.TypeVectorAny])
534+
[QgsProcessing.TypeVectorLine, QgsProcessing.TypeVectorAnyGeometry])
535535
elif self.param.layerType() == QgsProcessing.TypeVectorPolygon:
536536
options = self.dialog.getAvailableValuesOfType((QgsProcessingParameterFeatureSource, QgsProcessingParameterVectorLayer, QgsProcessingParameterMultipleLayers), QgsProcessingOutputVectorLayer,
537-
[QgsProcessing.TypeVectorPolygon, QgsProcessing.TypeVectorAny])
537+
[QgsProcessing.TypeVectorPolygon, QgsProcessing.TypeVectorAnyGeometry])
538538
elif self.param.layerType() == QgsProcessing.TypeRaster:
539539
options = self.dialog.getAvailableValuesOfType((QgsProcessingParameterRasterLayer, QgsProcessingParameterMultipleLayers), QgsProcessingOutputRasterLayer)
540-
elif self.param.layerType() == QgsProcessing.TypeTable:
540+
elif self.param.layerType() == QgsProcessing.TypeVector:
541541
options = self.dialog.getAvailableValuesOfType((QgsProcessingParameterFeatureSource, QgsProcessingParameterVectorLayer, QgsProcessingParameterMultipleLayers), OutputTable)
542542
else:
543543
options = self.dialog.getAvailableValuesOfType(QgsProcessingParameterFile, OutputFile)
@@ -551,7 +551,7 @@ def createWidget(self):
551551
else:
552552
if self.param.layerType() == QgsProcessing.TypeRaster:
553553
options = QgsProcessingUtils.compatibleRasterLayers(QgsProject.instance(), False)
554-
elif self.param.layerType() in (QgsProcessing.TypeVectorAny, QgsProcessing.TypeTable):
554+
elif self.param.layerType() in (QgsProcessing.TypeVectorAnyGeometry, QgsProcessing.TypeVector):
555555
options = QgsProcessingUtils.compatibleVectorLayers(QgsProject.instance(), [], False)
556556
else:
557557
options = QgsProcessingUtils.compatibleVectorLayers(QgsProject.instance(), [self.param.layerType()], False)
@@ -569,7 +569,7 @@ def refresh(self):
569569
if self.param.layerType() != QgsProcessing.TypeFile:
570570
if self.param.layerType() == QgsProcessing.TypeRaster:
571571
options = QgsProcessingUtils.compatibleRasterLayers(QgsProject.instance(), False)
572-
elif self.param.layerType() in (QgsProcessing.TypeVectorAny, QgsProcessing.TypeTable):
572+
elif self.param.layerType() in (QgsProcessing.TypeVectorAnyGeometry, QgsProcessing.TypeVector):
573573
options = QgsProcessingUtils.compatibleVectorLayers(QgsProject.instance(), [], False)
574574
else:
575575
options = QgsProcessingUtils.compatibleVectorLayers(QgsProject.instance(), [self.param.layerType()], False)
@@ -605,7 +605,7 @@ def value(self):
605605
else:
606606
if self.param.layerType() == QgsProcessing.TypeRaster:
607607
options = QgsProcessingUtils.compatibleRasterLayers(QgsProject.instance(), False)
608-
elif self.param.layerType() in (QgsProcessing.TypeVectorAny, QgsProcessing.TypeTable):
608+
elif self.param.layerType() in (QgsProcessing.TypeVectorAnyGeometry, QgsProcessing.TypeVector):
609609
options = QgsProcessingUtils.compatibleVectorLayers(QgsProject.instance(), [], False)
610610
else:
611611
options = QgsProcessingUtils.compatibleVectorLayers(QgsProject.instance(), [self.param.layerType()], False)
@@ -827,7 +827,7 @@ def createWidget(self):
827827
widget.setLayout(vl)
828828

829829
filters = QgsMapLayerProxyModel.Filters()
830-
if QgsProcessing.TypeVectorAny in self.param.dataTypes() or len(self.param.dataTypes()) == 0:
830+
if QgsProcessing.TypeVectorAnyGeometry in self.param.dataTypes() or len(self.param.dataTypes()) == 0:
831831
filters = QgsMapLayerProxyModel.HasGeometry
832832
if QgsProcessing.TypeVectorPoint in self.param.dataTypes():
833833
filters |= QgsMapLayerProxyModel.PointLayer
@@ -1107,7 +1107,7 @@ def createWidget(self):
11071107
self.combo.setAllowEmptyLayer(True)
11081108

11091109
filters = QgsMapLayerProxyModel.Filters()
1110-
if QgsProcessing.TypeVectorAny in self.param.dataTypes() or len(self.param.dataTypes()) == 0:
1110+
if QgsProcessing.TypeVectorAnyGeometry in self.param.dataTypes() or len(self.param.dataTypes()) == 0:
11111111
filters = QgsMapLayerProxyModel.VectorLayer
11121112
if QgsProcessing.TypeVectorPoint in self.param.dataTypes():
11131113
filters |= QgsMapLayerProxyModel.PointLayer

‎src/core/processing/models/qgsprocessingmodelalgorithm.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ QgsProcessingModelChildParameterSources QgsProcessingModelAlgorithm::availableSo
596596
bool ok = !sourceDef->dataTypes().isEmpty();
597597
Q_FOREACH ( int type, sourceDef->dataTypes() )
598598
{
599-
if ( dataTypes.contains( type ) || type == QgsProcessing::TypeAny )
599+
if ( dataTypes.contains( type ) || type == QgsProcessing::TypeMapLayer )
600600
{
601601
ok = true;
602602
break;
@@ -636,7 +636,7 @@ QgsProcessingModelChildParameterSources QgsProcessingModelAlgorithm::availableSo
636636
if ( out->type() == QgsProcessingOutputVectorLayer::typeName() )
637637
{
638638
const QgsProcessingOutputVectorLayer *vectorOut = static_cast< const QgsProcessingOutputVectorLayer *>( out );
639-
if ( !( dataTypes.contains( vectorOut->dataType() ) || vectorOut->dataType() == QgsProcessing::TypeAny ) )
639+
if ( !( dataTypes.contains( vectorOut->dataType() ) || vectorOut->dataType() == QgsProcessing::TypeMapLayer ) )
640640
{
641641
continue;
642642
}

0 commit comments

Comments
 (0)
Please sign in to comment.