From 788ab7da1b61d5d002ba35914f57b5cc971d2fc9 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Tue, 29 Nov 2022 16:16:32 +0100 Subject: [PATCH] Fix broken combobox CURA-9793 --- .../MachineSettings/ComboBoxWithOptions.qml | 37 ++++++++++++++----- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/resources/qml/MachineSettings/ComboBoxWithOptions.qml b/resources/qml/MachineSettings/ComboBoxWithOptions.qml index 4ff7cf7092..9f5f89dde1 100644 --- a/resources/qml/MachineSettings/ComboBoxWithOptions.qml +++ b/resources/qml/MachineSettings/ComboBoxWithOptions.qml @@ -68,20 +68,37 @@ UM.TooltipArea function updateModel() { clear() - // Options come in as a string-representation of an OrderedDict - if(propertyProvider.properties.options) + + if(!propertyProvider.properties.options) { - var options = propertyProvider.properties.options.match(/^OrderedDict\(\[\((.*)\)\]\)$/); - if(options) + return + } + + for (var i = 0; i < propertyProvider.properties["options"].keys().length; i++) + { + var key = propertyProvider.properties["options"].keys()[i] + var value = propertyProvider.properties["options"][key] + append({ text: value, code: key}) + + if (propertyProvider.properties.value == key) { - options = options[1].split("), ("); - for(var i = 0; i < options.length; i++) - { - var option = options[i].substring(1, options[i].length - 1).split("', '"); - append({ text: option[1], value: option[0] }); - } + currentIndex = i } } +// // Options come in as a string-representation of an OrderedDict +// if(propertyProvider.properties.options) +// { +// var options = propertyProvider.properties.options.match(/^OrderedDict\(\[\((.*)\)\]\)$/); +// if(options) +// { +// options = options[1].split("), ("); +// for(var i = 0; i < options.length; i++) +// { +// var option = options[i].substring(1, options[i].length - 1).split("', '"); +// append({ text: option[1], value: option[0] }); +// } +// } +// } } Component.onCompleted: updateModel()