3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-05 21:13:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge branch '4.4'

Browse source 
Conflicts:
	cura/Machines/MaterialNode.py -> Due to some automated formatting tool. Please disable those tools, people.
This commit is contained in:
Ghostkeeper 2019-12-23 16:26:25 +01:00
commit 8a9b791298
No known key found for this signature in database
GPG key ID: 37E2020986774393
5 changed files with 78 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

24
cura/Machines/MaterialNode.py
View file

@ -60,28 +60,38 @@ class MaterialNode(ContainerNode):
container_registry = ContainerRegistry.getInstance()
# Find all quality profiles that fit on this material.
if not self.variant.machine.has_machine_quality: # Need to find the global qualities.
qualities = container_registry.findInstanceContainersMetadata(type = "quality", definition = "fdmprinter")
qualities = container_registry.findInstanceContainersMetadata(type = "quality",
definition = "fdmprinter")
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:
if self.variant.machine.has_variants:
# 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.base_file) # First try by exact material ID.
# CURA-7070
# The quality profiles only reference a material with the material_root_id. They will never state something
# such as "generic_pla_ultimaker_s5_AA_0.4". So we search with the "base_file" which is the material_root_id.
else:
qualities = container_registry.findInstanceContainersMetadata(type = "quality", definition = self.variant.machine.quality_definition, material = self.container_id)
qualities = container_registry.findInstanceContainersMetadata(type = "quality", definition = self.variant.machine.quality_definition, material = self.base_file)
if not qualities:
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)
for material_metadata in container_registry.findInstanceContainersMetadata(type = "material", material = my_material_type):
qualities.extend((quality for quality in qualities_any_material if quality.get("material") == material_metadata["id"]))
qualities.extend((quality for quality in qualities_any_material if quality.get("material") == material_metadata["base_file"]))
if not qualities: # No quality profiles found. Go by GUID then.
my_guid = self.guid
for material_metadata in container_registry.findInstanceContainersMetadata(type = "material", guid = my_guid):
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["base_file"]))
if not qualities:
# There are still some machines that should use global profiles in the extruder, so do that now.