3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-15 02:37:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Guard against materials not having a definition

Browse source 
The empty container has no definition.

Contributes to issue CURA-4243.
This commit is contained in:
Ghostkeeper 2017-11-28 15:33:21 +01:00
parent eb3981b4e0
commit 56d6664c8c
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A
1 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
cura/QualityManager.py
View file

@ -202,16 +202,20 @@ class QualityManager:
# \return \type{List[Dict[str, Any]]} A list of the metadata of basic # \return \type{List[Dict[str, Any]]} A list of the metadata of basic
# materials, or an empty list if none could be found. # materials, or an empty list if none could be found.
def _getBasicMaterialMetadatas(self, material_container: Dict[str, Any]) -> List[Dict[str, Any]]: def _getBasicMaterialMetadatas(self, material_container: Dict[str, Any]) -> List[Dict[str, Any]]:
base_material = material_container.get("material") if "definition" not in material_container:
material_container_definition = ContainerRegistry.getInstance().findDefinitionContainersMetadata(id = material_container["definition"])
if material_container_definition:
material_container_definition = material_container_definition[0]
if "has_machine_quality" in material_container_definition:
definition_id = material_container_definition.get("quality_definition", material_container_definition["id"])
else:
definition_id = "fdmprinter"
else:
definition_id = "fdmprinter" definition_id = "fdmprinter"
else:
material_container_definition = ContainerRegistry.getInstance().findDefinitionContainersMetadata(id = material_container["definition"])
if not material_container_definition:
definition_id = "fdmprinter"
else:
material_container_definition = material_container_definition[0]
if "has_machine_quality" not in material_container_definition:
definition_id = "fdmprinter"
else:
definition_id = material_container_definition.get("quality_definition", material_container_definition["id"])
base_material = material_container.get("material")
if base_material: if base_material:
# There is a basic material specified # There is a basic material specified
criteria = { criteria = {