From a8b818fbdc14d8205e8d91f6236f1361746f37ee Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 29 Aug 2019 13:52:01 +0200 Subject: [PATCH] Ensure that right intents are added to the tree CURA-6598 --- cura/Machines/IntentNode.py | 5 ++++- cura/Machines/QualityNode.py | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cura/Machines/IntentNode.py b/cura/Machines/IntentNode.py index 232498536c..521e7f2e38 100644 --- a/cura/Machines/IntentNode.py +++ b/cura/Machines/IntentNode.py @@ -3,6 +3,7 @@ from typing import TYPE_CHECKING +from UM.Settings.ContainerRegistry import ContainerRegistry from cura.Machines.ContainerNode import ContainerNode if TYPE_CHECKING: @@ -14,4 +15,6 @@ if TYPE_CHECKING: class IntentNode(ContainerNode): def __init__(self, container_id: str, quality: "QualityNode") -> None: super().__init__(container_id) - self.quality = quality \ No newline at end of file + self.quality = quality + my_metadata = ContainerRegistry.getInstance().findContainersMetadata(id=container_id)[0] + self.intent_category = my_metadata.get("intent_category", "default") \ No newline at end of file diff --git a/cura/Machines/QualityNode.py b/cura/Machines/QualityNode.py index 451c8babfb..7980f4ed63 100644 --- a/cura/Machines/QualityNode.py +++ b/cura/Machines/QualityNode.py @@ -31,8 +31,8 @@ class QualityNode(ContainerNode): # Find all intent profiles that fit the current configuration. from cura.Machines.MachineNode import MachineNode if not isinstance(self.parent, MachineNode): # Not a global profile. - for intent in container_registry.findInstanceContainersMetadata(type = "intent", definition = self.parent.variant.machine.quality_definition, variant = self.parent.variant.variant_name, material = self.parent.base_file): + for intent in container_registry.findInstanceContainersMetadata(type = "intent", definition = self.parent.variant.machine.quality_definition, variant = self.parent.variant.variant_name, material = self.parent.base_file, quality_type = self.quality_type): self.intents[intent["id"]] = IntentNode(intent["id"], quality = self) - if not self.intents: - self.intents["empty_intent"] = IntentNode("empty_intent", quality = self) + + self.intents["empty_intent"] = IntentNode("empty_intent", quality = self) # Otherwise, there are no intents for global profiles. \ No newline at end of file