Skip to content

Commit 87fc31d

Browse files
nyalldawsonnyalldawson
committedJun 5, 2017
Adapt more python code to new API
1 parent 28f7a8b commit 87fc31d

File tree

16 files changed

+48
-46
lines changed

16 files changed

+48
-46
lines changed
 

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,11 @@ def shortHelpString(self):
9595
'''.format(self.commandName(), url)
9696

9797
def commandName(self):
98+
parameters = {}
9899
for output in self.outputs:
99100
output.setValue("dummy")
100-
for param in self.parameters:
101-
param.setValue("1")
101+
for param in self.parameterDefinitions():
102+
parameters[param.name()] = "1"
102103
name = self.getConsoleCommands(parameters)[0]
103104
if name.endswith(".py"):
104105
name = name[:-3]

‎python/plugins/processing/algs/grass7/Grass7Algorithm.py

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,11 @@ def getParameterDescriptions(self):
132132
lines = infile.readlines()
133133
for i in range(len(lines)):
134134
if lines[i].startswith('<DT><b>'):
135-
for param in self.parameters:
136-
searchLine = '<b>' + param.name + '</b>'
135+
for param in self.parameterDefinitions():
136+
searchLine = '<b>' + param.name() + '</b>'
137137
if searchLine in lines[i]:
138138
i += 1
139-
descs[param.name] = (lines[i])[4:-6]
139+
descs[param.name()] = (lines[i])[4:-6]
140140
break
141141

142142
except Exception:
@@ -217,22 +217,22 @@ def defineCharacteristicsFromFile(self):
217217
param.setFlags(param.flags() | QgsProcessingParameterDefinition.FlagAdvanced)
218218
self.addParameter(param)
219219

220-
def getDefaultCellsize(self):
221-
context = dataobjects.createContext()
220+
def getDefaultCellsize(self, parameters, context):
222221
cellsize = 0
223-
for param in self.parameters:
224-
if param.value:
222+
for param in self.parameterDefinitions():
223+
if param.name() in parameters:
224+
value = parameters[param.name()]
225225
if isinstance(param, ParameterRaster):
226-
if isinstance(param.value, QgsRasterLayer):
227-
layer = param.value
226+
if isinstance(value, QgsRasterLayer):
227+
layer = value
228228
else:
229229
layer = QgsProcessingUtils.mapLayerFromString(param.value, context)
230230
cellsize = max(cellsize, (layer.extent().xMaximum() -
231231
layer.extent().xMinimum()) /
232232
layer.width())
233233
elif isinstance(param, ParameterMultipleInput):
234234

235-
layers = param.value.split(';')
235+
layers = value.split(';')
236236
for layername in layers:
237237
layer = QgsProcessingUtils.mapLayerFromString(layername, context)
238238
if isinstance(layer, QgsRasterLayer):
@@ -274,7 +274,7 @@ def processAlgorithm(self, parameters, context, feedback):
274274
func = getattr(self.module, 'processInputs')
275275
func(self)
276276
else:
277-
self.processInputs()
277+
self.processInputs(parameters,context)
278278

279279
if hasattr(self.module, 'processCommand'):
280280
func = getattr(self.module, 'processCommand')
@@ -288,7 +288,7 @@ def processAlgorithm(self, parameters, context, feedback):
288288
else:
289289
self.processOutputs()
290290
else:
291-
self.processInputs()
291+
self.processInputs(parameters,context)
292292
self.processCommand()
293293
self.processOutputs()
294294

@@ -317,13 +317,13 @@ def processAlgorithm(self, parameters, context, feedback):
317317
else:
318318
Grass7Utils.endGrass7Session()
319319

320-
def processInputs(self):
320+
def processInputs(self, parameters, context):
321321
"""Prepare the GRASS import commands"""
322-
for param in self.parameters:
322+
for param in self.parameterDefinitions():
323323
if isinstance(param, ParameterRaster):
324-
if param.value is None:
324+
if not param.name() in parameters():
325325
continue
326-
value = param.value
326+
value = parameters[param.name()]
327327

328328
# Check if the layer hasn't already been exported in, for
329329
# example, previous GRASS calls in this session
@@ -333,9 +333,9 @@ def processInputs(self):
333333
self.setSessionProjectionFromLayer(value, self.commands)
334334
self.commands.append(self.exportRasterLayer(value))
335335
if isinstance(param, ParameterVector):
336-
if param.value is None:
336+
if not param.name() in parameters():
337337
continue
338-
value = param.value
338+
value = parameters[param.name()]
339339
if value in list(self.exportedLayers.keys()):
340340
continue
341341
else:
@@ -344,9 +344,10 @@ def processInputs(self):
344344
if isinstance(param, ParameterTable):
345345
pass
346346
if isinstance(param, ParameterMultipleInput):
347-
if param.value is None:
347+
if not param.name() in parameters():
348348
continue
349-
layers = param.value.split(';')
349+
value = parameters[param.name()]
350+
layers = value.split(';')
350351
if layers is None or len(layers) == 0:
351352
continue
352353
if param.datatype == dataobjects.TYPE_RASTER:
@@ -384,7 +385,7 @@ def processInputs(self):
384385
if cellsize:
385386
command += ' res=' + str(cellsize)
386387
else:
387-
command += ' res=' + str(self.getDefaultCellsize())
388+
command += ' res=' + str(self.getDefaultCellsize(parameters, context))
388389
alignToResolution = \
389390
self.getParameterValue(self.GRASS_REGION_ALIGN_TO_RESOLUTION)
390391
if alignToResolution:

‎python/plugins/processing/algs/grass7/ext/i.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def orderedInput(alg, inputParameter, targetParameterDef, numSeq=None):
9393
if cellsize:
9494
command += ' res=' + str(cellsize)
9595
else:
96-
command += ' res=' + str(alg.getDefaultCellsize())
96+
command += ' res=' + str(alg.getDefaultCellsize(parameters, context))
9797
alignToResolution = \
9898
alg.getParameterValue(alg.GRASS_REGION_ALIGN_TO_RESOLUTION)
9999
if alignToResolution:

‎python/plugins/processing/algs/grass7/ext/r_blend_combine.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def processInputs(alg):
5757
if cellsize:
5858
command += ' res=' + str(cellsize)
5959
else:
60-
command += ' res=' + str(alg.getDefaultCellsize())
60+
command += ' res=' + str(alg.getDefaultCellsize(parameters, context))
6161
alignToResolution = alg.getParameterValue(alg.GRASS_REGION_ALIGN_TO_RESOLUTION)
6262
if alignToResolution:
6363
command += ' -a'

‎python/plugins/processing/algs/grass7/ext/r_blend_rgb.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ def processInputs(alg):
5959
if cellsize:
6060
command += ' res=' + str(cellsize)
6161
else:
62-
command += ' res=' + str(alg.getDefaultCellsize())
62+
command += ' res=' + str(alg.getDefaultCellsize(parameters, context))
6363
alignToResolution = alg.getParameterValue(alg.GRASS_REGION_ALIGN_TO_RESOLUTION)
6464
if alignToResolution:
6565
command += ' -a'

‎python/plugins/processing/algs/grass7/ext/r_category.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,13 @@ def processInputs(alg):
7575
if cellsize:
7676
command += ' res=' + str(cellsize)
7777
else:
78-
command += ' res=' + str(alg.getDefaultCellsize())
78+
command += ' res=' + str(alg.getDefaultCellsize(parameters, context))
7979
alignToResolution = alg.getParameterValue(alg.GRASS_REGION_ALIGN_TO_RESOLUTION)
8080
if alignToResolution:
8181
command += ' -a'
8282
alg.commands.append(command)
8383
else:
84-
alg.processInputs()
84+
alg.processInputs(context, parameters)
8585

8686

8787
def processCommand(alg, parameters):

‎python/plugins/processing/algs/grass7/ext/r_colors.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def processInputs(alg):
6565
if cellsize:
6666
command += ' res=' + str(cellsize)
6767
else:
68-
command += ' res=' + str(alg.getDefaultCellsize())
68+
command += ' res=' + str(alg.getDefaultCellsize(parameters, context))
6969
alignToResolution = alg.getParameterValue(alg.GRASS_REGION_ALIGN_TO_RESOLUTION)
7070
if alignToResolution:
7171
command += ' -a'

‎python/plugins/processing/algs/grass7/ext/r_colors_stddev.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def processInputs(alg):
5353
if cellsize:
5454
command += ' res=' + str(cellsize)
5555
else:
56-
command += ' res=' + str(alg.getDefaultCellsize())
56+
command += ' res=' + str(alg.getDefaultCellsize(parameters, context))
5757
alignToResolution = alg.getParameterValue(alg.GRASS_REGION_ALIGN_TO_RESOLUTION)
5858
if alignToResolution:
5959
command += ' -a'

‎python/plugins/processing/algs/grass7/ext/r_mapcalc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def processInputs(alg):
6767
if cellsize:
6868
command += ' res=' + str(cellsize)
6969
else:
70-
command += ' res=' + str(alg.getDefaultCellsize())
70+
command += ' res=' + str(alg.getDefaultCellsize(parameters,context))
7171
alignToResolution = alg.getParameterValue(alg.GRASS_REGION_ALIGN_TO_RESOLUTION)
7272
if alignToResolution:
7373
command += ' -a'

‎python/plugins/processing/algs/grass7/ext/r_null.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def processInputs(alg):
6262
if cellsize:
6363
command += ' res=' + str(cellsize)
6464
else:
65-
command += ' res=' + str(alg.getDefaultCellsize())
65+
command += ' res=' + str(alg.getDefaultCellsize(parameters,context))
6666
alignToResolution = alg.getParameterValue(alg.GRASS_REGION_ALIGN_TO_RESOLUTION)
6767
if alignToResolution:
6868
command += ' -a'

‎python/plugins/processing/algs/grass7/ext/r_rgb.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def processInputs(alg):
5555
if cellsize:
5656
command += ' res=' + str(cellsize)
5757
else:
58-
command += ' res=' + str(alg.getDefaultCellsize())
58+
command += ' res=' + str(alg.getDefaultCellsize(parameters,context))
5959
alignToResolution = alg.getParameterValue(alg.GRASS_REGION_ALIGN_TO_RESOLUTION)
6060
if alignToResolution:
6161
command += ' -a'

‎python/plugins/processing/algs/grass7/ext/r_shade.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def processInputs(alg):
6363
if cellsize:
6464
command += ' res=' + str(cellsize)
6565
else:
66-
command += ' res=' + str(alg.getDefaultCellsize())
66+
command += ' res=' + str(alg.getDefaultCellsize(parameters,context))
6767
alignToResolution = alg.getParameterValue(alg.GRASS_REGION_ALIGN_TO_RESOLUTION)
6868
if alignToResolution:
6969
command += ' -a'

‎python/plugins/processing/algs/grass7/ext/r_what_color.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def processInputs(alg):
5353
if cellsize:
5454
command += ' res=' + str(cellsize)
5555
else:
56-
command += ' res=' + str(alg.getDefaultCellsize())
56+
command += ' res=' + str(alg.getDefaultCellsize(parameters,context))
5757
alignToResolution = alg.getParameterValue(alg.GRASS_REGION_ALIGN_TO_RESOLUTION)
5858
if alignToResolution:
5959
command += ' -a'

‎python/plugins/processing/algs/grass7/ext/v_lrs_segment.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def processInputs(alg):
4545
alg.exportedLayers[rstable]
4646
)
4747
alg.commands.append(command)
48-
alg.processInputs()
48+
alg.processInputs(context,parameters)
4949

5050

5151
def processCommand(alg, parameters):

‎python/plugins/processing/algs/grass7/ext/v_lrs_where.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def processInputs(alg):
3737
alg.exportedLayers[rstable]
3838
)
3939
alg.commands.append(command)
40-
alg.processInputs()
40+
alg.processInputs(parameters,context)
4141

4242

4343
def processCommand(alg, parameters):

‎python/plugins/processing/algs/grass7/nviz7.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ def processAlgorithm(self, parameters, context, feedback):
115115
if cellsize:
116116
command += ' res=' + str(cellsize)
117117
else:
118-
command += ' res=' + str(self.getDefaultCellsize())
118+
command += ' res=' + str(self.getDefaultCellsize(parameters,context))
119119
commands.append(command)
120120

121121
command = 'nviz7'
@@ -170,22 +170,22 @@ def exportRasterLayer(self, layer):
170170
command += ' --overwrite -o'
171171
return (command, destFilename)
172172

173-
def getDefaultCellsize(self):
173+
def getDefaultCellsize(self, parameters, context):
174174
cellsize = 0
175-
context = dataobjects.createContext()
176-
for param in self.parameters:
177-
if param.value:
175+
for param in self.parameterDefinitions():
176+
if param.name() in parameters:
177+
value = parameters[param.name()]
178178
if isinstance(param, ParameterRaster):
179-
if isinstance(param.value, QgsRasterLayer):
180-
layer = param.value
179+
if isinstance(value, QgsRasterLayer):
180+
layer = value
181181
else:
182-
layer = QgsProcessingUtils.mapLayerFromString(param.value, context)
182+
layer = QgsProcessingUtils.mapLayerFromString(value, context)
183183
cellsize = max(cellsize, (layer.extent().xMaximum() -
184184
layer.extent().xMinimum()) /
185185
layer.width())
186186
elif isinstance(param, ParameterMultipleInput):
187187

188-
layers = param.value.split(';')
188+
layers = value.split(';')
189189
for layername in layers:
190190
layer = QgsProcessingUtils.mapLayerFromString(layername, context)
191191
if isinstance(layer, QgsRasterLayer):

0 commit comments

Comments
 (0)
Please sign in to comment.