3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 07:33:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

CURA-4606 improved addExtruderStackForSingleExtrusionMachine by using containers directly

Browse source
This commit is contained in:
Jack Ha 2018-02-15 11:47:14 +01:00 • committed by Lipu Fei
parent 8275e506ce
commit aed0c124e9
1 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

30
cura/Settings/CuraContainerRegistry.py
View file

@ -25,7 +25,6 @@ from UM.Resources import Resources
from . import ExtruderStack from . import ExtruderStack
from . import GlobalStack from . import GlobalStack
from .ContainerManager import ContainerManager
from .ExtruderManager import ExtruderManager from .ExtruderManager import ExtruderManager
from cura.CuraApplication import CuraApplication from cura.CuraApplication import CuraApplication
@ -33,6 +32,7 @@ from cura.CuraApplication import CuraApplication
from UM.i18n import i18nCatalog from UM.i18n import i18nCatalog
catalog = i18nCatalog("cura") catalog = i18nCatalog("cura")
class CuraContainerRegistry(ContainerRegistry): class CuraContainerRegistry(ContainerRegistry):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
@ -514,8 +514,6 @@ class CuraContainerRegistry(ContainerRegistry):
extruder_stack.setDefinition(extruder_definition) extruder_stack.setDefinition(extruder_definition)
extruder_stack.addMetaDataEntry("position", extruder_definition.getMetaDataEntry("position")) extruder_stack.addMetaDataEntry("position", extruder_definition.getMetaDataEntry("position"))
from cura.CuraApplication import CuraApplication
# create a new definition_changes container for the extruder stack # create a new definition_changes container for the extruder stack
definition_changes_id = self.uniqueName(extruder_stack.getId() + "_settings") if create_new_ids else extruder_stack.getId() + "_settings" definition_changes_id = self.uniqueName(extruder_stack.getId() + "_settings") if create_new_ids else extruder_stack.getId() + "_settings"
definition_changes_name = definition_changes_id definition_changes_name = definition_changes_id
@ -574,26 +572,28 @@ class CuraContainerRegistry(ContainerRegistry):
self.addContainer(user_container) self.addContainer(user_container)
extruder_stack.setUserChanges(user_container) extruder_stack.setUserChanges(user_container)
variant_id = "default" application = CuraApplication.getInstance()
empty_variant = application.empty_variant_container
empty_material = application.empty_material_container
empty_quality = application.empty_quality_container
if machine.variant.getId() not in ("empty", "empty_variant"): if machine.variant.getId() not in ("empty", "empty_variant"):
variant_id = machine.variant.getId() variant = machine.variant
else: else:
variant_id = "empty_variant" variant = empty_variant
extruder_stack.variant = self.findInstanceContainers(id = variant_id)[0] extruder_stack.variant = variant
material_id = "default"
if machine.material.getId() not in ("empty", "empty_material"): if machine.material.getId() not in ("empty", "empty_material"):
material_id = machine.material.getId() material = machine.material
else: else:
material_id = "empty_material" material = empty_material
extruder_stack.material = self.findInstanceContainers(id = material_id)[0] extruder_stack.material = material
quality_id = "default"
if machine.quality.getId() not in ("empty", "empty_quality"): if machine.quality.getId() not in ("empty", "empty_quality"):
quality_id = machine.quality.getId() quality = machine.quality
else: else:
quality_id = "empty_quality" quality = empty_quality
extruder_stack.quality = self.findInstanceContainers(id = quality_id)[0] extruder_stack.quality = quality
machine_quality_changes = machine.qualityChanges machine_quality_changes = machine.qualityChanges
if new_global_quality_changes is not None: if new_global_quality_changes is not None: