Skip to content

Commit 0c3ad14

Browse files
committedJun 5, 2017
Adapt more python code to new API
1 parent 6517470 commit 0c3ad14

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+157
-637
lines changed
 

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ def getConsoleCommands(self, parameters):
109109
outsize = str(self.getParameterValue(self.OUTSIZE))
110110
outsizePerc = str(self.getParameterValue(self.OUTSIZE_PERC))
111111
noData = self.getParameterValue(self.NO_DATA)
112-
expand = self.getParameterFromName(self.EXPAND).options[self.getParameterValue(self.EXPAND)][1]
112+
expand = parameters[self.EXPAND].options[self.getParameterValue(self.EXPAND)][1]
113113
projwin = str(self.getParameterValue(self.PROJWIN))
114114
if not projwin:
115115
projwin = QgsProcessingUtils.combineLayerExtents([inLayer])

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

Lines changed: 14 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
from processing.tools.system import isWindows
3434
from ..Grass7Utils import Grass7Utils
3535
from os import path
36+
from copy import deepcopy
3637

3738

3839
def multipleOutputDir(alg, field, basename=None):
@@ -112,58 +113,44 @@ def regroupRasters(alg, parameters, field, groupField, subgroupField=None, extFi
112113
:param parameters:
113114
"""
114115
# List of rasters names
116+
117+
new_parameters = deepcopy(parameters)
118+
115119
rasters = alg.getParameterFromName(field)
116120
rastersList = rasters.value.split(';')
117-
alg.parameters.remove(rasters)
121+
del new_parameters[field]
118122

119123
# Insert a i.group command
120124
group = getParameterFromString("ParameterString|{}|group of rasters|None|False|False".format(groupField))
121-
group.value = alg.getTempFilename()
122-
alg.addParameter(group)
125+
new_parameters[group.name()] = alg.getTempFilename()
123126

124127
if subgroupField:
125128
subgroup = getParameterFromString("ParameterString|{}|subgroup of rasters|None|False|False".format(subgroupField))
126-
subgroup.value = alg.getTempFilename()
127-
alg.addParameter(subgroup)
129+
new_parameters[subgroup.name()] = alg.getTempFilename()
128130

129131
command = 'i.group group={}{} input={}'.format(
130-
group.value,
131-
' subgroup={}'.format(subgroup.value) if subgroupField else '',
132+
new_parameters[group.name()],
133+
' subgroup={}'.format(new_parameters[subgroup.name()]) if subgroupField else '',
132134
','.join([alg.exportedLayers[f] for f in rastersList])
133135
)
134136
alg.commands.append(command)
135137

136138
# Handle external files
137-
origExtParams = {}
138139
if subgroupField and extFile:
139140
for ext in list(extFile.keys()):
140-
extFileName = alg.getParameterValue(ext)
141+
extFileName = new_parameters[ext]
141142
if extFileName:
142143
shortFileName = path.basename(extFileName)
143144
destPath = path.join(Grass7Utils.grassMapsetFolder(),
144145
'PERMANENT',
145-
'group', group.value,
146-
'subgroup', subgroup.value,
146+
'group', new_parameters[group.name()],
147+
'subgroup', new_parameters[subgroup.name()],
147148
extFile[ext], shortFileName)
148149
copyFile(alg, extFileName, destPath)
149-
origExtParams[ext] = extFileName
150-
alg.setParameterValue(ext, shortFileName)
150+
new_parameters[ext] = shortFileName
151151

152152
# modify parameters values
153-
alg.processCommand()
154-
155-
# Re-add input rasters
156-
alg.addParameter(rasters)
157-
158-
# replace external files value with original value
159-
for param in list(origExtParams.keys()):
160-
alg.setParameterValue(param, origExtParams[param])
161-
162-
# Delete group:
163-
alg.parameters.remove(group)
164-
if subgroupField:
165-
alg.parameters.remove(subgroup)
166-
return group.value, subgroup.value
153+
alg.processCommand(new_parameters)
167154

168155
return group.value
169156

0 commit comments

Comments
 (0)
Please sign in to comment.