GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-30 19:05:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Re-add per-extruder nozzles, materials, qualities

Browse Source 
Slightly more efficient and correct implementation.Contributes to issue CURA-340.
This commit is contained in:
Ghostkeeper 2016-06-08 13:19:46 +02:00
parent f6ece126c3
commit 32f90ad867
No known key found for this signature in database
GPG Key ID: 701948C5954A7385
1 changed files with 44 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
cura/ExtruderManager.py
View File

@ -93,7 +93,9 @@ class ExtruderManager(QObject):
self.extrudersChanged.emit(machine_definition) self.extrudersChanged.emit(machine_definition)
def createExtruderTrain(self, extruder_definition, machine_definition, extruder_train_id, position): def createExtruderTrain(self, extruder_definition, machine_definition, extruder_train_id, position):
#Cache some things.
container_registry = UM.Settings.ContainerRegistry.getInstance() container_registry = UM.Settings.ContainerRegistry.getInstance()
machine_id = machine_definition.getId()
#Create a container stack for this extruder. #Create a container stack for this extruder.
container_stack = UM.Settings.ContainerStack(extruder_train_id) container_stack = UM.Settings.ContainerStack(extruder_train_id)
@ -102,50 +104,59 @@ class ExtruderManager(QObject):
container_stack.addMetaDataEntry("position", position) container_stack.addMetaDataEntry("position", position)
container_stack.addContainer(extruder_definition) container_stack.addContainer(extruder_definition)
"""
Yes, I'm committing this code which needs to be transformed to work later.
#Find the nozzle to use for this extruder. #Find the nozzle to use for this extruder.
nozzle = container_registry.getEmptyInstanceContainer() nozzle = container_registry.getEmptyInstanceContainer()
if definition.getMetaDataEntry("has_nozzles", default = "False") == "True": if machine_definition.getMetaDataEntry("has_nozzles", default = "False") == "True":
if len(self._nozzles) >= 1: #First add any extruder. Later, overwrite with preference if the preference is valid. #First add any nozzle. Later, overwrite with preference if the preference is valid.
self._nozzle = self._nozzles[0] nozzles = container_registry.findInstanceContainers(machine = machine_id, type = "nozzle")
preferred_nozzle_id = definition.getMetaDataEntry("preferred_nozzle") if len(nozzles) >= 1:
nozzle = nozzles[0]
preferred_nozzle_id = machine_definition.getMetaDataEntry("preferred_nozzle")
if preferred_nozzle_id: if preferred_nozzle_id:
for nozzle in self._nozzles: preferred_nozzles = container_registry.findInstanceContainers(id = preferred_nozzle_id, type = "nozzle")
if nozzle.getId() == preferred_nozzle_id: if len(preferred_nozzles) >= 1:
self._nozzle = nozzle nozzle = preferred_nozzles[0]
break else:
self._container_stack.addContainer(self._nozzle) UM.Logger.log("w", "The preferred nozzle \"%s\" of machine %s doesn't exist or is not a nozzle profile.", preferred_nozzle_id, machine_id)
#And leave it at the default nozzle.
container_stack.addContainer(nozzle)
#Find a material to use for this nozzle. #Find a material to use for this nozzle.
self._material = container_registry.getEmptyInstanceContainer() material = container_registry.getEmptyInstanceContainer()
if self._definition.getMetaDataEntry("has_materials", default = "False") == "True": if machine_definition.getMetaDataEntry("has_materials", default = "False") == "True":
if self._definition.getMetaDataEntry("has_nozzle_materials", default = "False") == "True": #First add any material. Later, overwrite with preference if the preference is valid.
all_materials = container_registry.findInstanceContainers(type = "material", nozzle = self._nozzle.getId()) if machine_definition.getMetaDataEntry("has_nozzle_materials", default = "False") == "True":
materials = container_registry.findInstanceContainers(type = "material", machine = machine_id, nozzle = nozzle.getId())
else: else:
all_materials = container_registry.findInstanceContainers(type = "material") materials = container_registry.findInstanceContainers(type = "material", machine = machine_id)
if len(all_materials) >= 1: if len(materials) >= 1:
self._material = all_materials[0] material = materials[0]
preferred_material_id = self._definition.getMetaDataEntry("preferred_material") preferred_material_id = machine_definition.getMetaDataEntry("preferred_material")
if preferred_material_id: if preferred_material_id:
preferred_material = container_registry.findInstanceContainers(type = "material", id = preferred_material_id.lower()) preferred_materials = container_registry.findInstanceContainers(id = preferred_material_id, type = "material")
if len(preferred_material) >= 1: if len(preferred_materials) >= 1:
self._material = preferred_material[0] material = preferred_materials[0]
self._container_stack.addContainer(self._material) else:
UM.Logger.log("w", "The preferred material \"%s\" of machine %s doesn't exist or is not a material profile.", preferred_material_id, machine_id)
#And leave it at the default material.
container_stack.addContainer(material)
#Find a quality to use for this extruder. #Find a quality to use for this extruder.
self._quality = container_registry.getEmptyInstanceContainer() quality = container_registry.getEmptyInstanceContainer()
if self._definition.getMetaDataEntry("has_machine_quality"): if machine_definition.getMetaDataEntry("has_machine_quality"):
all_qualities = container_registry.findInstanceContainers(type = "quality") #First add any quality. Later, overwrite with preference if the preference is valid.
if len(all_qualities) >= 1: qualities = container_registry.findInstanceContainers(type = "quality")
self._quality = all_qualities[0] if len(qualities) >= 1:
preferred_quality_id = self._definition.getMetaDataEntry("preferred_quality") quality = qualities[0]
preferred_quality_id = machine_definition.getMetaDataEntry("preferred_quality")
if preferred_quality_id: if preferred_quality_id:
preferred_quality = container_registry.findInstanceContainers(type = "quality", id = preferred_quality_id.lower()) preferred_quality = container_registry.findInstanceContainers(id = preferred_quality_id.lower(), type = "quality")
if len(preferred_quality) >= 1: if len(preferred_quality) >= 1:
self._quality = preferred_quality[0] quality = preferred_quality[0]
self._container_stack.addContainer(self._quality) else:
""" UM.Logger.log("w", "The preferred quality \"%s\" of machine %s doesn't exist or is not a quality profile.", preferred_quality_id, machine_id)
#And leave it at the default quality.
container_stack.addContainer(quality)
user_profile = container_registry.findInstanceContainers(id = extruder_train_id + "_current_settings") user_profile = container_registry.findInstanceContainers(id = extruder_train_id + "_current_settings")
if user_profile: #There was already a user profile, loaded from settings. if user_profile: #There was already a user profile, loaded from settings.