Move manual criterion into base criteria filter

This code was filtering on certain criteria, and then filtering the results based on an additional metadata field. Let's just move that last field in the original criteria too...

Contributes to issue CURA-4243.
This commit is contained in:
Ghostkeeper 2017-10-19 15:48:19 +02:00
parent 7745113704
commit 2fc198a7ad
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A

View file

@ -209,11 +209,13 @@ class QualityManager:
definition_id = "fdmprinter"
if base_material:
# There is a basic material specified
criteria = { "type": "material", "name": base_material, "definition": definition_id }
criteria = {
"type": "material",
"name": base_material,
"definition": definition_id,
"variant": material_container.getMetadataEntry("variant")
}
containers = ContainerRegistry.getInstance().findInstanceContainers(**criteria)
containers = [basic_material for basic_material in containers if
basic_material.getMetaDataEntry("variant") == material_container.getMetaDataEntry(
"variant")]
return containers
return []