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

WIP: fix project loading and container renaming

Browse source 
CURA-3756
This commit is contained in:
Lipu Fei 2017-05-11 14:00:29 +02:00
parent c5371842c2
commit f436da8674
1 changed files with 75 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

103
plugins/3MFReader/ThreeMFWorkspaceReader.py
View file

@ -167,6 +167,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
quality_type = "" quality_type = ""
num_settings_overriden_by_quality_changes = 0 # How many settings are changed by the quality changes num_settings_overriden_by_quality_changes = 0 # How many settings are changed by the quality changes
num_user_settings = 0 num_user_settings = 0
quality_changes_conflict = False
for instance_container_file in instance_container_files: for instance_container_file in instance_container_files:
container_id = self._stripFileToId(instance_container_file) container_id = self._stripFileToId(instance_container_file)
instance_container = InstanceContainer(container_id) instance_container = InstanceContainer(container_id)
@ -202,7 +203,6 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
file_name, cura_file_names) file_name, cura_file_names)
self._resolve_strategies = {"machine": None, "quality_changes": None, "material": None} self._resolve_strategies = {"machine": None, "quality_changes": None, "material": None}
machine_conflict = False machine_conflict = False
quality_changes_conflict = False
for container_stack_file in [global_stack_file] + extruder_stack_files: for container_stack_file in [global_stack_file] + extruder_stack_files:
container_id = self._stripFileToId(container_stack_file) container_id = self._stripFileToId(container_stack_file)
serialized = archive.open(container_stack_file).read().decode("utf-8") serialized = archive.open(container_stack_file).read().decode("utf-8")
@ -262,6 +262,14 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
return WorkspaceReader.PreReadResult.cancelled return WorkspaceReader.PreReadResult.cancelled
self._resolve_strategies = self._dialog.getResult() self._resolve_strategies = self._dialog.getResult()
#
# There can be 3 resolve strategies coming from the dialog:
# - new: create a new container
# - override: override the existing container
# - None: There is no conflict, which means containers with the same IDs may or may not be there already.
# If they are there, there is no conflict between the them.
# In this case, you can either create a new one, or safely override the existing one.
#
# Default values # Default values
for k, v in self._resolve_strategies.items(): for k, v in self._resolve_strategies.items():
if v is None: if v is None:
@ -325,7 +333,6 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
global_stack_id_new = self.getNewId(global_stack_id_original) global_stack_id_new = self.getNewId(global_stack_id_original)
global_stack_need_rename = True global_stack_need_rename = True
# TODO: For the moment we use pretty naive existence checking. If the ID is the same, we assume in quite a few # TODO: For the moment we use pretty naive existence checking. If the ID is the same, we assume in quite a few
# TODO: cases that the container loaded is the same (most notable in materials & definitions). # TODO: cases that the container loaded is the same (most notable in materials & definitions).
# TODO: It might be possible that we need to add smarter checking in the future. # TODO: It might be possible that we need to add smarter checking in the future.
@ -352,21 +359,24 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
for material_container_file in material_container_files: for material_container_file in material_container_files:
container_id = self._stripFileToId(material_container_file) container_id = self._stripFileToId(material_container_file)
materials = self._container_registry.findInstanceContainers(id = container_id) materials = self._container_registry.findInstanceContainers(id = container_id)
if not materials: if not materials:
material_container = xml_material_profile(container_id) material_container = xml_material_profile(container_id)
material_container.deserialize(archive.open(material_container_file).read().decode("utf-8")) material_container.deserialize(archive.open(material_container_file).read().decode("utf-8"))
containers_to_add.append(material_container) containers_to_add.append(material_container)
else: else:
if not materials[0].isReadOnly(): # Only create new materials if they are not read only. material_container = materials[0]
if not material_container.isReadOnly(): # Only create new materials if they are not read only.
if self._resolve_strategies["material"] == "override": if self._resolve_strategies["material"] == "override":
materials[0].deserialize(archive.open(material_container_file).read().decode("utf-8")) material_container.deserialize(archive.open(material_container_file).read().decode("utf-8"))
elif self._resolve_strategies["material"] == "new": elif self._resolve_strategies["material"] == "new":
# Note that we *must* deserialize it with a new ID, as multiple containers will be # Note that we *must* deserialize it with a new ID, as multiple containers will be
# auto created & added. # auto created & added.
material_container = xml_material_profile(self.getNewId(container_id)) material_container = xml_material_profile(self.getNewId(container_id))
material_container.deserialize(archive.open(material_container_file).read().decode("utf-8")) material_container.deserialize(archive.open(material_container_file).read().decode("utf-8"))
containers_to_add.append(material_container) containers_to_add.append(material_container)
material_containers.append(material_container)
material_containers.append(material_container)
Job.yieldThread() Job.yieldThread()
Logger.log("d", "Workspace loading is checking instance containers...") Logger.log("d", "Workspace loading is checking instance containers...")
@ -394,18 +404,20 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
# The machine is going to get a spiffy new name, so ensure that the id's of user settings match. # 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) extruder_id = instance_container.getMetaDataEntry("extruder", None)
if extruder_id: if extruder_id:
new_id = self.getNewId(extruder_id) + "_current_settings" new_extruder_id = self.getNewId(extruder_id)
new_id = new_extruder_id + "_current_settings"
instance_container._id = new_id instance_container._id = new_id
instance_container.setName(new_id) instance_container.setName(new_id)
instance_container.setMetaDataEntry("extruder", self.getNewId(extruder_id)) instance_container.setMetaDataEntry("extruder", new_extruder_id)
containers_to_add.append(instance_container) containers_to_add.append(instance_container)
machine_id = instance_container.getMetaDataEntry("machine", None) machine_id = instance_container.getMetaDataEntry("machine", None)
if machine_id: if machine_id:
new_id = self.getNewId(machine_id) + "_current_settings" new_machine_id = self.getNewId(machine_id)
new_id = new_machine_id + "_current_settings"
instance_container._id = new_id instance_container._id = new_id
instance_container.setName(new_id) instance_container.setName(new_id)
instance_container.setMetaDataEntry("machine", self.getNewId(machine_id)) instance_container.setMetaDataEntry("machine", new_machine_id)
containers_to_add.append(instance_container) containers_to_add.append(instance_container)
user_instance_containers.append(instance_container) user_instance_containers.append(instance_container)
elif container_type in ("quality_changes", "definition_changes"): elif container_type in ("quality_changes", "definition_changes"):
@ -558,53 +570,88 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
return None return None
#
# Replacing the old containers if resolve is "new".
# When resolve is "new", some containers will get renamed, so all the other containers that reference to those
# MUST get updated too.
#
if self._resolve_strategies["machine"] == "new": if self._resolve_strategies["machine"] == "new":
# A new machine was made, but it was serialized with the wrong user container. Fix that now. # A new machine was made, but it was serialized with the wrong user container. Fix that now.
for container in user_instance_containers: for container in user_instance_containers:
# replacing the container ID for user instance containers for the extruders
extruder_id = container.getMetaDataEntry("extruder", None) extruder_id = container.getMetaDataEntry("extruder", None)
if extruder_id: if extruder_id:
for extruder in extruder_stacks: for extruder in extruder_stacks:
if extruder.getId() == extruder_id: if extruder.getId() == extruder_id:
extruder.replaceContainer(0, container) extruder.replaceContainer(0, container)
continue continue
# replacing the container ID for user instance containers for the machine
machine_id = container.getMetaDataEntry("machine", None) machine_id = container.getMetaDataEntry("machine", None)
if machine_id: if machine_id:
if global_stack.getId() == machine_id: if global_stack.getId() == machine_id:
global_stack.replaceContainer(0, container) global_stack.replaceContainer(0, container)
continue continue
for container_type in ("quality_changes", "definition_changes"): for changes_container_type in ("quality_changes", "definition_changes"):
if self._resolve_strategies[container_type] == "new": if self._resolve_strategies[changes_container_type] == "new":
# Quality changes needs to get a new ID, added to registry and to the right stacks # Quality changes needs to get a new ID, added to registry and to the right stacks
for container in quality_and_definition_changes_instance_containers: for each_changes_container in quality_and_definition_changes_instance_containers:
old_id = container.getId() old_id = each_changes_container.getId()
container.setName(self._container_registry.uniqueName(container.getName())) each_changes_container.setName(self._container_registry.uniqueName(each_changes_container.getName()))
# We're not really supposed to change the ID in normal cases, but this is an exception. # We're not really supposed to change the ID in normal cases, but this is an exception.
container._id = self.getNewId(container.getId()) each_changes_container._id = self.getNewId(each_changes_container.getId())
# The container was not added yet, as it didn't have an unique ID. It does now, so add it. # The container was not added yet, as it didn't have an unique ID. It does now, so add it.
self._container_registry.addContainer(container) self._container_registry.addContainer(each_changes_container)
# Replace the quality/definition changes container # Find the old (current) changes container in the global stack
if container_type == "quality_changes": if changes_container_type == "quality_changes":
old_container = global_stack.qualityChanges old_container = global_stack.qualityChanges
elif container_type == "definition_changes": elif changes_container_type == "definition_changes":
old_container = global_stack.definitionChanges old_container = global_stack.definitionChanges
# old_container = global_stack.findContainer({"type": container_type})
# sanity checks
# NOTE: The following cases SHOULD NOT happen!!!!
if not old_container:
Logger.log("e", "We try to get [%s] from the global stack [%s] but we got None instead!",
changes_container_type, global_stack.getId())
# Replace the quality/definition changes container if it's in the GlobalStack
# NOTE: we can get an empty container here, but the IDs will not match,
# so this comparison is fine.
if old_container.getId() == old_id: if old_container.getId() == old_id:
changes_index = global_stack.getContainerIndex(old_container) if changes_container_type == "quality_changes":
global_stack.replaceContainer(changes_index, container) global_stack.qualityChanges = each_changes_container
elif changes_container_type == "definition_changes":
global_stack.definitionChanges = each_changes_container
continue continue
for stack in extruder_stacks: # Replace the quality/definition changes container if it's in one of the ExtruderStacks
old_container = stack.findContainer({"type": container_type}) for each_extruder_stack in extruder_stacks:
if old_container.getId() == old_id: changes_container = None
changes_index = stack.getContainerIndex(old_container) if changes_container_type == "quality_changes":
stack.replaceContainer(changes_index, container) changes_container = each_extruder_stack.qualityChanges
elif changes_container_type == "definition_changes":
changes_container = each_extruder_stack.definitionChanges
# sanity checks
# NOTE: The following cases SHOULD NOT happen!!!!
if not changes_container:
Logger.log("e", "We try to get [%s] from the extruder stack [%s] but we got None instead!",
changes_container_type, each_extruder_stack.getId())
# NOTE: we can get an empty container here, but the IDs will not match,
# so this comparison is fine.
if changes_container.getId() == old_id:
if changes_container_type == "quality_changes":
each_extruder_stack.qualityChanges = each_changes_container
elif changes_container_type == "definition_changes":
each_extruder_stack.definitionChanges = each_changes_container
if self._resolve_strategies["material"] == "new": if self._resolve_strategies["material"] == "new":
for material in material_containers: for material in material_containers:
old_material = global_stack.findContainer({"type": "material"}) old_material = global_stack.material
if old_material.getId() in self._id_mapping: if old_material.getId() in self._id_mapping:
material_index = global_stack.getContainerIndex(old_material) material_index = global_stack.getContainerIndex(old_material)
global_stack.replaceContainer(material_index, material) global_stack.replaceContainer(material_index, material)