From accc4ccd2147d012d6fa26fbe915b3e5a105db5c Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 7 Aug 2019 09:50:53 +0200 Subject: [PATCH] Only remove excluded materials that were added Contributes to issue CURA-6600. --- cura/Machines/QualityManager.py | 11 ----------- cura/Machines/VariantNode.py | 3 ++- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/cura/Machines/QualityManager.py b/cura/Machines/QualityManager.py index a13b3e1f57..a4386dde74 100644 --- a/cura/Machines/QualityManager.py +++ b/cura/Machines/QualityManager.py @@ -67,17 +67,6 @@ class QualityManager(QObject): self._update_timer.timeout.connect(self._updateMaps) def initialize(self) -> None: - container_tree = ContainerTree() - for machine_id, machine in container_tree.machines.items(): - print("--", machine_id) - for variant_name, variant in machine.variants.items(): - print("-- --", variant_name) - for material_base_file, material in variant.materials.items(): - print("-- -- --", material_base_file) - for quality_id, quality in material.qualities.items(): - print("-- -- -- --", quality_id) - for intent_id in quality.intents: - print("-- -- -- -- --", intent_id) # Initialize the lookup tree for quality profiles with following structure: # -> -> -> diff --git a/cura/Machines/VariantNode.py b/cura/Machines/VariantNode.py index ca3bfc9624..a29a3b6aa9 100644 --- a/cura/Machines/VariantNode.py +++ b/cura/Machines/VariantNode.py @@ -47,7 +47,8 @@ class VariantNode(ContainerNode): materials = materials_per_base_file.values() for excluded_material in self.machine.exclude_materials: - del materials[excluded_material] + if excluded_material in materials: + del materials[excluded_material] for material in materials: base_file = material["base_file"]