Fix profile display for printers without machine-specific material profiles

CURA-2006, CURA-1774
This commit is contained in:
fieldOfView 2016-08-22 19:21:44 +02:00
parent 62e815a3d8
commit 08091209f1

View file

@ -111,11 +111,22 @@ class QualitySettingsModel(UM.Qt.ListModel.ListModel):
containers = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(**criteria)
if not containers:
# Try again, this time without extruder
criteria.pop("extruder")
new_criteria = criteria[:]
new_criteria.pop("extruder")
containers = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(**new_criteria)
if not containers:
# Try again, this time without material
criteria.pop("material")
containers = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(**criteria)
if not containers:
UM.Logger.log("Could not find any quality containers matching the search criteria %s", criteria)
# Try again, this time without material or extruder
criteria.pop("extruder") # "material" has already been popped
containers = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(**criteria)
if not containers:
UM.Logger.log("Could not find any quality containers matching the search criteria %s" % str(criteria))
return
if quality_changes_container: