From d29c8172895440b28d401141c19e8d58f1f95fe9 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 29 Sep 2016 11:56:46 +0200 Subject: [PATCH 1/2] Actually apply translated settings Don't know when this changed or why it hasn't propped up until then... Contributes to issue CURA-844. --- plugins/VersionUpgrade/VersionUpgrade21to22/Profile.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/VersionUpgrade/VersionUpgrade21to22/Profile.py b/plugins/VersionUpgrade/VersionUpgrade21to22/Profile.py index 4894df84aa..8ff6b2a5eb 100644 --- a/plugins/VersionUpgrade/VersionUpgrade21to22/Profile.py +++ b/plugins/VersionUpgrade/VersionUpgrade21to22/Profile.py @@ -59,7 +59,9 @@ class Profile: # Parse the settings. self._settings = {} if parser.has_section("settings"): + print("---------------------- have section Settings") for key, value in parser["settings"].items(): + print("----------------------", key, "=", value) self._settings[key] = value # Parse the defaults and the disabled defaults. @@ -105,13 +107,13 @@ class Profile: config.set("metadata", "variant", self._machine_variant_name) if self._settings: - VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.translateSettings(self._settings) + self._settings = VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.translateSettings(self._settings) config.add_section("values") for key, value in self._settings.items(): config.set("values", key, str(value)) if self._changed_settings_defaults: - VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.translateSettings(self._changed_settings_defaults) + self._changed_settings_defaults = VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.translateSettings(self._changed_settings_defaults) config.add_section("defaults") for key, value in self._changed_settings_defaults.items(): config.set("defaults", key, str(value)) From bee955327b2368bd0e5a302c6f32ae8dae006026 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Thu, 29 Sep 2016 12:04:05 +0200 Subject: [PATCH 2/2] Fix quality profile selection for printers that should use generic quality Fixes CURA-2489, contributes to CURA-2477 --- cura/QualityManager.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cura/QualityManager.py b/cura/QualityManager.py index 8fba30838d..e33398fc35 100644 --- a/cura/QualityManager.py +++ b/cura/QualityManager.py @@ -63,9 +63,9 @@ class QualityManager: # Fill in any default values. if machine_definition is None: machine_definition = UM.Application.getInstance().getGlobalContainerStack().getBottom() - quality_definition = machine_definition.getMetaDataEntry("quality_definition") - if quality_definition is not None: - machine_definition = UM.Settings.ContainerRegistry.getInstance().findDefinitionContainers(id=quality_definition)[0] + quality_definition_id = machine_definition.getMetaDataEntry("quality_definition") + if quality_definition_id is not None: + machine_definition = UM.Settings.ContainerRegistry.getInstance().findDefinitionContainers(id=quality_definition_id)[0] if material_containers is None: active_stacks = cura.Settings.ExtruderManager.getInstance().getActiveGlobalAndExtruderStacks() @@ -81,6 +81,8 @@ class QualityManager: criteria["definition"] = definition_id filter_by_material = whole_machine_definition.getMetaDataEntry("has_materials") + else: + criteria["definition"] = "fdmprinter" # Stick the material IDs in a set if material_containers is None or len(material_containers) == 0: