From f304e7f2e73828c4d2f1c5ceeb15c3f6196bbc66 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 27 Feb 2018 15:58:34 +0100 Subject: [PATCH 1/4] Revert "Use userChanges instead of getTop()" PerObjectContainerStacks are not CuraContainerStacks, so we cannot use "userChanges" with it. --- plugins/3MFReader/ThreeMFReader.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/3MFReader/ThreeMFReader.py b/plugins/3MFReader/ThreeMFReader.py index 80ef913b54..b81fd435b9 100755 --- a/plugins/3MFReader/ThreeMFReader.py +++ b/plugins/3MFReader/ThreeMFReader.py @@ -123,9 +123,9 @@ class ThreeMFReader(MeshReader): # Get the definition & set it definition_id = getMachineDefinitionIDForQualitySearch(global_container_stack.definition) - um_node.callDecoration("getStack").userChanges.setDefinition(definition_id) + um_node.callDecoration("getStack").getTop().setDefinition(definition_id) - setting_container = um_node.callDecoration("getStack").userChanges + setting_container = um_node.callDecoration("getStack").getTop() for key in settings: setting_value = settings[key] From 632e0469fb5d818431a78d5b065adc3f9fdf724e Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 27 Feb 2018 15:59:39 +0100 Subject: [PATCH 2/4] Fix 3MF Reader --- plugins/3MFReader/ThreeMFReader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/3MFReader/ThreeMFReader.py b/plugins/3MFReader/ThreeMFReader.py index b81fd435b9..95d8146d32 100755 --- a/plugins/3MFReader/ThreeMFReader.py +++ b/plugins/3MFReader/ThreeMFReader.py @@ -122,7 +122,7 @@ class ThreeMFReader(MeshReader): um_node.callDecoration("setActiveExtruder", default_stack.getId()) # Get the definition & set it - definition_id = getMachineDefinitionIDForQualitySearch(global_container_stack.definition) + definition_id = getMachineDefinitionIDForQualitySearch(global_container_stack) um_node.callDecoration("getStack").getTop().setDefinition(definition_id) setting_container = um_node.callDecoration("getStack").getTop() From 9dcd72fb36b4ee6f95eeb1d06cf1fb10b7f239ad Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 27 Feb 2018 16:06:09 +0100 Subject: [PATCH 3/4] Remove outdated TODOs --- cura/Machines/QualityManager.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/cura/Machines/QualityManager.py b/cura/Machines/QualityManager.py index a9aa6e9dcf..eb8a3611c1 100644 --- a/cura/Machines/QualityManager.py +++ b/cura/Machines/QualityManager.py @@ -256,7 +256,6 @@ class QualityManager(QObject): # Returns a dict of "custom profile name" -> QualityChangesGroup def getQualityChangesGroups(self, machine: "GlobalStack") -> dict: - # TODO: How to make this simpler? # Get machine definition ID for quality search machine_definition_id = getMachineDefinitionIDForQualitySearch(machine) @@ -280,7 +279,6 @@ class QualityManager(QObject): return quality_changes_group_dict def getQualityGroups(self, machine: "GlobalStack") -> dict: - # TODO: How to make this simpler, including the fall backs. # Get machine definition ID for quality search machine_definition_id = getMachineDefinitionIDForQualitySearch(machine) # This determines if we should only get the global qualities for the global stack and skip the global qualities for the extruder stacks From 85e3857785168648449dd45d0aa37af10f4ce8fd Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 27 Feb 2018 16:12:28 +0100 Subject: [PATCH 4/4] Use getters to get managers for CuraStackBuilder --- cura/Settings/CuraStackBuilder.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cura/Settings/CuraStackBuilder.py b/cura/Settings/CuraStackBuilder.py index 9273b272c1..4d103d2537 100644 --- a/cura/Settings/CuraStackBuilder.py +++ b/cura/Settings/CuraStackBuilder.py @@ -27,9 +27,9 @@ class CuraStackBuilder: def createMachine(cls, name: str, definition_id: str) -> Optional[GlobalStack]: from cura.CuraApplication import CuraApplication application = CuraApplication.getInstance() - variant_manager = CuraApplication.getInstance()._variant_manager - material_manager = CuraApplication.getInstance()._material_manager - quality_manager = CuraApplication.getInstance()._quality_manager + variant_manager = application.getVariantManager() + material_manager = application.getMaterialManager() + quality_manager = application.getQualityManager() registry = ContainerRegistry.getInstance() definitions = registry.findDefinitionContainers(id = definition_id)