diff --git a/python/plugins/processing/algs/qgis/ui/FieldsCalculatorDialog.py b/python/plugins/processing/algs/qgis/ui/FieldsCalculatorDialog.py
index 409f97916b3..4810e0244a9 100644
--- a/python/plugins/processing/algs/qgis/ui/FieldsCalculatorDialog.py
+++ b/python/plugins/processing/algs/qgis/ui/FieldsCalculatorDialog.py
@@ -40,7 +40,7 @@ from qgis.gui import QgsEncodingFileDialog
from processing.core.ProcessingConfig import ProcessingConfig
from processing.core.ProcessingLog import ProcessingLog
-from processing.gui.AlgorithmExecutor import runalg
+from processing.gui.AlgorithmExecutor import execute
from processing.tools import dataobjects
from processing.gui.Postprocessing import handleAlgorithmResults
@@ -232,7 +232,7 @@ class FieldsCalculatorDialog(BASE, WIDGET):
ProcessingLog.addToLog(ProcessingLog.LOG_ALGORITHM,
self.alg.getAsCommand())
- self.executed = runalg(self.alg, self.feedback)
+ self.executed = execute(self.alg, self.feedback)
if self.executed:
handleAlgorithmResults(self.alg,
self.feedback,
diff --git a/python/plugins/processing/core/Processing.py b/python/plugins/processing/core/Processing.py
index 72f68c49578..488f4214c3a 100644
--- a/python/plugins/processing/core/Processing.py
+++ b/python/plugins/processing/core/Processing.py
@@ -49,7 +49,7 @@ from processing.core.ProcessingLog import ProcessingLog
from processing.gui.MessageBarProgress import MessageBarProgress
from processing.gui.RenderingStyles import RenderingStyles
from processing.gui.Postprocessing import handleAlgorithmResults
-from processing.gui.AlgorithmExecutor import runalg
+from processing.gui.AlgorithmExecutor import execute
from processing.tools import dataobjects
from processing.core.alglist import algList
@@ -298,7 +298,7 @@ class Processing(object):
elif iface is not None:
feedback = MessageBarProgress(alg.name)
- ret = runalg(alg, feedback)
+ ret = execute(alg, feedback)
if ret:
if onFinish is not None:
onFinish(alg, feedback)
diff --git a/python/plugins/processing/core/ProcessingLog.py b/python/plugins/processing/core/ProcessingLog.py
index a3cb4b50b36..26d05834bd2 100644
--- a/python/plugins/processing/core/ProcessingLog.py
+++ b/python/plugins/processing/core/ProcessingLog.py
@@ -69,7 +69,7 @@ class ProcessingLog(object):
with codecs.open(ProcessingLog.logFilename(), 'a',
encoding='utf-8') as logfile:
logfile.write(line)
- algname = msg[len('Processing.runalg("'):]
+ algname = msg[len('processing.runalg("'):]
algname = algname[:algname.index('"')]
if algname not in ProcessingLog.recentAlgs:
ProcessingLog.recentAlgs.append(algname)
diff --git a/python/plugins/processing/core/parameters.py b/python/plugins/processing/core/parameters.py
index e24c787cd64..dd925981f36 100644
--- a/python/plugins/processing/core/parameters.py
+++ b/python/plugins/processing/core/parameters.py
@@ -160,7 +160,7 @@ class Parameter(object):
"""
Returns the value of this parameter as it should have been
entered in the console if calling an algorithm using the
- Processing.runalg() method.
+ processing.runalg() method.
"""
return str(self.value)
diff --git a/python/plugins/processing/gui/AlgorithmDialog.py b/python/plugins/processing/gui/AlgorithmDialog.py
index 0cce9c174b4..eff4e484ec4 100644
--- a/python/plugins/processing/gui/AlgorithmDialog.py
+++ b/python/plugins/processing/gui/AlgorithmDialog.py
@@ -39,7 +39,7 @@ from processing.core.ProcessingConfig import ProcessingConfig
from processing.gui.BatchAlgorithmDialog import BatchAlgorithmDialog
from processing.gui.AlgorithmDialogBase import AlgorithmDialogBase
-from processing.gui.AlgorithmExecutor import runalg, runalgIterating
+from processing.gui.AlgorithmExecutor import execute, executeIterating
from processing.gui.Postprocessing import handleAlgorithmResults
from processing.core.parameters import ParameterRaster
@@ -198,7 +198,7 @@ class AlgorithmDialog(AlgorithmDialogBase):
self.tr('Algorithm {0} starting...').format(self.alg.name))
if self.iterateParam:
- if runalgIterating(self.alg, self.iterateParam, self.feedback):
+ if executeIterating(self.alg, self.iterateParam, self.feedback):
self.finish()
else:
QApplication.restoreOverrideCursor()
@@ -208,7 +208,7 @@ class AlgorithmDialog(AlgorithmDialogBase):
if command:
ProcessingLog.addToLog(
ProcessingLog.LOG_ALGORITHM, command)
- if runalg(self.alg, self.feedback):
+ if execute(self.alg, self.feedback):
self.finish()
else:
QApplication.restoreOverrideCursor()
diff --git a/python/plugins/processing/gui/AlgorithmExecutor.py b/python/plugins/processing/gui/AlgorithmExecutor.py
index d420b01c160..148ee098a8f 100644
--- a/python/plugins/processing/gui/AlgorithmExecutor.py
+++ b/python/plugins/processing/gui/AlgorithmExecutor.py
@@ -42,7 +42,7 @@ from processing.tools.system import getTempFilename
from processing.tools import vector
-def runalg(alg, feedback=None):
+def execute(alg, feedback=None):
"""Executes a given algorithm, showing its progress in the
progress object passed along.
@@ -63,7 +63,7 @@ def runalg(alg, feedback=None):
return False
-def runalgIterating(alg, paramToIter, feedback):
+def executeIterating(alg, paramToIter, feedback):
# Generate all single-feature layers
settings = QgsSettings()
systemEncoding = settings.value('/UI/encoding', 'System')
@@ -96,7 +96,7 @@ def runalgIterating(alg, paramToIter, feedback):
out.value = filename
feedback.setProgressText(tr('Executing iteration {0}/{1}...').format(i, len(filelist)))
feedback.setProgress(i * 100 / len(filelist))
- if runalg(alg, feedback):
+ if execute(alg, feedback):
handleAlgorithmResults(alg, None, False)
else:
return False
diff --git a/python/plugins/processing/gui/BatchAlgorithmDialog.py b/python/plugins/processing/gui/BatchAlgorithmDialog.py
index b22f2296ae2..f7ee625f604 100644
--- a/python/plugins/processing/gui/BatchAlgorithmDialog.py
+++ b/python/plugins/processing/gui/BatchAlgorithmDialog.py
@@ -34,7 +34,7 @@ from qgis.gui import QgsMessageBar
from processing.gui.BatchPanel import BatchPanel
from processing.gui.AlgorithmDialogBase import AlgorithmDialogBase
-from processing.gui.AlgorithmExecutor import runalg
+from processing.gui.AlgorithmExecutor import execute
from processing.gui.Postprocessing import handleAlgorithmResults
from processing.core.ProcessingResults import ProcessingResults
@@ -121,7 +121,7 @@ class BatchAlgorithmDialog(AlgorithmDialogBase):
for count, alg in enumerate(self.algs):
self.setText(self.tr('\nProcessing algorithm {0}/{1}...').format(count + 1, len(self.algs)))
self.setInfo(self.tr('Algorithm {0} starting...').format(alg.name))
- if runalg(alg, self.feedback) and not self.canceled:
+ if execute(alg, self.feedback) and not self.canceled:
if self.load[count]:
handleAlgorithmResults(alg, self.feedback, False)
self.setInfo(self.tr('Algorithm {0} correctly executed...').format(alg.name))
diff --git a/python/plugins/processing/gui/ProcessingToolbox.py b/python/plugins/processing/gui/ProcessingToolbox.py
index e522ee33874..0b70f1f0d63 100644
--- a/python/plugins/processing/gui/ProcessingToolbox.py
+++ b/python/plugins/processing/gui/ProcessingToolbox.py
@@ -45,7 +45,7 @@ from processing.gui.BatchAlgorithmDialog import BatchAlgorithmDialog
from processing.gui.EditRenderingStylesDialog import EditRenderingStylesDialog
from processing.gui.ConfigDialog import ConfigDialog
from processing.gui.MessageBarProgress import MessageBarProgress
-from processing.gui.AlgorithmExecutor import runalg
+from processing.gui.AlgorithmExecutor import execute
from processing.core.alglist import algList
pluginPath = os.path.split(os.path.dirname(__file__))[0]
@@ -275,7 +275,7 @@ class ProcessingToolbox(BASE, WIDGET):
self.addRecentAlgorithms(True)
else:
feedback = MessageBarProgress()
- runalg(alg, feedback)
+ execute(alg, feedback)
handleAlgorithmResults(alg, feedback)
feedback.close()
if isinstance(item, TreeActionItem):
diff --git a/python/plugins/processing/gui/menus.py b/python/plugins/processing/gui/menus.py
index 39184d4c88a..6e9392b581f 100644
--- a/python/plugins/processing/gui/menus.py
+++ b/python/plugins/processing/gui/menus.py
@@ -10,7 +10,7 @@ from processing.gui.AlgorithmDialog import AlgorithmDialog
from qgis.utils import iface
from qgis.core import QgsApplication
from processing.gui.MessageBarProgress import MessageBarProgress
-from processing.gui.AlgorithmExecutor import runalg
+from processing.gui.AlgorithmExecutor import execute
from processing.gui.Postprocessing import handleAlgorithmResults
from processing.core.Processing import Processing
@@ -221,7 +221,7 @@ def _executeAlgorithm(alg):
canvas.setMapTool(prevMapTool)
else:
feedback = MessageBarProgress()
- runalg(alg, feedback)
+ execute(alg, feedback)
handleAlgorithmResults(alg, feedback)
feedback.close()