Some fixes to processing expression parameters

qgis · Nov 11, 2016 · 28d7cea · 28d7cea
1 parent a4cc572
commit 28d7cea
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/python/plugins/processing/core/parameters.py b/python/plugins/processing/core/parameters.py
@@ -1251,12 +1251,13 @@ def getAsScriptCode(self):
     @classmethod
     def fromScriptCode(self, line):
         isOptional, name, definition = _splitParameterOptions(line)
-        descName = _createDescriptiveName(name)
-        default = definition.strip()[len('expression') + 1:]
-        if default:
-            return ParameterExpression(name, descName, default, optional=isOptional)
-        else:
-            return ParameterExpression(name, descName, optional=isOptional)
+        if definition.lower().strip().startswith('expression'):
+            descName = _createDescriptiveName(name)
+            default = definition.strip()[len('expression') + 1:]
+            if default:
+                return ParameterExpression(name, descName, default, optional=isOptional)
+            else:
+                return ParameterExpression(name, descName, optional=isOptional)
 
 
 class ParameterTable(ParameterDataObject):

diff --git a/python/plugins/processing/gui/wrappers.py b/python/plugins/processing/gui/wrappers.py
@@ -754,7 +754,10 @@ def setValue(self, value):
 
     def value(self):
         if self.dialogType in (DIALOG_STANDARD, DIALOG_BATCH):
-            return self.widget.asExpression()
+            try:
+                return self.widget.asExpression()
+            except:
+                return self.widget.expression()
         else:
             def validator(v):
                 return bool(v) or self.param.optional