GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-29 23:34:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

WIP: Fix for buildplate

Browse Source
This commit is contained in:
Lipu Fei 2018-02-17 15:08:47 +01:00
parent 236bd09d08
commit 1c8f63e47f
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cura/Machines/Models/NozzleModel.py
View File

@ -33,13 +33,13 @@ class NozzleModel(ListModel):
self.setItems([]) self.setItems([])
return return
variant_group_dict = variant_manager.getVariantNodes(active_global_stack) variant_node_dict = variant_manager.getVariantNodes(active_global_stack)
if not variant_group_dict: if not variant_node_dict:
self.setItems([]) self.setItems([])
return return
item_list = [] item_list = []
for hotend_name, container_node in sorted(variant_group_dict.items(), key = lambda i: i[0]): for hotend_name, container_node in sorted(variant_node_dict.items(), key = lambda i: i[0]):
item = {"id": hotend_name, item = {"id": hotend_name,
"hotend_name": hotend_name, "hotend_name": hotend_name,
"container_node": container_node "container_node": container_node

31
cura/Machines/VariantManager.py
View File

@ -1,8 +1,11 @@
# Copyright (c) 2018 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher.
from collections import OrderedDict
from typing import Optional from typing import Optional
from UM.Logger import Logger from UM.Logger import Logger
from UM.Settings.ContainerRegistry import ContainerRegistry from UM.Settings.ContainerRegistry import ContainerRegistry
from UM.Settings.InstanceContainer import InstanceContainer
from cura.Machines.ContainerNode import ContainerNode from cura.Machines.ContainerNode import ContainerNode
from cura.Settings.GlobalStack import GlobalStack from cura.Settings.GlobalStack import GlobalStack
@ -35,7 +38,7 @@ class VariantManager:
def __init__(self, container_registry): def __init__(self, container_registry):
self._container_registry = container_registry # type: ContainerRegistry self._container_registry = container_registry # type: ContainerRegistry
self._machine_to_variant_dict_map = {} # <machine_type> -> <variant_dict> self._machine_to_variant_dict_map = dict() # <machine_type> -> <variant_dict>
self._exclude_variant_id_list = ["empty_variant"] self._exclude_variant_id_list = ["empty_variant"]
@ -44,6 +47,8 @@ class VariantManager:
# - initializing the variant lookup table based on the metadata in ContainerRegistry. # - initializing the variant lookup table based on the metadata in ContainerRegistry.
# #
def initialize(self): def initialize(self):
self._machine_to_variant_dict_map = OrderedDict()
# Cache all variants from the container registry to a variant map for better searching and organization. # Cache all variants from the container registry to a variant map for better searching and organization.
variant_metadata_list = self._container_registry.findContainersMetadata(type = "variant") variant_metadata_list = self._container_registry.findContainersMetadata(type = "variant")
for variant_metadata in variant_metadata_list: for variant_metadata in variant_metadata_list:
@ -54,13 +59,12 @@ class VariantManager:
variant_name = variant_metadata["name"] variant_name = variant_metadata["name"]
variant_definition = variant_metadata["definition"] variant_definition = variant_metadata["definition"]
if variant_definition not in self._machine_to_variant_dict_map: if variant_definition not in self._machine_to_variant_dict_map:
self._machine_to_variant_dict_map[variant_definition] = {} self._machine_to_variant_dict_map[variant_definition] = OrderedDict()
#for variant_type in ALL_VARIANT_TYPES: for variant_type in ALL_VARIANT_TYPES:
# self._machine_to_variant_dict_map[variant_definition][variant_type] = {} self._machine_to_variant_dict_map[variant_definition][variant_type] = dict()
variant_type = variant_metadata["hardware_type"] variant_type = variant_metadata["hardware_type"]
#variant_dict = self._machine_to_variant_dict_map[variant_definition][variant_type] variant_dict = self._machine_to_variant_dict_map[variant_definition][variant_type]
variant_dict = self._machine_to_variant_dict_map[variant_definition]
if variant_name in variant_dict: if variant_name in variant_dict:
# ERROR: duplicated variant name. # ERROR: duplicated variant name.
raise RuntimeError("Found duplicated variant name [%s], type [%s] for machine [%s]" % raise RuntimeError("Found duplicated variant name [%s], type [%s] for machine [%s]" %
@ -72,10 +76,11 @@ 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 getVariantNode(self, machine_type_name: str, variant_name: str, def getVariantNode(self, machine_definition_id: str, variant_name: str,
variant_type: Optional[str] = None) -> Optional["InstanceContainer"]: variant_type: Optional[str] = VariantType.NOZZLE) -> Optional["ContainerNode"]:
return self._machine_to_variant_dict_map[machine_type_name].get(variant_name) return self._machine_to_variant_dict_map[machine_definition_id].get(variant_type, {}).get(variant_name)
def getVariantNodes(self, machine: "GlobalStack"): def getVariantNodes(self, machine: "GlobalStack",
machine_type_name = machine.definition.getId() variant_type: Optional[str] = VariantType.NOZZLE) -> dict:
return self._machine_to_variant_dict_map.get(machine_type_name) machine_definition_id = machine.definition.getId()
return self._machine_to_variant_dict_map[machine_definition_id].get(variant_type, {})