Skip to content

Commit d92583c

Browse files
nyalldawsonnyalldawson
committed
Take advantage of auto created outputs in ported algorithms
1 parent 058271b commit d92583c

31 files changed

+39
-175
lines changed

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,12 @@
2727

2828
from qgis.PyQt.QtCore import QVariant
2929
from qgis.core import (QgsField,
30-
QgsFeature,
3130
QgsFeatureSink,
32-
QgsApplication,
33-
QgsProcessingUtils,
3431
QgsProcessingParameterFeatureSource,
3532
QgsProcessingParameterString,
3633
QgsProcessingParameterNumber,
3734
QgsProcessingParameterEnum,
38-
QgsProcessingParameterFeatureSink,
39-
QgsProcessingOutputVectorLayer)
35+
QgsProcessingParameterFeatureSink)
4036
from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm
4137

4238

@@ -73,7 +69,6 @@ def initAlgorithm(self, config=None):
7369
self.addParameter(QgsProcessingParameterNumber(self.FIELD_PRECISION,
7470
self.tr('Field precision'), QgsProcessingParameterNumber.Integer, 0, False, 0, 10))
7571
self.addParameter(QgsProcessingParameterFeatureSink(self.OUTPUT_LAYER, self.tr('Added')))
76-
self.addOutput(QgsProcessingOutputVectorLayer(self.OUTPUT_LAYER, self.tr('Added')))
7772

7873
def name(self):
7974
return 'addfieldtoattributestable'

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ def initAlgorithm(self, config=None):
6767
self.tr('Z factor'), QgsProcessingParameterNumber.Double,
6868
1, False, 1, 999999.99))
6969
self.addParameter(QgsProcessingParameterRasterDestination(self.OUTPUT, self.tr('Aspect')))
70-
self.addOutput(QgsProcessingOutputRasterLayer(self.OUTPUT, self.tr('Aspect')))
7170

7271
def name(self):
7372
return 'aspect'

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,9 @@
2727

2828
from qgis.PyQt.QtCore import QVariant
2929
from qgis.core import (QgsField,
30-
QgsFeature,
3130
QgsFeatureSink,
32-
QgsApplication,
33-
QgsProcessingUtils,
3431
QgsProcessingParameterFeatureSource,
35-
QgsProcessingParameterFeatureSink,
36-
QgsProcessingOutputVectorLayer)
32+
QgsProcessingParameterFeatureSink)
3733
from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm
3834

3935

@@ -50,7 +46,6 @@ def initAlgorithm(self, config=None):
5046
self.tr('Input layer')))
5147

5248
self.addParameter(QgsProcessingParameterFeatureSink(self.OUTPUT, self.tr('Incremented')))
53-
self.addOutput(QgsProcessingOutputVectorLayer(self.OUTPUT, self.tr('Incremented')))
5449

5550
def group(self):
5651
return self.tr('Vector table tools')

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,13 @@
3131
QgsWkbTypes,
3232
QgsFeatureSink,
3333
QgsProcessing,
34-
QgsProcessingUtils,
35-
QgsProcessingParameterDefinition,
3634
QgsProcessingParameterFeatureSource,
37-
QgsProcessingParameterFeatureSink,
38-
QgsProcessingOutputVectorLayer)
35+
QgsProcessingParameterFeatureSink)
3936

4037
from qgis.PyQt.QtGui import QIcon
4138

4239
from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm
4340
from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
44-
from processing.core.parameters import ParameterVector
45-
from processing.core.outputs import OutputVector
46-
from processing.tools import dataobjects
4741

4842
pluginPath = os.path.split(os.path.split(os.path.dirname(__file__))[0])[0]
4943

