GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 10:55:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Convert generic "ContainerStack" to an Extruder or Global stack

Browse Source 
Dependendant on the "type" metadata key, we create either an
ExtruderStack or a GlobalStack instance to replace the ContainerStack
instance. This should allow for transparent upgrades to the new classes.

Contributes to CURA-3497
This commit is contained in:
Arjen Hiemstra 2017-03-20 17:28:01 +01:00
parent 12c50dbac8
commit b9f01b30c8
1 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
cura/Settings/CuraContainerRegistry.py
View File

@ -26,6 +26,14 @@ class CuraContainerRegistry(ContainerRegistry):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
## Overridden from ContainerRegistry
def addContainer(self, container):
# Note: Intentional check with type() because we want to ignore subclasses
if type(container) == ContainerStack:
container = self._convertContainerStack(container)
super().addContainer(container)
## Create a name that is not empty and unique ## Create a name that is not empty and unique
# \param container_type \type{string} Type of the container (machine, quality, ...) # \param container_type \type{string} Type of the container (machine, quality, ...)
# \param current_name \type{} Current name of the container, which may be an acceptable option # \param current_name \type{} Current name of the container, which may be an acceptable option
@ -284,3 +292,26 @@ class CuraContainerRegistry(ContainerRegistry):
if global_container_stack: if global_container_stack:
return parseBool(global_container_stack.getMetaDataEntry("has_machine_quality", False)) return parseBool(global_container_stack.getMetaDataEntry("has_machine_quality", False))
return False return False
def _convertContainerStack(self, container):
assert type(container) == ContainerStack
container_type = container.getMetaDataEntry("type")
if container_type not in ("extruder_train", "machine"):
# It is not an extruder or machine, so do nothing with the stack
return container
new_stack = None
if container_type == "extruder_train":
new_stack = ExtruderStack(container.getId())
else:
new_stack = GlobalStack(container.getId())
container_contents = container.serialize()
new_stack.deserialize(container_contents)
# Delete the old configuration file so we do not get double stacks
if os.path.isfile(container.getPath()):
os.remove(container.getPath())
return new_stack