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

Handle "new" resolve strategy for definition&quality changes

Browse source 
CURA-3756
This commit is contained in:
Lipu Fei 2017-05-12 14:17:40 +02:00
parent 9ea0f48341
commit fe11819ce9
1 changed files with 26 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

27
plugins/3MFReader/ThreeMFWorkspaceReader.py
View file

@ -455,7 +455,32 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
containers_to_add.append(instance_container) containers_to_add.append(instance_container)
else: else:
if self._resolve_strategies[container_type] == "override": if self._resolve_strategies[container_type] == "override":
changes_containers[0].deserialize(archive.open(instance_container_file).read().decode("utf-8")) instance_container = changes_containers[0]
instance_container.deserialize(archive.open(instance_container_file).read().decode("utf-8"))
instance_container.setDirty(True)
elif self._resolve_strategies[container_type] == "new":
# TODO: how should we handle the case "new" for quality_changes and definition_changes?
new_changes_container_id = self.getNewId(instance_container.getId())
instance_container._id = new_changes_container_id
instance_container.setName(new_changes_container_id)
# TODO: we don't know the following is correct or not, need to verify
# AND REFACTOR!!!
if self._resolve_strategies["machine"] == "new":
# 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_extruder_id = self.getNewId(extruder_id)
instance_container.setMetaDataEntry("extruder", new_extruder_id)
machine_id = instance_container.getMetaDataEntry("machine", None)
if machine_id:
new_machine_id = self.getNewId(machine_id)
instance_container.setMetaDataEntry("machine", new_machine_id)
containers_to_add.append(instance_container)
elif self._resolve_strategies[container_type] is None: elif self._resolve_strategies[container_type] is None:
# The ID already exists, but nothing in the values changed, so do nothing. # The ID already exists, but nothing in the values changed, so do nothing.
pass pass