GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 21:28:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix containertree for machines without materials but with specific qualities

Browse Source 
CURA-6775
This commit is contained in:
Jaime van Kessel 2019-09-19 15:33:19 +02:00
parent 830b22e381
commit 7016e791c8
No known key found for this signature in database
GPG Key ID: 3710727397403C91
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cura/Machines/MaterialNode.py
View File

@ -60,6 +60,8 @@ class MaterialNode(ContainerNode):
# Find all quality profiles that fit on this material. # Find all quality profiles that fit on this material.
if not self.variant.machine.has_machine_quality: # Need to find the global qualities. 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)
else: else:
# 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.

1
resources/definitions/fdmprinter.def.json
View File

@ -12,6 +12,7 @@
"visible": false, "visible": false,
"has_materials": true, "has_materials": true,
"has_variants": false, "has_variants": false,
"has_machine_quality": false,
"preferred_material": "generic_pla", "preferred_material": "generic_pla",
"preferred_quality_type": "normal", "preferred_quality_type": "normal",
"machine_extruder_trains": "machine_extruder_trains":