sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-16 00:03:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

[processing] enabled inut checks for field calculator algorithm

Browse Source 
fixes #12586
This commit is contained in:
volaya 2015-04-28 09:19:58 +02:00
parent 295014647f
commit 55108ae709
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
python/plugins/processing/algs/qgis/FieldsCalculator.py
View File

@ -147,15 +147,13 @@ class FieldsCalculator(GeoAlgorithm):
def checkParameterValuesBeforeExecuting(self): def checkParameterValuesBeforeExecuting(self):
newField = self.getParameterValue(self.NEW_FIELD) newField = self.getParameterValue(self.NEW_FIELD)
fieldName = self.getParameterValue(self.FIELD_NAME) fieldName = self.getParameterValue(self.FIELD_NAME).strip()
if newField and len(fieldName) == 0: if newField and len(fieldName) == 0:
raise GeoAlgorithmExecutionException( return self.tr('Field name is not set. Please enter a field name')
self.tr('Field name is not set. Please enter a field name'))
outputName = self.getOutputValue(self.OUTPUT_LAYER) outputName = self.getOutputValue(self.OUTPUT_LAYER).strip()
if outputName == '': if outputName == '':
raise GeoAlgorithmExecutionException( return self.tr('Output is not set. Please specify valid filename')
self.tr('Output is not set. Please specify valid filename'))
def getCustomParametersDialog(self): def getCustomParametersDialog(self):
return FieldsCalculatorDialog(self) return FieldsCalculatorDialog(self)

11
python/plugins/processing/algs/qgis/ui/FieldsCalculatorDialog.py
View File

@ -182,6 +182,12 @@ class FieldsCalculatorDialog(QDialog, Ui_FieldsCalculator):
self.alg.setParameterValue('FORMULA', self.builder.expressionText()) self.alg.setParameterValue('FORMULA', self.builder.expressionText())
self.alg.setOutputValue('OUTPUT_LAYER', self.alg.setOutputValue('OUTPUT_LAYER',
self.leOutputFile.text()) self.leOutputFile.text())
msg = self.alg.checkParameterValuesBeforeExecuting()
if msg:
QMessageBox.warning(
self, self.tr('Unable to execute algorithm'), msg)
return False
return True return True
def accept(self): def accept(self):
@ -199,11 +205,6 @@ class FieldsCalculatorDialog(QDialog, Ui_FieldsCalculator):
not keepOpen) not keepOpen)
if not keepOpen: if not keepOpen:
QDialog.reject(self) QDialog.reject(self)
else:
QMessageBox.critical(self,
self.tr('Unable to execute algorithm'),
self.tr('Wrong or missing parameter '
'values'))
finally: finally:
QApplication.restoreOverrideCursor() QApplication.restoreOverrideCursor()