From cf61a78fbffa080d0cf38721fea189c1b627c2dc Mon Sep 17 00:00:00 2001 From: Saumya Jain Date: Thu, 28 Mar 2024 17:16:42 +0100 Subject: [PATCH] Added enumname while reading ucp Added a connection in WorkspaceDialog.qml to call function whenever the 'exportedSettingModel' changes. This ensures that any changes in the model will now be reflected in the UI table. Furthermore, an added adjustment in SpecificSettingsModel.py now correctly handles the enum type settings, retrieving the correct value from the options list. CURA-11783 --- plugins/3MFReader/SpecificSettingsModel.py | 4 ++++ plugins/3MFReader/WorkspaceDialog.qml | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/plugins/3MFReader/SpecificSettingsModel.py b/plugins/3MFReader/SpecificSettingsModel.py index af203ad759..275b9c03ac 100644 --- a/plugins/3MFReader/SpecificSettingsModel.py +++ b/plugins/3MFReader/SpecificSettingsModel.py @@ -33,6 +33,10 @@ class SpecificSettingsModel(ListModel): if setting_type is not None: # This is not very good looking, but will do for now value = str(SettingDefinition.settingValueToString(setting_type, value)) + " " + str(unit) + if setting_type == "enum": + options = stack.getProperty(setting, "options") + value = options[stack.getProperty(setting, "value")] + else: value = str(value) diff --git a/plugins/3MFReader/WorkspaceDialog.qml b/plugins/3MFReader/WorkspaceDialog.qml index eeb33da4c7..adb070e862 100644 --- a/plugins/3MFReader/WorkspaceDialog.qml +++ b/plugins/3MFReader/WorkspaceDialog.qml @@ -216,6 +216,16 @@ UM.Dialog headers: ["category", "label", "value"] rows: manager.exportedSettingModelItems } + + Connections + { + target: manager + function onExportedSettingModelChanged() + { + tableModel.clear() + tableModel.rows = manager.exportedSettingModelItems + } + } } }