3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Move getting variant manager out of the loop

Browse source 
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.
This commit is contained in:
Ghostkeeper 2019-08-12 16:36:43 +02:00
parent b1fb843f09
commit 1bd287f888
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
1 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/XmlMaterialProfile/XmlMaterialProfile.py
View file

@ -608,6 +608,7 @@ class XmlMaterialProfile(InstanceContainer):
# Map machine human-readable names to IDs # Map machine human-readable names to IDs
product_id_map = self.getProductIdMap() product_id_map = self.getProductIdMap()
variant_manager = CuraApplication.getInstance().getVariantManager()
machines = data.iterfind("./um:settings/um:machine", self.__namespaces) machines = data.iterfind("./um:settings/um:machine", self.__namespaces)
for machine in machines: for machine in machines:
machine_compatibility = common_compatibility machine_compatibility = common_compatibility
@ -702,7 +703,6 @@ class XmlMaterialProfile(InstanceContainer):
if buildplate_id is None: if buildplate_id is None:
continue continue
variant_manager = CuraApplication.getInstance().getVariantManager()
variant_node = variant_manager.getVariantNode(machine_id, buildplate_id, variant_node = variant_manager.getVariantNode(machine_id, buildplate_id,
variant_type = VariantType.BUILD_PLATE) variant_type = VariantType.BUILD_PLATE)
if not variant_node: if not variant_node:
@ -725,7 +725,6 @@ class XmlMaterialProfile(InstanceContainer):
if hotend_name is None: if hotend_name is None:
continue continue
variant_manager = CuraApplication.getInstance().getVariantManager()
variant_node = variant_manager.getVariantNode(machine_id, hotend_name, VariantType.NOZZLE) variant_node = variant_manager.getVariantNode(machine_id, hotend_name, VariantType.NOZZLE)
if not variant_node: if not variant_node:
continue continue
@ -777,7 +776,6 @@ class XmlMaterialProfile(InstanceContainer):
if buildplate_name is None: if buildplate_name is None:
continue continue
variant_manager = CuraApplication.getInstance().getVariantManager()
variant_node = variant_manager.getVariantNode(machine_id, buildplate_name, VariantType.BUILD_PLATE) variant_node = variant_manager.getVariantNode(machine_id, buildplate_name, VariantType.BUILD_PLATE)
if not variant_node: if not variant_node:
continue continue