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

Merge branch '2.3'

Browse source 
* 2.3:
  Return the empty container if there are no results when listing qualities
  Return empty quality instead of None in QualityManager::findQualityByQualityType
  Put material selection in warning state for unsupported materials
This commit is contained in:
Arjen Hiemstra 2016-10-10 13:37:31 +02:00
commit c67d698940
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cura/QualityManager.py
View file

@ -20,6 +20,9 @@ class QualityManager:
__instance = None __instance = None
def __init__(self):
self._empty_quality_container = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(id = "empty_quality")[0]
## Find a quality by name for a specific machine definition and materials. ## Find a quality by name for a specific machine definition and materials.
# #
# \param quality_name # \param quality_name
@ -92,7 +95,8 @@ class QualityManager:
if not result and material_containers and len(material_containers) == 1: if not result and material_containers and len(material_containers) == 1:
basic_materials = self._getBasicMaterials(material_containers[0]) basic_materials = self._getBasicMaterials(material_containers[0])
result = self._getFilteredContainersForStack(machine_definition, basic_materials, **criteria) result = self._getFilteredContainersForStack(machine_definition, basic_materials, **criteria)
return result[0] if result else None
return result[0] if result else self._empty_quality_container
## Find all suitable qualities for a combination of machine and material. ## Find all suitable qualities for a combination of machine and material.
# #
@ -105,6 +109,10 @@ class QualityManager:
if not result: if not result:
basic_materials = self._getBasicMaterials(material_container) basic_materials = self._getBasicMaterials(material_container)
result = self._getFilteredContainersForStack(machine_definition, basic_materials, **criteria) result = self._getFilteredContainersForStack(machine_definition, basic_materials, **criteria)
if not result:
result = [ self._empty_quality_container ]
return result return result
## Find all quality changes for a machine. ## Find all quality changes for a machine.