Skip to content

Commit 39456ba

Browse files
alexbruynyalldawson
authored andcommitted
[processing] fix handling of the multiple enum values
1 parent 33cfed2 commit 39456ba

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

python/plugins/processing/gui/enummodelerwidget.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,14 @@ def options(self):
8383

8484
return items
8585

86-
def defaultOption(self):
86+
def defaultOptions(self):
87+
options = []
8788
model = self.lstItems.model()
8889
for i in range(model.rowCount()):
8990
item = model.item(i)
9091
if item.checkState() == Qt.Checked:
91-
return i
92-
return None
92+
options.append(i)
93+
return options if len(options) > 0 else None
9394

9495
def allowMultiple(self):
9596
return self.chkAllowMultiple.isChecked()

python/plugins/processing/modeler/ModelerParameterDefinitionDialog.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ def accept(self):
421421
self.param = QgsProcessingParameterCrs(name, description, self.selector.crs().authid())
422422
elif (self.paramType == parameters.PARAMETER_ENUM or
423423
isinstance(self.param, QgsProcessingParameterEnum)):
424-
self.param = QgsProcessingParameterEnum(name, description, self.widget.options(), self.widget.allowMultiple(), self.widget.defaultOption())
424+
self.param = QgsProcessingParameterEnum(name, description, self.widget.options(), self.widget.allowMultiple(), self.widget.defaultOptions())
425425
elif (self.paramType == parameters.PARAMETER_MATRIX or
426426
isinstance(self.param, QgsProcessingParameterMatrix)):
427427
self.param = QgsProcessingParameterMatrix(name, description, hasFixedNumberRows=self.widget.fixedRows(), headers=self.widget.headers(), defaultValue=self.widget.value())

0 commit comments

Comments
 (0)