Skip to content

Commit 28d7cea

Browse files
committed
Some fixes to processing expression parameters
1 parent a4cc572 commit 28d7cea

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

python/plugins/processing/core/parameters.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1251,12 +1251,13 @@ def getAsScriptCode(self):
12511251
@classmethod
12521252
def fromScriptCode(self, line):
12531253
isOptional, name, definition = _splitParameterOptions(line)
1254-
descName = _createDescriptiveName(name)
1255-
default = definition.strip()[len('expression') + 1:]
1256-
if default:
1257-
return ParameterExpression(name, descName, default, optional=isOptional)
1258-
else:
1259-
return ParameterExpression(name, descName, optional=isOptional)
1254+
if definition.lower().strip().startswith('expression'):
1255+
descName = _createDescriptiveName(name)
1256+
default = definition.strip()[len('expression') + 1:]
1257+
if default:
1258+
return ParameterExpression(name, descName, default, optional=isOptional)
1259+
else:
1260+
return ParameterExpression(name, descName, optional=isOptional)
12601261

12611262

12621263
class ParameterTable(ParameterDataObject):

python/plugins/processing/gui/wrappers.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,10 @@ def setValue(self, value):
754754

755755
def value(self):
756756
if self.dialogType in (DIALOG_STANDARD, DIALOG_BATCH):
757-
return self.widget.asExpression()
757+
try:
758+
return self.widget.asExpression()
759+
except:
760+
return self.widget.expression()
758761
else:
759762
def validator(v):
760763
return bool(v) or self.param.optional

0 commit comments

Comments
 (0)