sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-20 00:06:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #40293 from alexbruy/fix-39326

Browse Source 
fix row number calculation when reporting errors in the Processing batch mode (fix #39326)
This commit is contained in:
Alexander Bruy 2020-11-26 15:18:47 +02:00 committed by GitHub
commit 5c87f705da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
python/plugins/processing/gui/BatchPanel.py
View File

@ -600,7 +600,7 @@ class BatchPanel(QgsPanelWidget, WIDGET):
if not param.checkValueIsAcceptable(value, context): if not param.checkValueIsAcceptable(value, context):
msg = self.tr('Wrong or missing parameter value: {0} (row {1})').format( msg = self.tr('Wrong or missing parameter value: {0} (row {1})').format(
param.description(), row + 1) param.description(), row + 2)
self.parent.messageBar().pushMessage("", msg, level=Qgis.Warning, duration=5) self.parent.messageBar().pushMessage("", msg, level=Qgis.Warning, duration=5)
return return
algParams[param.name()] = param.valueAsPythonString(value, context) algParams[param.name()] = param.valueAsPythonString(value, context)
@ -616,7 +616,7 @@ class BatchPanel(QgsPanelWidget, WIDGET):
else: else:
self.parent.messageBar().pushMessage("", self.parent.messageBar().pushMessage("",
self.tr('Wrong or missing output value: {0} (row {1})').format( self.tr('Wrong or missing output value: {0} (row {1})').format(
out.description(), row + 1), out.description(), row + 2),
level=Qgis.Warning, duration=5) level=Qgis.Warning, duration=5)
return return
toSave.append({self.PARAMETERS: algParams, self.OUTPUTS: algOutputs}) toSave.append({self.PARAMETERS: algParams, self.OUTPUTS: algOutputs})
@ -743,7 +743,7 @@ class BatchPanel(QgsPanelWidget, WIDGET):
if warnOnInvalid and not param.checkValueIsAcceptable(wrapper.parameterValue()): if warnOnInvalid and not param.checkValueIsAcceptable(wrapper.parameterValue()):
self.parent.messageBar().pushMessage("", self.parent.messageBar().pushMessage("",
self.tr('Wrong or missing parameter value: {0} (row {1})').format( self.tr('Wrong or missing parameter value: {0} (row {1})').format(
param.description(), row + 1), param.description(), row + 2),
level=Qgis.Warning, duration=5) level=Qgis.Warning, duration=5)
return {}, False return {}, False
@ -766,7 +766,7 @@ class BatchPanel(QgsPanelWidget, WIDGET):
else: else:
parameters[out.name()] = text parameters[out.name()] = text
else: else:
msg = self.tr('Wrong or missing output value: {0} (row {1})').format(out.description(), row + 1) msg = self.tr('Wrong or missing output value: {0} (row {1})').format(out.description(), row + 2)
self.parent.messageBar().pushMessage("", msg, level=Qgis.Warning, duration=5) self.parent.messageBar().pushMessage("", msg, level=Qgis.Warning, duration=5)
return {}, False return {}, False
return parameters, True return parameters, True