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

Move CreateFlattendContainerInstance to InstanceContainer

Browse source 
It didn't really belong in the stack builder, as it's not a containerstack

CURA-9224
This commit is contained in:
Jaime van Kessel 2022-09-13 13:35:37 +02:00
parent a27bf8f7ed
commit 8dc2eaf783
No known key found for this signature in database
GPG key ID: C85F7A3AF1BAA7C4
3 changed files with 13 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

5
plugins/UFPWriter/UFPWriter.py
View file

@ -18,6 +18,7 @@ from UM.PluginRegistry import PluginRegistry # To get the g-code writer.
from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator
from UM.Scene.SceneNode import SceneNode
from UM.Settings.InstanceContainer import InstanceContainer
from cura.CuraApplication import CuraApplication
from cura.Settings.CuraStackBuilder import CuraStackBuilder
from cura.Settings.GlobalStack import GlobalStack
@ -225,7 +226,7 @@ class UFPWriter(MeshWriter):
global_stack = cast(GlobalStack, Application.getInstance().getGlobalContainerStack())
# Add global user or quality changes
global_flattened_changes = CuraStackBuilder.createFlattenedContainerInstance(global_stack.userChanges, global_stack.qualityChanges)
global_flattened_changes = InstanceContainer.createMergedInstanceContainer(global_stack.userChanges, global_stack.qualityChanges)
for setting in global_flattened_changes.getAllKeys():
settings["global"]["changes"][setting] = global_flattened_changes.getProperty(setting, "value")
@ -240,7 +241,7 @@ class UFPWriter(MeshWriter):
settings[f"extruder_{i}"]["all_settings"] = {}
# Add extruder user or quality changes
extruder_flattened_changes = CuraStackBuilder.createFlattenedContainerInstance(extruder.userChanges, extruder.qualityChanges)
extruder_flattened_changes = InstanceContainer.createMergedInstanceContainer(extruder.userChanges, extruder.qualityChanges)
for setting in extruder_flattened_changes.getAllKeys():
settings[f"extruder_{i}"]["changes"][setting] = extruder_flattened_changes.getProperty(setting, "value")