From d3dc36c1878398f0c61627db103e55701bab73cb Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 6 Aug 2019 16:19:30 +0200 Subject: [PATCH] Find quality nodes as subnodes of material nodes Similar to the materials and variants. Contributes to issue CURA-6600. --- cura/Machines/MachineNode.py | 4 +++- cura/Machines/MaterialNode.py | 35 ++++++++++++++++++++++++++++++++++- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index 77b16def00..5423e44cfb 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -21,7 +21,9 @@ class MachineNode(ContainerNode): self.variants = {} # type: Dict[str, VariantNode] # mapping variant names to their nodes. container_registry = ContainerRegistry.getInstance() my_metadata = container_registry.findContainersMetadata(id = container_id)[0] - self.has_machine_materials = parseBool(my_metadata.get("has_machine_materials", "true")) + self.has_machine_materials = parseBool(my_metadata.get("has_machine_materials", "false")) + self.has_machine_quality = parseBool(my_metadata.get("has_machine_quality", "false")) + self.quality_definition = my_metadata.get("quality_definition", container_id) self.exclude_materials = my_metadata.get("exclude_materials", []) container_registry.containerAdded.connect(self._variantAdded) self._loadAll() diff --git a/cura/Machines/MaterialNode.py b/cura/Machines/MaterialNode.py index 2ac063c977..9008e9759b 100644 --- a/cura/Machines/MaterialNode.py +++ b/cura/Machines/MaterialNode.py @@ -3,6 +3,8 @@ from typing import TYPE_CHECKING +from UM.Settings.ContainerRegistry import ContainerRegistry +from UM.Settings.Interfaces import ContainerInterface from cura.Machines.ContainerNode import ContainerNode from cura.Machines.QualityNode import QualityNode from cura.Machines.VariantNode import VariantNode @@ -16,4 +18,35 @@ if TYPE_CHECKING: class MaterialNode(ContainerNode): def __init__(self, container_id, parent: VariantNode) -> None: super().__init__(container_id, parent) - self.qualities = {} # type: Dict[str, QualityNode] # Mapping container IDs to quality profiles. \ No newline at end of file + self.qualities = {} # type: Dict[str, QualityNode] # Mapping container IDs to quality profiles. + container_registry = ContainerRegistry.getInstance() + my_metadata = container_registry.findContainersMetadata(id = container_id)[0] + self.base_file = my_metadata["base_file"] + container_registry.containerAdded.connect(self._qualityAdded) + self._loadAll() + + def _loadAll(self) -> None: + container_registry = ContainerRegistry.getInstance() + # Find all quality profiles that fit on this material. + if not self.parent.parent.has_machine_quality: # Need to find the global qualities. + qualities = container_registry.findInstanceContainersMetadata(type = "quality", definition = "fdmprinter") + else: + qualities = container_registry.findInstanceContainersMetadata(type = "quality", definition = self.parent.parent.quality_definition, variant = self.parent.variant_name, material = self.base_file) + + for quality in qualities: + quality_id = quality["id"] + if quality_id not in self.qualities: + self.qualities[quality_id] = QualityNode(quality_id, parent = self) + + def _qualityAdded(self, container: ContainerInterface) -> None: + if container.getMetaDataEntry("type") != "quality": + return # Not interested. + if not self.parent.parent.has_machine_quality: + if container.getMetaDataEntry("definition") != "fdmprinter": + return # Only want global qualities. + else: + if container.getMetaDataEntry("definition") != self.parent.parent.quality_definition or container.getMetaDataEntry("variant") != self.parent.variant_name or container.getMetaDataEntry("material") != self.base_file: + return # Doesn't match our configuration. + + quality_id = container.getId() + self.qualities[quality_id] = QualityNode(quality_id, parent = self) \ No newline at end of file