GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 16:15:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't return quality groups that are not available

Browse Source 
And don't return an arbitrary group then. That arbitrary group could also be unavailable.

Contributes to issue CURA-6600.
This commit is contained in:
Ghostkeeper 2019-08-15 14:26:28 +02:00
parent 370d7adcd5
commit 02fbdd96a4
No known key found for this signature in database
GPG Key ID: 86BEF881AE2CF276
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cura/Machines/QualityManager.py
View File

@ -140,20 +140,22 @@ class QualityManager(QObject):
return quality_group_dict return quality_group_dict
def getDefaultQualityType(self, machine: "GlobalStack") -> QualityGroup: ## Get the quality group for the preferred quality type for a certain
# global stack.
#
# If the preferred quality type is not available, ``None`` will be
# returned.
# \param machine The global stack of the machine to get the preferred
# quality group for.
# \return The preferred quality group, or ``None`` if that is not
# available.
def getDefaultQualityType(self, machine: "GlobalStack") -> Optional[QualityGroup]:
machine_node = ContainerTree.getInstance().machines[machine.definition.getId()] machine_node = ContainerTree.getInstance().machines[machine.definition.getId()]
variant_names = [] quality_groups = self.getQualityGroups(machine)
material_bases = []
extruder_enabled = []
for extruder in machine.extruders.values():
variant_names.append(extruder.variant.getName())
material_bases.append(extruder.material.getMetaDataEntry("base_file"))
extruder_enabled.append(extruder.isEnabled)
quality_groups = machine_node.getQualityGroups(variant_names, material_bases, extruder_enabled)
result = quality_groups.get(machine_node.preferred_quality_type) result = quality_groups.get(machine_node.preferred_quality_type)
if result is not None: if result is not None and result.is_available:
return result return result
return next(iter(quality_groups.values())) # If preferred quality type is not available, pick any quality type. return None # If preferred quality type is not available, leave it up for the caller.
# #