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

Fix getDefaultVariantNode for UM2

Browse source 
CURA-5790

UM2 has optional variant which depends on whether Olsson Block is
enabled. getDefaultVariantNode() should take that into account.
This commit is contained in:
Lipu Fei 2018-10-03 11:21:03 +02:00
parent 6db1342255
commit c3e7e426ff
3 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
cura/Machines/VariantManager.py
View file

@ -115,17 +115,24 @@ class VariantManager:
# #
# Gets the default variant for the given machine definition. # Gets the default variant for the given machine definition.
# If the optional GlobalStack is given, the metadata information will be fetched from the GlobalStack instead of
# the DefinitionContainer. Because for machines such as UM2, you can enable Olsson Block, which will set
# "has_variants" to True in the GlobalStack. In those cases, we need to fetch metadata from the GlobalStack or
# it may not be correct.
# #
def getDefaultVariantNode(self, machine_definition: "DefinitionContainer", def getDefaultVariantNode(self, machine_definition: "DefinitionContainer",
variant_type: VariantType) -> Optional["ContainerNode"]: variant_type: "VariantType",
global_stack: Optional["GlobalStack"] = None) -> Optional["ContainerNode"]:
machine_definition_id = machine_definition.getId() machine_definition_id = machine_definition.getId()
container_for_metadata_fetching = global_stack if global_stack is not None else machine_definition
preferred_variant_name = None preferred_variant_name = None
if variant_type == VariantType.BUILD_PLATE: if variant_type == VariantType.BUILD_PLATE:
if parseBool(machine_definition.getMetaDataEntry("has_variant_buildplates", False)): if parseBool(container_for_metadata_fetching.getMetaDataEntry("has_variant_buildplates", False)):
preferred_variant_name = machine_definition.getMetaDataEntry("preferred_variant_buildplate_name") preferred_variant_name = container_for_metadata_fetching.getMetaDataEntry("preferred_variant_buildplate_name")
else: else:
if parseBool(machine_definition.getMetaDataEntry("has_variants", False)): if parseBool(container_for_metadata_fetching.getMetaDataEntry("has_variants", False)):
preferred_variant_name = machine_definition.getMetaDataEntry("preferred_variant_name") preferred_variant_name = container_for_metadata_fetching.getMetaDataEntry("preferred_variant_name")
node = None node = None
if preferred_variant_name: if preferred_variant_name:

3
cura/Settings/CuraStackBuilder.py
View file

@ -114,7 +114,8 @@ class CuraStackBuilder:
# get variant container for extruders # get variant container for extruders
extruder_variant_container = application.empty_variant_container extruder_variant_container = application.empty_variant_container
extruder_variant_node = variant_manager.getDefaultVariantNode(global_stack.definition, VariantType.NOZZLE) extruder_variant_node = variant_manager.getDefaultVariantNode(global_stack.definition, VariantType.NOZZLE,
global_stack = global_stack)
extruder_variant_name = None extruder_variant_name = None
if extruder_variant_node: if extruder_variant_node:
extruder_variant_container = extruder_variant_node.getContainer() extruder_variant_container = extruder_variant_node.getContainer()

1
resources/definitions/ultimaker2.def.json
View file

@ -14,6 +14,7 @@
"platform_offset": [9, 0, 0], "platform_offset": [9, 0, 0],
"has_materials": false, "has_materials": false,
"has_machine_quality": true, "has_machine_quality": true,
"preferred_variant_name": "0.4 mm",
"exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "ultimaker_bam", "generic_pva", "ultimaker_pva", "generic_tough_pla", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white"], "exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "ultimaker_bam", "generic_pva", "ultimaker_pva", "generic_tough_pla", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white"],
"first_start_actions": ["UM2UpgradeSelection"], "first_start_actions": ["UM2UpgradeSelection"],
"supported_actions":["UM2UpgradeSelection", "UpgradeFirmware"], "supported_actions":["UM2UpgradeSelection", "UpgradeFirmware"],