@@ -59,7 +53,6 @@ def __init__(self):
5953
def initAlgorithm(self, config=None):
6054
self.addParameter(QgsProcessingParameterFeatureSource(self.INPUT_LAYER, self.tr('Input layer'), [QgsProcessing.TypeVectorLine, QgsProcessing.TypeVectorPolygon]))
6155
self.addParameter(QgsProcessingParameterFeatureSink(self.OUTPUT_LAYER, self.tr('Boundary')))
62-
self.addOutput(QgsProcessingOutputVectorLayer(self.OUTPUT_LAYER, self.tr("Boundaries")))
6356

6457
def icon(self):
6558
return QIcon(os.path.join(pluginPath, 'images', 'ftools', 'convex_hull.png'))

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,14 @@
3131
QgsWkbTypes,
3232
QgsFeatureSink,
3333
QgsProcessing,
34-
QgsProcessingUtils,
3534
QgsProcessingParameterFeatureSource,
36-
QgsProcessingParameterFeatureSink,
37-
QgsProcessingOutputVectorLayer,
38-
QgsProcessingParameterDefinition)
35+
QgsProcessingParameterFeatureSink)
3936

4037

4138
from qgis.PyQt.QtGui import QIcon
4239

4340
from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm
4441
from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
45-
from processing.core.parameters import ParameterVector
46-
from processing.core.outputs import OutputVector
47-
from processing.tools import dataobjects
4842

4943
pluginPath = os.path.split(os.path.split(os.path.dirname(__file__))[0])[0]
5044

@@ -66,7 +60,6 @@ def __init__(self):
6660
def initAlgorithm(self, config=None):
6761
self.addParameter(QgsProcessingParameterFeatureSource(self.INPUT_LAYER, self.tr('Input layer')))
6862
self.addParameter(QgsProcessingParameterFeatureSink(self.OUTPUT_LAYER, self.tr('Bounds'), QgsProcessing.TypeVectorPolygon))
69-
self.addOutput(QgsProcessingOutputVectorLayer(self.OUTPUT_LAYER, self.tr("Bounds")))
7063

7164
def name(self):
7265
return 'boundingboxes'

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,12 @@
3737
QgsFeatureRequest,
3838
QgsFeatureSink,
3939
QgsWkbTypes,
40-
QgsProcessingUtils,
4140
QgsFields,
4241
QgsProcessing,
4342
QgsProcessingFeatureSource,
4443
QgsProcessingParameterFeatureSource,
4544
QgsProcessingParameterEnum,
4645
QgsProcessingParameterFeatureSink,
47-
QgsProcessingOutputVectorLayer,
48-
QgsProcessingParameterDefinition,
4946
QgsProcessingOutputNumber
5047
)
5148
from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm
@@ -85,15 +82,12 @@ def initAlgorithm(self, config=None):
8582
self.tr('Method'), self.methods))
8683

8784
self.addParameter(QgsProcessingParameterFeatureSink(self.VALID_OUTPUT, self.tr('Valid output'), QgsProcessing.TypeVectorAny, '', True))
88-
self.addOutput(QgsProcessingOutputVectorLayer(self.VALID_OUTPUT, self.tr('Valid output')))
8985
self.addOutput(QgsProcessingOutputNumber(self.VALID_COUNT, self.tr('Count of valid features')))
9086

9187
self.addParameter(QgsProcessingParameterFeatureSink(self.INVALID_OUTPUT, self.tr('Invalid output'), QgsProcessing.TypeVectorAny, '', True))
92-
self.addOutput(QgsProcessingOutputVectorLayer(self.INVALID_OUTPUT, self.tr('Invalid output')))
9388
self.addOutput(QgsProcessingOutputNumber(self.INVALID_COUNT, self.tr('Count of invalid features')))
9489

9590
self.addParameter(QgsProcessingParameterFeatureSink(self.ERROR_OUTPUT, self.tr('Error output'), QgsProcessing.TypeVectorAny, '', True))
96-
self.addOutput(QgsProcessingOutputVectorLayer(self.ERROR_OUTPUT, self.tr('Error output')))
9791
self.addOutput(QgsProcessingOutputNumber(self.ERROR_COUNT, self.tr('Count of errors')))
9892

