From 08213890fb6ff45498bd8e601e234ce33957a47d Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Tue, 12 Jul 2016 13:09:53 +0200 Subject: [PATCH] Remove reliance on "_current_settings" postfix when removing user profile containers CURA-1896 --- cura/Settings/ExtruderManager.py | 6 +++--- cura/Settings/MachineManager.py | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/cura/Settings/ExtruderManager.py b/cura/Settings/ExtruderManager.py index 775596104b..132608693f 100644 --- a/cura/Settings/ExtruderManager.py +++ b/cura/Settings/ExtruderManager.py @@ -207,12 +207,13 @@ class ExtruderManager(QObject): #And leave it at the default quality. container_stack.addContainer(quality) - user_profile = container_registry.findInstanceContainers(id = extruder_stack_id + "_current_settings") + user_profile = container_registry.findInstanceContainers(type = "user", extruder = extruder_stack_id) if user_profile: #There was already a user profile, loaded from settings. user_profile = user_profile[0] else: user_profile = UM.Settings.InstanceContainer(extruder_stack_id + "_current_settings") #Add an empty user profile. user_profile.addMetaDataEntry("type", "user") + user_profile.addMetaDataEntry("extruder", extruder_stack_id) user_profile.setDefinition(machine_definition) container_registry.addContainer(user_profile) container_stack.addContainer(user_profile) @@ -226,8 +227,7 @@ class ExtruderManager(QObject): # \param machine_id The machine to remove the extruders for. def removeMachineExtruders(self, machine_id): for extruder in self.getMachineExtruders(machine_id): - current_settings_id = extruder.getId() + "_current_settings" - containers = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(id = current_settings_id) + containers = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(type = "user", extruder = extruder.getId()) for container in containers: UM.Settings.ContainerRegistry.getInstance().removeContainer(container.getId()) UM.Settings.ContainerRegistry.getInstance().removeContainer(extruder.getId()) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index cb761032d8..0a3e1fbaab 100644 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -640,8 +640,7 @@ class MachineManager(QObject): return ExtruderManager.getInstance().removeMachineExtruders(stacks[0].getBottom().getId()) - current_settings_id = machine_id + "_current_settings" - containers = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(id = current_settings_id) + containers = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(type = "user", machine = machine_id) for container in containers: UM.Settings.ContainerRegistry.getInstance().removeContainer(container.getId()) UM.Settings.ContainerRegistry.getInstance().removeContainer(machine_id)