diff --git a/cura/Machines/VariantManager.py b/cura/Machines/VariantManager.py index 1f9f0288ac..555dfec4a3 100644 --- a/cura/Machines/VariantManager.py +++ b/cura/Machines/VariantManager.py @@ -72,8 +72,8 @@ class VariantManager: # Gets the variant InstanceContainer with the given information. # Almost the same as getVariantMetadata() except that this returns an InstanceContainer if present. # - def getVariant(self, machine_type_name: str, variant_name: str, - variant_type: Optional[str] = None) -> Optional["InstanceContainer"]: + def getVariantNode(self, machine_type_name: str, variant_name: str, + variant_type: Optional[str] = None) -> Optional["InstanceContainer"]: return self._machine_to_variant_dict_map[machine_type_name].get(variant_name) def getVariantNodes(self, machine: "GlobalStack"): diff --git a/cura/Settings/CuraStackBuilder.py b/cura/Settings/CuraStackBuilder.py index c50b034471..c396a4a2be 100644 --- a/cura/Settings/CuraStackBuilder.py +++ b/cura/Settings/CuraStackBuilder.py @@ -44,7 +44,7 @@ class CuraStackBuilder: if parseBool(machine_definition.getMetaDataEntry("has_variants", False)): variant_name = machine_definition.getMetaDataEntry("preferred_variant_name") if variant_name: - variant_node = variant_manager.getVariant(definition_id, variant_name) + variant_node = variant_manager.getVariantNode(definition_id, variant_name) # Sanity check. If you see this error, the related definition files should be fixed. if variant_node is None: raise RuntimeError("Cannot find variant with definition [%s] and variant name [%s]" % (definition_id, variant_name)) diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index 54aaedb8f9..36a7733568 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -592,10 +592,9 @@ class XmlMaterialProfile(InstanceContainer): from cura.Machines.VariantManager import VariantType variant_manager = CuraApplication.getInstance().getVariantManager() - variant_node = variant_manager.getVariant(machine_id, VariantType.BUILD_PLATE, buildplate_id) + variant_node = variant_manager.getVariantNode(machine_id, buildplate_id) if not variant_node: continue - variant_metadata = variant_node.metadata # TODO: check if build plate variant exists @@ -623,7 +622,7 @@ class XmlMaterialProfile(InstanceContainer): continue variant_manager = CuraApplication.getInstance().getVariantManager() - variant_node = variant_manager.getVariant(machine_id, hotend_name) + variant_node = variant_manager.getVariantNode(machine_id, hotend_name) if not variant_node: continue