3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-03 12:03:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Move new_id in ContainerManager::duplicate into a general block

Browse source 
Saves duplication

Contributes to CURA-2006
This commit is contained in:
Arjen Hiemstra 2016-08-10 11:57:57 +02:00
parent 29c0cc3850
commit 2c0f0e8559
1 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
cura/Settings/ContainerManager.py
View file

@ -485,6 +485,8 @@ class ContainerManager(QObject):
return "" return ""
new_name = UM.Settings.ContainerRegistry.getInstance().uniqueName(quality_name) new_name = UM.Settings.ContainerRegistry.getInstance().uniqueName(quality_name)
new_id = new_name.lower()
new_id.replace(" ", "_")
containers = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(name = quality_name) containers = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(name = quality_name)
if not containers: if not containers:
@ -494,11 +496,8 @@ class ContainerManager(QObject):
if container_type == "quality": if container_type == "quality":
for container in self._getQualityContainers(quality_name, "quality"): for container in self._getQualityContainers(quality_name, "quality"):
stack_id = container.getMetaDataEntry("extruder", global_stack.getId()) stack_id = container.getMetaDataEntry("extruder", global_stack.getId())
new_id = new_name.lower()
new_id.replace(" ", "_")
new_id = stack_id + "_" + new_id
quality_changes = UM.Settings.InstanceContainer(new_id) quality_changes = UM.Settings.InstanceContainer(stack_id + "_" + new_id)
quality_changes.setName(new_name) quality_changes.setName(new_name)
quality_changes.addMetaDataEntry("type", "quality_changes") quality_changes.addMetaDataEntry("type", "quality_changes")
quality_changes.addMetaDataEntry("quality", container.getMetaDataEntry("quality_type")) quality_changes.addMetaDataEntry("quality", container.getMetaDataEntry("quality_type"))
@ -514,22 +513,16 @@ class ContainerManager(QObject):
UM.Settings.ContainerRegistry.getInstance().addContainer(quality_changes) UM.Settings.ContainerRegistry.getInstance().addContainer(quality_changes)
elif container_type == "quality_changes": elif container_type == "quality_changes":
for container in self._getQualityContainers(quality_name): for container in self._getQualityContainers(quality_name):
stack_id = container.getMetaDataEntry("extruder", global_stack.getId()) stack_id = container.getMetaDataEntry("extruder", global_stack.getId())
new_id = new_name.lower() new_container = container.duplicate(stack_id + "_" + new_id, new_name)
new_id.replace(" ", "_")
new_id = stack_id + "_" + new_id
new_container = container.duplicate(new_id, new_name)
UM.Settings.ContainerRegistry.getInstance().addContainer(new_container) UM.Settings.ContainerRegistry.getInstance().addContainer(new_container)
else: else:
return "" return ""
return new_name return new_name
# Factory function, used by QML # Factory function, used by QML
@staticmethod @staticmethod
def createContainerManager(engine, js_engine): def createContainerManager(engine, js_engine):