3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-10-10 23:37:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 16

Make profiles only load if the extruder says it has them

Browse source 
For instance, only load materials if has_materials is True.

Contributes to issues CURA-351 and CURA-1278.
This commit is contained in:
Ghostkeeper 2016-06-01 16:33:24 +02:00
parent 72bc68f38a
commit 7993775feb
No known key found for this signature in database
GPG key ID: 701948C5954A7385
1 changed files with 33 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

60
cura/Extruder.py
View file

@ -29,39 +29,45 @@ class Extruder:
#Find the nozzle to use for this extruder. #Find the nozzle to use for this extruder.
self._nozzle = container_registry.getEmptyInstanceContainer() self._nozzle = container_registry.getEmptyInstanceContainer()
if len(self._nozzles) >= 1: #First add any extruder. Later, overwrite with preference if the preference is valid. if self._definition.getMetaDataEntry("has_nozzles", default = "False") == "True":
self._nozzle = self._nozzles[0] if len(self._nozzles) >= 1: #First add any extruder. Later, overwrite with preference if the preference is valid.
preferred_nozzle_id = self._definition.getMetaDataEntry("preferred_nozzle") self._nozzle = self._nozzles[0]
if preferred_nozzle_id: preferred_nozzle_id = self._definition.getMetaDataEntry("preferred_nozzle")
for nozzle in self._nozzles: if preferred_nozzle_id:
if nozzle.getId() == preferred_nozzle_id: for nozzle in self._nozzles:
self._nozzle = nozzle if nozzle.getId() == preferred_nozzle_id:
break self._nozzle = nozzle
self._container_stack.addContainer(self._nozzle) break
self._container_stack.addContainer(self._nozzle)
#Find a material to use for this nozzle. #Find a material to use for this nozzle.
self._material = container_registry.getEmptyInstanceContainer() self._material = container_registry.getEmptyInstanceContainer()
all_materials = container_registry.findInstanceContainers(type = "material") if self._definition.getMetaDataEntry("has_materials", default = "False") == "True":
if len(all_materials) >= 1: if self._definition.getMetaDataEntry("has_nozzle_materials", default = "False") == "True":
self._material = all_materials[0] all_materials = container_registry.findInstanceContainers(type = "material", nozzle = self._nozzle.getId())
preferred_material_id = self._definition.getMetaDataEntry("preferred_material") else:
if preferred_material_id: all_materials = container_registry.findInstanceContainers(type = "material")
preferred_material = container_registry.findInstanceContainers(type = "material", id = preferred_material_id.lower()) if len(all_materials) >= 1:
if len(preferred_material) >= 1: self._material = all_materials[0]
self._material = preferred_material[0] preferred_material_id = self._definition.getMetaDataEntry("preferred_material")
self._container_stack.addContainer(self._material) if preferred_material_id:
preferred_material = container_registry.findInstanceContainers(type = "material", id = preferred_material_id.lower())
if len(preferred_material) >= 1:
self._material = preferred_material[0]
self._container_stack.addContainer(self._material)
#Find a quality to use for this extruder. #Find a quality to use for this extruder.
self._quality = container_registry.getEmptyInstanceContainer() self._quality = container_registry.getEmptyInstanceContainer()
all_qualities = container_registry.findInstanceContainers(type = "quality") if self._definition.getMetaDataEntry("has_machine_quality"):
if len(all_qualities) >= 1: all_qualities = container_registry.findInstanceContainers(type = "quality")
self._quality = all_qualities[0] if len(all_qualities) >= 1:
preferred_quality_id = self._definition.getMetaDataEntry("preferred_quality") self._quality = all_qualities[0]
if preferred_quality_id: preferred_quality_id = self._definition.getMetaDataEntry("preferred_quality")
preferred_quality = container_registry.findInstanceContainers(type = "quality", id = preferred_quality_id.lower()) if preferred_quality_id:
if len(preferred_quality) >= 1: preferred_quality = container_registry.findInstanceContainers(type = "quality", id = preferred_quality_id.lower())
self._quality = preferred_quality[0] if len(preferred_quality) >= 1:
self._container_stack.addContainer(self._quality) self._quality = preferred_quality[0]
self._container_stack.addContainer(self._quality)
self._container_stack.setNextStack(UM.Application.getInstance().getGlobalContainerStack()) self._container_stack.setNextStack(UM.Application.getInstance().getGlobalContainerStack())