9993
def name(self):

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,11 @@
3131
QgsGeometry,
3232
QgsFeatureSink,
3333
QgsWkbTypes,
34-
QgsApplication,
3534
QgsProcessing,
36-
QgsProcessingUtils,
3735
QgsProcessingParameterFeatureSource,
38-
QgsProcessingParameterVectorLayer,
39-
QgsProcessingParameterDefinition,
4036
QgsProcessingParameterNumber,
4137
QgsProcessingParameterBoolean,
42-
QgsProcessingParameterFeatureSink,
43-
QgsProcessingOutputVectorLayer)
38+
QgsProcessingParameterFeatureSink)
4439
from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm
4540
from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
4641
import processing
@@ -73,7 +68,6 @@ def initAlgorithm(self, config=None):
7368
self.tr('Split multipart geometry into singleparts geometries'), defaultValue=False))
7469

7570
self.addParameter(QgsProcessingParameterFeatureSink(self.OUTPUT, self.tr('Concave hull'), type=QgsProcessing.TypeVectorPolygon))
76-
self.addOutput(QgsProcessingOutputVectorLayer(self.OUTPUT, self.tr("Concave hull"), type=QgsProcessing.TypeVectorPolygon))
7771

7872
def name(self):
7973
return 'concavehull'

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727

2828
from qgis.core import (QgsVectorDataProvider,
2929
QgsFields,
30-
QgsApplication,
3130
QgsProcessingParameterVectorLayer,
3231
QgsProcessingParameterField,
3332
QgsProcessingParameterDefinition,

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,9 @@
3939
QgsPointXY,
4040
QgsWkbTypes,
4141
QgsProcessing,
42-
QgsProcessingUtils,
4342
QgsFields,
44-
QgsProcessingParameterFeatureSource,
45-
QgsProcessingParameterDefinition,
46-
QgsProcessingParameterFeatureSink,
47-
QgsProcessingOutputVectorLayer)
43+
QgsProcessingParameterFeatureSource
44+
QgsProcessingParameterFeatureSink)
4845

4946
from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm
5047
from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
@@ -71,7 +68,6 @@ def __init__(self):
7168
def initAlgorithm(self, config=None):
7269
self.addParameter(QgsProcessingParameterFeatureSource(self.INPUT, self.tr('Input layer'), [QgsProcessing.TypeVectorPoint]))
7370
self.addParameter(QgsProcessingParameterFeatureSink(self.OUTPUT, self.tr('Delaunay triangulation'), type=QgsProcessing.TypeVectorPolygon))
74-
self.addOutput(QgsProcessingOutputVectorLayer(self.OUTPUT, self.tr("Delaunay triangulation"), type=QgsProcessing.TypeVectorPolygon))
7571

7672
def name(self):
7773
return 'delaunaytriangulation'

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,10 @@
2525

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

28-
from qgis.core import (QgsApplication,
29-
QgsFeatureSink,
30-
QgsProcessingUtils,
28+
from qgis.core import (QgsFeatureSink,
3129
QgsProcessingParameterFeatureSource,
3230
QgsProcessingParameterFeatureSink,
33-
QgsProcessingParameterField,
34-
QgsProcessingOutputVectorLayer)
31+
QgsProcessingParameterField)
3532
from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm
3633

3734

@@ -57,7 +54,6 @@ def initAlgorithm(self, config=None):
5754
None, self.INPUT, QgsProcessingParameterField.Any, True))
5855

5956
self.addParameter(QgsProcessingParameterFeatureSink(self.OUTPUT, self.tr('Output layer')))
60-
self.addOutput(QgsProcessingOutputVectorLayer(self.OUTPUT, self.tr("Output layer")))
6157

6258
def name(self):
6359
return 'deletecolumn'

0 commit comments

Comments
 (0)