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

Merge branch '3.4'

Browse Source
This commit is contained in:
Ghostkeeper 2018-06-01 14:03:05 +02:00
commit 4157636552
No known key found for this signature in database
GPG Key ID: 5252B696FB5E7C7A
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cura/Settings/CuraContainerStack.py
View File

@ -39,8 +39,8 @@ from . import Exceptions
# This also means that operations on the stack that modifies the container ordering is prohibited and # This also means that operations on the stack that modifies the container ordering is prohibited and
# will raise an exception. # will raise an exception.
class CuraContainerStack(ContainerStack): class CuraContainerStack(ContainerStack):
def __init__(self, container_id: str, *args, **kwargs): def __init__(self, container_id: str):
super().__init__(container_id, *args, **kwargs) super().__init__(container_id)
self._container_registry = ContainerRegistry.getInstance() self._container_registry = ContainerRegistry.getInstance()

5
cura/Settings/CuraStackBuilder.py
View File

@ -98,8 +98,7 @@ class CuraStackBuilder:
position = position, position = position,
variant_container = extruder_variant_container, variant_container = extruder_variant_container,
material_container = material_container, material_container = material_container,
quality_container = application.empty_quality_container, quality_container = application.empty_quality_container
global_stack = new_global_stack,
) )
new_extruder.setNextStack(new_global_stack) new_extruder.setNextStack(new_global_stack)
new_global_stack.addExtruder(new_extruder) new_global_stack.addExtruder(new_extruder)
@ -138,7 +137,7 @@ class CuraStackBuilder:
@classmethod @classmethod
def createExtruderStack(cls, new_stack_id: str, extruder_definition: DefinitionContainerInterface, machine_definition_id: str, def createExtruderStack(cls, new_stack_id: str, extruder_definition: DefinitionContainerInterface, machine_definition_id: str,
position: int, position: int,
variant_container, material_container, quality_container, global_stack) -> ExtruderStack: variant_container, material_container, quality_container) -> ExtruderStack:
from cura.CuraApplication import CuraApplication from cura.CuraApplication import CuraApplication
application = CuraApplication.getInstance() application = CuraApplication.getInstance()
registry = application.getContainerRegistry() registry = application.getContainerRegistry()

4
cura/Settings/ExtruderStack.py
View File

@ -25,8 +25,8 @@ if TYPE_CHECKING:
# #
# #
class ExtruderStack(CuraContainerStack): class ExtruderStack(CuraContainerStack):
def __init__(self, container_id: str, *args, **kwargs): def __init__(self, container_id: str):
super().__init__(container_id, *args, **kwargs) super().__init__(container_id)
self.addMetaDataEntry("type", "extruder_train") # For backward compatibility self.addMetaDataEntry("type", "extruder_train") # For backward compatibility

4
cura/Settings/GlobalStack.py
View File

@ -23,8 +23,8 @@ from .CuraContainerStack import CuraContainerStack
## Represents the Global or Machine stack and its related containers. ## Represents the Global or Machine stack and its related containers.
# #
class GlobalStack(CuraContainerStack): class GlobalStack(CuraContainerStack):
def __init__(self, container_id: str, *args, **kwargs): def __init__(self, container_id: str):
super().__init__(container_id, *args, **kwargs) super().__init__(container_id)
self.addMetaDataEntry("type", "machine") # For backward compatibility self.addMetaDataEntry("type", "machine") # For backward compatibility