diff options
author | Jaime van Kessel <nallath@gmail.com> | 2022-09-13 14:35:37 +0300 |
---|---|---|
committer | Jaime van Kessel <nallath@gmail.com> | 2022-09-13 14:35:37 +0300 |
commit | 8dc2eaf783d12ce0a1874f08d31c1df55a7dd6c1 (patch) | |
tree | 4069fa677459b103718c070e755d7fd097259416 /cura/Settings | |
parent | a27bf8f7ed701749713c92bdf1f1c735345b5a06 (diff) |
Move CreateFlattendContainerInstance to InstanceContainer
It didn't really belong in the stack builder, as it's not a containerstack
CURA-9224
Diffstat (limited to 'cura/Settings')
-rw-r--r-- | cura/Settings/CuraStackBuilder.py | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/cura/Settings/CuraStackBuilder.py b/cura/Settings/CuraStackBuilder.py index 9fd51d4563..a25a487c6e 100644 --- a/cura/Settings/CuraStackBuilder.py +++ b/cura/Settings/CuraStackBuilder.py @@ -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
\ No newline at end of file |