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

[processing] added missing validators for param values in modeler

Browse Source
This commit is contained in:
volaya 2016-09-12 07:54:55 +02:00
parent 4751b70675
commit e1072e9718
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
python/plugins/processing/gui/wrappers.py
View File

@ -501,7 +501,7 @@ class RasterWidgetWrapper(WidgetWrapper):
if self.dialogType == DIALOG_STANDARD:
pass # TODO
elif self.dialogType == DIALOG_BATCH:
return self.widget.setText(value)
self.widget.setText(value)
else:
self.setComboValue(value)
@ -511,7 +511,9 @@ class RasterWidgetWrapper(WidgetWrapper):
elif self.dialogType == DIALOG_BATCH:
return self.widget.getText()
else:
return self.comboValue()
def validator(v):
return bool(v) or self.param.optional
return self.comboValue(validator)
class SelectionWidgetWrapper(WidgetWrapper):
@ -568,7 +570,7 @@ class VectorWidgetWrapper(WidgetWrapper):
if self.dialogType == DIALOG_STANDARD:
pass # TODO
elif self.dialogType == DIALOG_BATCH:
return self.widget.setText(value)
self.widget.setText(value)
else:
self.setComboValue(value)
@ -582,7 +584,9 @@ class VectorWidgetWrapper(WidgetWrapper):
elif self.dialogType == DIALOG_BATCH:
return self.widget.getText()
else:
return self.comboValue()
def validator(v):
return bool(v) or self.param.optional
return self.comboValue(validator)
class StringWidgetWrapper(WidgetWrapper):
@ -702,9 +706,10 @@ class TableWidgetWrapper(WidgetWrapper):
elif self.dialogType == DIALOG_BATCH:
return self.widget.getText()
else:
return self.comboValue()
def validator(v):
return bool(v) or self.param.optional
return self.comboValue(validator)
class TableFieldWidgetWrapper(WidgetWrapper):
NOT_SET = '[Not set]'
@ -801,8 +806,10 @@ class TableFieldWidgetWrapper(WidgetWrapper):
elif self.dialogType == DIALOG_BATCH:
return self.widget.text()
else:
return self.comboValue()
def validator(v):
return bool(v) or self.param.optional
return self.comboValue(validator)
def anotherParameterWidgetHasChanged(self,wrapper):
if wrapper.param.name == self.param.parent:
layer = wrapper.value()