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

WIP: Fix default buildplate lookup

Browse source
This commit is contained in:
Lipu Fei 2018-02-20 11:25:42 +01:00
parent c432d4ffbb
commit fa37a48caa
1 changed files with 29 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

43
cura/Settings/CuraStackBuilder.py
View file

@ -1,16 +1,17 @@
# Copyright (c) 2018 Ultimaker B.V. # Copyright (c) 2018 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher. # Cura is released under the terms of the LGPLv3 or higher.
from UM.Logger import Logger from typing import Optional
from UM.Logger import Logger
from UM.Settings.Interfaces import DefinitionContainerInterface from UM.Settings.Interfaces import DefinitionContainerInterface
from UM.Settings.InstanceContainer import InstanceContainer from UM.Settings.InstanceContainer import InstanceContainer
from UM.Settings.ContainerRegistry import ContainerRegistry from UM.Settings.ContainerRegistry import ContainerRegistry
from UM.Util import parseBool from UM.Util import parseBool
from cura.Machines.VariantManager import VariantType
from .GlobalStack import GlobalStack from .GlobalStack import GlobalStack
from .ExtruderStack import ExtruderStack from .ExtruderStack import ExtruderStack
from typing import Optional
## Contains helper functions to create new machines. ## Contains helper functions to create new machines.
@ -37,18 +38,32 @@ class CuraStackBuilder:
machine_definition = definitions[0] machine_definition = definitions[0]
# get variant container for the global stack
global_variant_container = application.empty_variant_container
if parseBool(machine_definition.getMetaDataEntry("has_variant_buildplates", False)):
global_variant_name = machine_definition.getMetaDataEntry("preferred_variant_buildplate_name")
if global_variant_name:
variant_node = variant_manager.getVariantNode(definition_id, global_variant_name,
variant_type = VariantType.BUILD_PLATE)
if variant_node is None:
raise RuntimeError("Cannot find buildplate variant with definition [%s] and variant name [%s]" %
(definition_id, global_variant_name))
global_variant_container = variant_node.getContainer()
# get variant container for extruders # get variant container for extruders
variant_container = application.empty_variant_container extruder_variant_container = application.empty_variant_container
# Only look for the preferred variant if this machine has variants # Only look for the preferred variant if this machine has variants
variant_name = None extruder_variant_name = None
if parseBool(machine_definition.getMetaDataEntry("has_variants", False)): if parseBool(machine_definition.getMetaDataEntry("has_variants", False)):
variant_name = machine_definition.getMetaDataEntry("preferred_variant_name") extruder_variant_name = machine_definition.getMetaDataEntry("preferred_variant_name")
if variant_name: if extruder_variant_name:
variant_node = variant_manager.getVariantNode(definition_id, variant_name) variant_node = variant_manager.getVariantNode(definition_id, extruder_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 extruder variant with definition [%s] and variant name [%s]" %
variant_container = variant_node.getContainer() (definition_id, extruder_variant_name))
extruder_variant_container = variant_node.getContainer()
# get material container for extruders # get material container for extruders
material_container = application.empty_material_container material_container = application.empty_material_container
@ -58,11 +73,11 @@ class CuraStackBuilder:
approximate_material_diameter = str(round(material_diameter)) approximate_material_diameter = str(round(material_diameter))
root_material_id = machine_definition.getMetaDataEntry("preferred_material") root_material_id = machine_definition.getMetaDataEntry("preferred_material")
root_material_id = material_manager.getRootMaterialIDForDiameter(root_material_id, approximate_material_diameter) root_material_id = material_manager.getRootMaterialIDForDiameter(root_material_id, approximate_material_diameter)
material_node = material_manager.getMaterialNode(definition_id, variant_name, material_diameter, root_material_id) material_node = material_manager.getMaterialNode(definition_id, extruder_variant_name, material_diameter, root_material_id)
# 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 not material_node: if not material_node:
raise RuntimeError("Cannot find material with definition [%s], variant_name [%s], and root_material_id [%s]" % raise RuntimeError("Cannot find material with definition [%s], extruder_variant_name [%s], and root_material_id [%s]" %
(definition_id, variant_name, root_material_id)) (definition_id, extruder_variant_name, root_material_id))
material_container = material_node.getContainer() material_container = material_node.getContainer()
generated_name = registry.createUniqueName("machine", "", name, machine_definition.getName()) generated_name = registry.createUniqueName("machine", "", name, machine_definition.getName())
@ -75,7 +90,7 @@ class CuraStackBuilder:
new_global_stack = cls.createGlobalStack( new_global_stack = cls.createGlobalStack(
new_stack_id = generated_name, new_stack_id = generated_name,
definition = machine_definition, definition = machine_definition,
variant_container = application.empty_variant_container, # TODO: fix for build plate variant_container = global_variant_container,
material_container = application.empty_material_container, material_container = application.empty_material_container,
quality_container = application.empty_quality_container, quality_container = application.empty_quality_container,
) )
@ -99,7 +114,7 @@ class CuraStackBuilder:
extruder_definition = extruder_definition, extruder_definition = extruder_definition,
machine_definition_id = definition_id, machine_definition_id = definition_id,
position = position, position = position,
variant_container = variant_container, variant_container = extruder_variant_container,
material_container = material_container, material_container = material_container,
quality_container = application.empty_quality_container, quality_container = application.empty_quality_container,
global_stack = new_global_stack, global_stack = new_global_stack,