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

Merge branch 'feature_intent_container_tree' of github.com:Ultimaker/Cura into feature_intent

Browse Source
This commit is contained in:
Jaime van Kessel 2019-09-19 16:47:14 +02:00
commit fe18e73e5b
No known key found for this signature in database
GPG Key ID: 3710727397403C91
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cura/Machines/MaterialNode.py
View File

@ -63,11 +63,18 @@ class MaterialNode(ContainerNode):
elif not self.variant.machine.has_materials: elif not self.variant.machine.has_materials:
qualities = container_registry.findInstanceContainersMetadata(type="quality", definition=self.variant.machine.quality_definition) qualities = container_registry.findInstanceContainersMetadata(type="quality", definition=self.variant.machine.quality_definition)
else: else:
if self.variant.machine.has_variants:
# Need to find the qualities that specify a material profile with the same material type. # Need to find the qualities that specify a material profile with the same material type.
qualities = container_registry.findInstanceContainersMetadata(type = "quality", definition = self.variant.machine.quality_definition, variant = self.variant.variant_name, material = self.container_id) # First try by exact material ID. qualities = container_registry.findInstanceContainersMetadata(type = "quality", definition = self.variant.machine.quality_definition, variant = self.variant.variant_name, material = self.container_id) # First try by exact material ID.
else:
qualities = container_registry.findInstanceContainersMetadata(type="quality", definition=self.variant.machine.quality_definition, material=self.container_id)
if not qualities: if not qualities:
my_material_type = self.material_type my_material_type = self.material_type
if self.variant.machine.has_variants:
qualities_any_material = container_registry.findInstanceContainersMetadata(type = "quality", definition = self.variant.machine.quality_definition, variant = self.variant.variant_name) qualities_any_material = container_registry.findInstanceContainersMetadata(type = "quality", definition = self.variant.machine.quality_definition, variant = self.variant.variant_name)
else:
qualities_any_material = container_registry.findInstanceContainersMetadata(type="quality", definition = self.variant.machine.quality_definition)
qualities_any_material = [metadata for metadata in qualities_any_material if metadata.get("global_quality", "False") != "True"]
for material_metadata in container_registry.findInstanceContainersMetadata(type = "material", material = my_material_type): for material_metadata in container_registry.findInstanceContainersMetadata(type = "material", material = my_material_type):
qualities.extend((quality for quality in qualities_any_material if quality["material"] == material_metadata["id"])) qualities.extend((quality for quality in qualities_any_material if quality["material"] == material_metadata["id"]))
if not qualities: # No quality profiles found. Go by GUID then. if not qualities: # No quality profiles found. Go by GUID then.