From 1bd287f8885ed7a8e23aa50b45454bd4a54e29e3 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 12 Aug 2019 16:36:43 +0200 Subject: [PATCH] Move getting variant manager out of the loop This mostly just makes it easier for me to debug where the manager is obtained from the deprecated singleton signal. Contributes to issue CURA-6600. --- plugins/XmlMaterialProfile/XmlMaterialProfile.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index 241d1a954f..3e02f660d1 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -608,6 +608,7 @@ class XmlMaterialProfile(InstanceContainer): # Map machine human-readable names to IDs product_id_map = self.getProductIdMap() + variant_manager = CuraApplication.getInstance().getVariantManager() machines = data.iterfind("./um:settings/um:machine", self.__namespaces) for machine in machines: machine_compatibility = common_compatibility @@ -702,7 +703,6 @@ class XmlMaterialProfile(InstanceContainer): if buildplate_id is None: continue - variant_manager = CuraApplication.getInstance().getVariantManager() variant_node = variant_manager.getVariantNode(machine_id, buildplate_id, variant_type = VariantType.BUILD_PLATE) if not variant_node: @@ -725,7 +725,6 @@ class XmlMaterialProfile(InstanceContainer): if hotend_name is None: continue - variant_manager = CuraApplication.getInstance().getVariantManager() variant_node = variant_manager.getVariantNode(machine_id, hotend_name, VariantType.NOZZLE) if not variant_node: continue @@ -777,7 +776,6 @@ class XmlMaterialProfile(InstanceContainer): if buildplate_name is None: continue - variant_manager = CuraApplication.getInstance().getVariantManager() variant_node = variant_manager.getVariantNode(machine_id, buildplate_name, VariantType.BUILD_PLATE) if not variant_node: continue