Skip to content

Commit acae312

Browse files
alexbruynyalldawson
authored andcommittedNov 5, 2019
add missed outputs to algorithms
1 parent 88972d3 commit acae312

File tree

2 files changed

+40
-44
lines changed

2 files changed

+40
-44
lines changed
 

‎python/plugins/processing/algs/gdal/rasterize_over.py

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232
QgsProcessingParameterRasterLayer,
3333
QgsProcessingParameterNumber,
3434
QgsProcessingParameterString,
35-
QgsProcessingParameterBoolean)
35+
QgsProcessingParameterBoolean,
36+
QgsProcessingOutputRasterLayer)
3637
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
3738
from processing.algs.gdal.GdalUtils import GdalUtils
3839

@@ -46,38 +47,37 @@ class rasterize_over(GdalAlgorithm):
4647
INPUT_RASTER = 'INPUT_RASTER'
4748
ADD = 'ADD'
4849
EXTRA = 'EXTRA'
50+
OUTPUT = 'OUTPUT'
4951

5052
def __init__(self):
5153
super().__init__()
5254

5355
def initAlgorithm(self, config=None):
54-
self.units = [self.tr("Pixels"),
55-
self.tr("Georeferenced units")]
56-
5756
self.addParameter(QgsProcessingParameterFeatureSource(self.INPUT,
5857
self.tr('Input vector layer')))
59-
60-
self.addParameter(QgsProcessingParameterRasterLayer(self.INPUT_RASTER, self.tr('Input raster layer')))
61-
58+
self.addParameter(QgsProcessingParameterRasterLayer(self.INPUT_RASTER,
59+
self.tr('Input raster layer')))
6260
self.addParameter(QgsProcessingParameterField(self.FIELD,
6361
self.tr('Field to use for burn in value'),
6462
None,
6563
self.INPUT,
6664
QgsProcessingParameterField.Numeric,
6765
optional=False))
6866

69-
add_param = QgsProcessingParameterBoolean(self.ADD,
70-
self.tr('Add burn in values to existing raster values'),
71-
defaultValue=False)
72-
add_param.setFlags(add_param.flags() | QgsProcessingParameterDefinition.FlagAdvanced)
73-
self.addParameter(add_param)
74-
75-
extra_param = QgsProcessingParameterString(self.EXTRA,
67+
params = []
68+
params.append(QgsProcessingParameterBoolean(self.ADD,
69+
self.tr('Add burn in values to existing raster values'),
70+
defaultValue=False))
71+
params.append(QgsProcessingParameterString(self.EXTRA,
7672
self.tr('Additional command-line parameters'),
7773
defaultValue=None,
78-
optional=True)
79-
extra_param.setFlags(extra_param.flags() | QgsProcessingParameterDefinition.FlagAdvanced)
80-
self.addParameter(extra_param)
74+
optional=True))
75+
for p in params:
76+
p.setFlags(p.flags() | QgsProcessingParameterDefinition.FlagAdvanced)
77+
self.addParameter(p)
78+
79+
self.addOutput(QgsProcessingOutputRasterLayer(self.OUTPUT,
80+
self.tr('Rasterized')))
8181

8282
def name(self):
8383
return 'rasterize_over'
@@ -100,12 +100,11 @@ def commandName(self):
100100
def getConsoleCommands(self, parameters, context, feedback, executing=True):
101101
ogrLayer, layerName = self.getOgrCompatibleSource(self.INPUT, parameters, context, feedback, executing)
102102
inLayer = self.parameterAsRasterLayer(parameters, self.INPUT_RASTER, context)
103+
fieldName = self.parameterAsString(parameters, self.FIELD, context)
104+
self.setOutputValue(self.OUTPUT, inLayer.source())
103105

104106
arguments = ['-l']
105107
arguments.append(layerName)
106-
107-
fieldName = self.parameterAsString(parameters, self.FIELD, context)
108-
109108
arguments.append('-a')
110109
arguments.append(fieldName)
111110

