3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-20 13:17:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

MachineStacks & user containers are now also renamed if so required

Browse source 
CURA-1263
This commit is contained in:
Jaime van Kessel 2016-11-14 15:16:17 +01:00
parent 990736b5c6
commit 0d4f28b310
1 changed files with 24 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

29
plugins/3MFReader/ThreeMFWorkspaceReader.py
View file

@ -148,8 +148,22 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
else: else:
if self._resolve_strategies["machine"] == "override": if self._resolve_strategies["machine"] == "override":
user_containers[0].deserialize(archive.open(instance_container_file).read().decode("utf-8")) user_containers[0].deserialize(archive.open(instance_container_file).read().decode("utf-8"))
else: elif self._resolve_strategies["machine"] == "new":
user_containers.deserialize(archive.open(instance_container_file).read().decode("utf-8")) # The machine is going to get a spiffy new name, so ensure that the id's of user settings match.
extruder_id = instance_container.getMetaDataEntry("extruder", None)
if extruder_id:
new_id = self._container_registry.uniqueName(extruder_id) + "_current_settings"
instance_container._id = new_id
instance_container.setName(new_id)
self._container_registry.addContainer(instance_container)
continue
machine_id = instance_container.getMetaDataEntry("machine", None)
if machine_id:
new_id = self._container_registry.uniqueName(machine_id) + "_current_settings"
instance_container._id = new_id
instance_container.setName(new_id)
self._container_registry.addContainer(instance_container)
# TODO: Handle other resolve strategies # TODO: Handle other resolve strategies
pass pass
user_instance_containers.append(instance_container) user_instance_containers.append(instance_container)
@ -182,8 +196,13 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
if self._resolve_strategies["machine"] == "override": if self._resolve_strategies["machine"] == "override":
container_stacks[0].deserialize(archive.open(container_stack_file).read().decode("utf-8")) container_stacks[0].deserialize(archive.open(container_stack_file).read().decode("utf-8"))
else: else:
# TODO: Handle other resolve strategies new_id = self._container_registry.uniqueName(container_id)
pass stack = ContainerStack(new_id)
stack.deserialize(archive.open(container_stack_file).read().decode("utf-8"))
# Ensure a unique ID and name
stack._id = new_id
stack.setName(self._container_registry.uniqueName(stack.getName()))
self._container_registry.addContainer(stack)
else: else:
stack = ContainerStack(container_id) stack = ContainerStack(container_id)
# Deserialize stack by converting read data from bytes to string # Deserialize stack by converting read data from bytes to string
@ -211,6 +230,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
if old_container.getId() == old_id: if old_container.getId() == old_id:
quality_changes_index = global_stack.getContainerIndex(old_container) quality_changes_index = global_stack.getContainerIndex(old_container)
global_stack.replaceContainer(quality_changes_index, container) global_stack.replaceContainer(quality_changes_index, container)
continue
for stack in extruder_stacks: for stack in extruder_stacks:
old_container = stack.findContainer({"type": "quality_changes"}) old_container = stack.findContainer({"type": "quality_changes"})
@ -235,6 +255,5 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
def _getXmlProfileClass(self): def _getXmlProfileClass(self):
for type_name, container_type in self._container_registry.getContainerTypes(): for type_name, container_type in self._container_registry.getContainerTypes():
print(type_name, container_type)
if type_name == "XmlMaterialProfile": if type_name == "XmlMaterialProfile":
return container_type return container_type