Skip to content

Commit 4df7b34

Browse files
committed
fixed issue with MultilineTextPanel in modeler (#10813)
1 parent dcc0171 commit 4df7b34

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

python/plugins/processing/modeler/ModelerParametersDialog.py

+6-5
Original file line numberDiff line numberDiff line change
@@ -319,15 +319,16 @@ def getWidgetFromParameter(self, param):
319319
item = MultipleInputPanel(opts)
320320
elif isinstance(param, ParameterString):
321321
strings = self.getAvailableValuesOfType(ParameterString, OutputString)
322+
options = [(self.resolveValueDescription(s), s) for s in strings]
322323
if param.multiline:
323-
item = MultilineTextPanel(strings, self.model)
324-
item.setText(str(param.default))
324+
item = MultilineTextPanel(options)
325+
item.setText(unicode(param.default))
325326
else:
326327
item = QtGui.QComboBox()
327328
item.setEditable(True)
328-
for s in strings:
329-
item.addItem(self.resolveValueDescription(s), s)
330-
item.setEditText(str(param.default))
329+
for desc, val in options:
330+
item.addItem(desc, val)
331+
item.setEditText(unicode(param.default))
331332
elif isinstance(param, ParameterTableField):
332333
item = QtGui.QComboBox()
333334
item.setEditable(True)

python/plugins/processing/modeler/MultilineTextPanel.py

+4-5
Original file line numberDiff line numberDiff line change
@@ -25,24 +25,23 @@
2525

2626
__revision__ = '$Format:%H$'
2727

28-
from PyQt4 import QtCore, QtGui
28+
from PyQt4 import QtGui
2929

3030

3131
class MultilineTextPanel(QtGui.QWidget):
3232

3333
USE_TEXT = 0
3434

35-
def __init__(self, options, model, parent=None):
35+
def __init__(self, options, parent=None):
3636
super(MultilineTextPanel, self).__init__(parent)
37-
self.options = options
38-
self.model = model
37+
self.options = options
3938
self.verticalLayout = QtGui.QVBoxLayout(self)
4039
self.verticalLayout.setSpacing(2)
4140
self.verticalLayout.setMargin(0)
4241
self.combo = QtGui.QComboBox()
4342
self.combo.addItem('[Use text below]')
4443
for option in options:
45-
self.combo.addItem(option.name(), option)
44+
self.combo.addItem(option[0], option[1])
4645
self.combo.setSizePolicy(QtGui.QSizePolicy.Expanding,
4746
QtGui.QSizePolicy.Expanding)
4847
self.verticalLayout.addWidget(self.combo)

0 commit comments

Comments
 (0)