‎python/plugins/processing/algs/gdal/rasterize_over_fixed_value.py

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
"""
44
***************************************************************************
5-
rasterize_over.py
5+
rasterize_over_fixed_value.py
66
---------------------
77
Date : September 2013
88
Copyright : (C) 2013 by Alexander Bruy
@@ -32,7 +32,8 @@
3232
QgsProcessingParameterRasterLayer,
3333
QgsProcessingParameterNumber,
3434
QgsProcessingParameterString,
35-
QgsProcessingParameterBoolean)
35+
QgsProcessingParameterBoolean,
36+
QgsProcessingOutputRasterLayer)
3637
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
3738
from processing.algs.gdal.GdalUtils import GdalUtils
3839

@@ -46,37 +47,35 @@ class rasterize_over_fixed_value(GdalAlgorithm):
4647
ADD = 'ADD'
4748
EXTRA = 'EXTRA'
4849
BURN = 'BURN'
50+
OUTPUT = 'OUTPUT'
4951

5052
def __init__(self):
5153
super().__init__()
5254

5355
def initAlgorithm(self, config=None):
54-
self.units = [self.tr("Pixels"),
55-
self.tr("Georeferenced units")]
56-
5756
self.addParameter(QgsProcessingParameterFeatureSource(self.INPUT,
5857
self.tr('Input vector layer')))
59-
60-
self.addParameter(QgsProcessingParameterRasterLayer(self.INPUT_RASTER, self.tr('Input raster layer')))
61-
58+
self.addParameter(QgsProcessingParameterRasterLayer(self.INPUT_RASTER,
59+
self.tr('Input raster layer')))
6260
self.addParameter(QgsProcessingParameterNumber(self.BURN,
6361
self.tr('A fixed value to burn'),
6462
type=QgsProcessingParameterNumber.Double,
65-
defaultValue=0.0,
66-
optional=False))
67-
68-
add_param = QgsProcessingParameterBoolean(self.ADD,
69-
self.tr('Add burn in values to existing raster values'),
70-
defaultValue=False)
71-
add_param.setFlags(add_param.flags() | QgsProcessingParameterDefinition.FlagAdvanced)
72-
self.addParameter(add_param)
63+
defaultValue=0.0))
7364

74-
extra_param = QgsProcessingParameterString(self.EXTRA,
65+
params = []
66+
params.append(QgsProcessingParameterBoolean(self.ADD,
67+
self.tr('Add burn in values to existing raster values'),
68+
defaultValue=False))
69+
params.append(QgsProcessingParameterString(self.EXTRA,
7570
self.tr('Additional command-line parameters'),
7671
defaultValue=None,
77-
optional=True)
78-
extra_param.setFlags(extra_param.flags() | QgsProcessingParameterDefinition.FlagAdvanced)
79-
self.addParameter(extra_param)
72+
optional=True))
73+
for p in params:
74+
p.setFlags(p.flags() | QgsProcessingParameterDefinition.FlagAdvanced)
75+
self.addParameter(p)
76+
77+
self.addOutput(QgsProcessingOutputRasterLayer(self.OUTPUT,
78+
self.tr('Rasterized')))
8079

8180
def name(self):
8281
return 'rasterize_over_fixed_value'
@@ -99,14 +98,12 @@ def commandName(self):
9998
def getConsoleCommands(self, parameters, context, feedback, executing=True):
10099
ogrLayer, layerName = self.getOgrCompatibleSource(self.INPUT, parameters, context, feedback, executing)
101100
inLayer = self.parameterAsRasterLayer(parameters, self.INPUT_RASTER, context)
101+
self.setOutputValue(self.OUTPUT, inLayer.source())
102102

103103
arguments = ['-l']
104104
arguments.append(layerName)
105-
106-
fieldName = self.parameterAsString(parameters, self.FIELD, context)
107-
108105
arguments.append('-burn')
109-
arguments.append(self.parameterAsDouble(parameters, self.BURN, context))
106+
arguments.append(str(self.parameterAsDouble(parameters, self.BURN, context)))
110107

111108
if self.parameterAsBool(parameters, self.ADD, context):
112109
arguments.append('-add')

0 commit comments

Comments
 (0)
Please sign in to comment.