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

WIP: Rename function to getVariantNode()

Browse source
This commit is contained in:
Lipu Fei 2018-02-14 21:48:04 +01:00
parent df1d2f137b
commit 4af176dbf3
3 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cura/Machines/VariantManager.py
View file

@ -72,8 +72,8 @@ class VariantManager:
# Gets the variant InstanceContainer with the given information. # Gets the variant InstanceContainer with the given information.
# Almost the same as getVariantMetadata() except that this returns an InstanceContainer if present. # Almost the same as getVariantMetadata() except that this returns an InstanceContainer if present.
# #
def getVariant(self, machine_type_name: str, variant_name: str, def getVariantNode(self, machine_type_name: str, variant_name: str,
variant_type: Optional[str] = None) -> Optional["InstanceContainer"]: variant_type: Optional[str] = None) -> Optional["InstanceContainer"]:
return self._machine_to_variant_dict_map[machine_type_name].get(variant_name) return self._machine_to_variant_dict_map[machine_type_name].get(variant_name)
def getVariantNodes(self, machine: "GlobalStack"): def getVariantNodes(self, machine: "GlobalStack"):

2
cura/Settings/CuraStackBuilder.py
View file

@ -44,7 +44,7 @@ class CuraStackBuilder:
if parseBool(machine_definition.getMetaDataEntry("has_variants", False)): if parseBool(machine_definition.getMetaDataEntry("has_variants", False)):
variant_name = machine_definition.getMetaDataEntry("preferred_variant_name") variant_name = machine_definition.getMetaDataEntry("preferred_variant_name")
if 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. # Sanity check. If you see this error, the related definition files should be fixed.
if variant_node is None: if variant_node is None:
raise RuntimeError("Cannot find variant with definition [%s] and variant name [%s]" % (definition_id, variant_name)) raise RuntimeError("Cannot find variant with definition [%s] and variant name [%s]" % (definition_id, variant_name))

5
plugins/XmlMaterialProfile/XmlMaterialProfile.py
View file

@ -592,10 +592,9 @@ class XmlMaterialProfile(InstanceContainer):
from cura.Machines.VariantManager import VariantType from cura.Machines.VariantManager import VariantType
variant_manager = CuraApplication.getInstance().getVariantManager() 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: if not variant_node:
continue continue
variant_metadata = variant_node.metadata
# TODO: check if build plate variant exists # TODO: check if build plate variant exists
@ -623,7 +622,7 @@ class XmlMaterialProfile(InstanceContainer):
continue continue
variant_manager = CuraApplication.getInstance().getVariantManager() 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: if not variant_node:
continue continue