From 2fc198a7ad61f4ddb14a031b3e92e10aec2ae52a Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 19 Oct 2017 15:48:19 +0200 Subject: [PATCH] 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. --- cura/QualityManager.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/cura/QualityManager.py b/cura/QualityManager.py index b6d47d919b..90ca285736 100644 --- a/cura/QualityManager.py +++ b/cura/QualityManager.py @@ -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 []