Extruder stacks now properly get global stack set as next

CURA-1263
This commit is contained in:
Jaime van Kessel 2016-11-14 15:50:07 +01:00
parent 4dc14a72ab
commit c919883178

View File

@ -188,8 +188,6 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
else: else:
if self._resolve_strategies["quality_changes"] == "override": if self._resolve_strategies["quality_changes"] == "override":
quality_changes[0].deserialize(archive.open(instance_container_file).read().decode("utf-8")) quality_changes[0].deserialize(archive.open(instance_container_file).read().decode("utf-8"))
else:
instance_container.deserialize(archive.open(instance_container_file).read().decode("utf-8"))
quality_changes_instance_containers.append(instance_container) quality_changes_instance_containers.append(instance_container)
else: else:
continue continue
@ -257,8 +255,10 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
global_stack.containersChanged.emit(container) global_stack.containersChanged.emit(container)
for stack in extruder_stacks: for stack in extruder_stacks:
stack.setNextStack(global_stack)
for container in stack.getContainers(): for container in stack.getContainers():
stack.containersChanged.emit(container) stack.containersChanged.emit(container)
# Actually change the active machine. # Actually change the active machine.
Application.getInstance().setGlobalContainerStack(global_stack) Application.getInstance().setGlobalContainerStack(global_stack)
return nodes return nodes