From df2ec7bd734b9e389f9a8472455a374b2cc43f6e Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 27 Jun 2017 14:02:35 +0200 Subject: [PATCH 1/3] Don't try to activate a machine that we don't have a definition for Contributes to issue CURA-3973. --- cura/Settings/MachineManager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index d0c04cd26a..1c47e9967a 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -91,7 +91,7 @@ class MachineManager(QObject): self._printer_output_devices = [] Application.getInstance().getOutputDeviceManager().outputDevicesChanged.connect(self._onOutputDevicesChanged) - if active_machine_id != "": + if active_machine_id != "" and ContainerRegistry.getInstance().findDefinitionContainers(id = active_machine_id): # An active machine was saved, so restore it. self.setActiveMachine(active_machine_id) if self._global_container_stack and self._global_container_stack.getProperty("machine_extruder_count", "value") > 1: From b2b9b1bedea3f71a18348e8beed8327bd2cc026c Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 27 Jun 2017 15:14:26 +0200 Subject: [PATCH 2/3] Fix checking if container stack exists It was checking a container stack ID against the definition containers, which doesn't match. Contributes to issue CURA-3973. --- cura/Settings/MachineManager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 1c47e9967a..cead5ad4f7 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -91,7 +91,7 @@ class MachineManager(QObject): self._printer_output_devices = [] Application.getInstance().getOutputDeviceManager().outputDevicesChanged.connect(self._onOutputDevicesChanged) - if active_machine_id != "" and ContainerRegistry.getInstance().findDefinitionContainers(id = active_machine_id): + if active_machine_id != "" and ContainerRegistry.getInstance().findContainerStacks(id = active_machine_id): # An active machine was saved, so restore it. self.setActiveMachine(active_machine_id) if self._global_container_stack and self._global_container_stack.getProperty("machine_extruder_count", "value") > 1: From f30d150ead8fd93d684ee5ce7ce44295e315cf3a Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 27 Jun 2017 16:13:47 +0200 Subject: [PATCH 3/3] Rename CPE+ and PC draft prints to Not Supported It's a hack. But it prevents having to write an upgrade script for this. Contributes to issue CURA-3973. --- ...int.inst.cfg => um3_aa0.8_CPEP_Not_Supported_Quality.inst.cfg} | 0 ...Print.inst.cfg => um3_aa0.8_PC_Not_Supported_Quality.inst.cfg} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename resources/quality/ultimaker3/{um3_aa0.8_CPEP_Draft_Print.inst.cfg => um3_aa0.8_CPEP_Not_Supported_Quality.inst.cfg} (100%) rename resources/quality/ultimaker3/{um3_aa0.8_PC_Draft_Print.inst.cfg => um3_aa0.8_PC_Not_Supported_Quality.inst.cfg} (100%) diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Not_Supported_Quality.inst.cfg similarity index 100% rename from resources/quality/ultimaker3/um3_aa0.8_CPEP_Draft_Print.inst.cfg rename to resources/quality/ultimaker3/um3_aa0.8_CPEP_Not_Supported_Quality.inst.cfg diff --git a/resources/quality/ultimaker3/um3_aa0.8_PC_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PC_Not_Supported_Quality.inst.cfg similarity index 100% rename from resources/quality/ultimaker3/um3_aa0.8_PC_Draft_Print.inst.cfg rename to resources/quality/ultimaker3/um3_aa0.8_PC_Not_Supported_Quality.inst.cfg