Skip to content

Commit

Permalink
processing.run requires a dictionary for parameters
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Jun 27, 2017
1 parent 792a252 commit 2a1cdea
Showing 1 changed file with 2 additions and 32 deletions.
34 changes: 2 additions & 32 deletions python/plugins/processing/core/Processing.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
from qgis.core import (QgsMessageLog,
QgsApplication,
QgsProcessingProvider,
QgsProcessingUtils,
QgsProcessingAlgorithm,
QgsProcessingParameterDefinition)

import processing
Expand Down Expand Up @@ -123,7 +123,7 @@ def removeScripts(folder):

@staticmethod
def runAlgorithm(algOrName, onFinish, *args, **kwargs):
if isinstance(algOrName, GeoAlgorithm):
if isinstance(algOrName, QgsProcessingAlgorithm):
alg = algOrName
else:
alg = QgsApplication.processingRegistry().algorithmById(algOrName)
Expand Down Expand Up @@ -164,36 +164,6 @@ def runAlgorithm(algOrName, onFinish, *args, **kwargs):
Processing.tr('Error: Missing parameter value for parameter {0}.').format(param.name()),
Processing.tr("Processing"))
return
else:
if len(args) != alg.countVisibleParameters():
# fix_print_with_import
print('Error: Wrong number of parameters')
QgsMessageLog.logMessage(Processing.tr('Error: Wrong number of parameters'),
Processing.tr("Processing"))
processing.algorithmHelp(algOrName)
return
i = 0
for param in alg.parameterDefinitions():
if not param.flags() & QgsProcessingParameterDefinition.FlagHidden:
if not True: # TODO param.setValue(args[i]):
# fix_print_with_import
print('Error: Wrong parameter value: ' + str(args[i]))
QgsMessageLog.logMessage(Processing.tr('Error: Wrong parameter value: ') + str(args[i]),
Processing.tr("Processing"))
return
else:
parameters[param.name()] = args[i]
i = i + 1

for output in alg.outputs:
if not output.flags() & QgsProcessingParameterDefinition.FlagHidden:
if not output.setValue(args[i]):
# fix_print_with_import
print('Error: Wrong output value: ' + str(args[i]))
QgsMessageLog.logMessage(Processing.tr('Error: Wrong output value: ') + str(args[i]),
Processing.tr("Processing"))
return
i = i + 1

feedback = None
if kwargs is not None and "feedback" in list(kwargs.keys()):
Expand Down

0 comments on commit 2a1cdea

Please sign in to comment.