sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-12-15 00:07:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

[processing] added check to ensure input layers are valid

Browse Source
This commit is contained in:
volaya 2015-06-23 09:07:20 +02:00
parent 247c2f061e
commit 83f3a5893c
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
python/plugins/processing/core/GeoAlgorithm.py
View File

@ -246,6 +246,21 @@ class GeoAlgorithm:
raise GeoAlgorithmExecutionException(
str(e) + self.tr('\nSee log for more details'))
def _checkParameterValuesBeforeExecuting(self):
for param in self.parameters:
if isinstance(param, (ParameterRaster, ParameterVector,
ParameterMultipleInput)):
if param.value:
if isinstance(param, ParameterMultipleInput):
inputlayers = param.value.split(';')
else:
inputlayers = [param.value]
for inputlayer in inputlayers:
obj = dataobjects.getObjectFromUri(inputlayer)
if obj is None:
return "Wrong parameter value: " + param.value
return self.checkParameterValuesBeforeExecuting()
def runPostExecutionScript(self, progress):
scriptFile = ProcessingConfig.getSetting(
ProcessingConfig.POST_EXECUTION_SCRIPT)

2
python/plugins/processing/core/Processing.py
View File

@ -327,7 +327,7 @@ class Processing:
return
i = i + 1
msg = alg.checkParameterValuesBeforeExecuting()
msg = alg._checkParameterValuesBeforeExecuting()
if msg:
print 'Unable to execute algorithm\n' + msg
return

2
python/plugins/processing/gui/AlgorithmDialog.py
View File

@ -156,7 +156,7 @@ class AlgorithmDialog(AlgorithmDialogBase):
QMessageBox.No)
if reply == QMessageBox.No:
return
msg = self.alg.checkParameterValuesBeforeExecuting()
msg = self.alg._checkParameterValuesBeforeExecuting()
if msg:
QMessageBox.warning(
self, self.tr('Unable to execute algorithm'), msg)