3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-16 03:07:53 -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

22
cura/Settings/CuraStackBuilder.py
View file

@ -299,24 +299,4 @@ class CuraStackBuilder:
stack.setMetaDataEntry("is_abstract_machine", True)
stack.setMetaDataEntry("is_online", True)
return stack
@classmethod
def createFlattenedContainerInstance(cls, instance_container1, instance_container2):
"""Create a new container with container 2 as base and container 1 written over it."""
flat_container = InstanceContainer(instance_container2.getName())
# The metadata includes id, name and definition
flat_container.setMetaData(copy.deepcopy(instance_container2.getMetaData()))
if instance_container1.getDefinition():
flat_container.setDefinition(instance_container1.getDefinition().getId())
for key in instance_container2.getAllKeys():
flat_container.setProperty(key, "value", instance_container2.getProperty(key, "value"))
for key in instance_container1.getAllKeys():
flat_container.setProperty(key, "value", instance_container1.getProperty(key, "value"))
return flat_container
return stack