From 92389365b693b27f99782c154c3b3a0888bd1cab Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 21 Sep 2016 16:36:45 +0200 Subject: [PATCH] If a machine inherits qualities, it tries to select the correct variant ID's as well CURA-2424 --- cura/Settings/MachineManager.py | 7 +++---- resources/qml/Menus/NozzleMenu.qml | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 450e7606b9..ec8b423007 100644 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -860,14 +860,13 @@ class MachineManager(QObject): def _updateVariantContainer(self, definition): if not definition.getMetaDataEntry("has_variants"): return self._empty_variant_container - + machine_definition_id = UM.Application.getInstance().getMachineManager().getQualityDefinitionId(definition) containers = [] preferred_variant = definition.getMetaDataEntry("preferred_variant") if preferred_variant: - containers = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(type = "variant", definition = definition.id, id = preferred_variant) - + containers = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(type = "variant", definition = machine_definition_id, id = preferred_variant) if not containers: - containers = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(type = "variant", definition = definition.id) + containers = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(type = "variant", definition = machine_definition_id) if containers: return containers[0] diff --git a/resources/qml/Menus/NozzleMenu.qml b/resources/qml/Menus/NozzleMenu.qml index f377690219..44f8cc8c85 100644 --- a/resources/qml/Menus/NozzleMenu.qml +++ b/resources/qml/Menus/NozzleMenu.qml @@ -52,7 +52,7 @@ Menu filter: { "type": "variant", - "definition": Cura.MachineManager.activeDefinitionId //Only show variants of this machine + "definition": Cura.MachineManager.activeQualityDefinitionId //Only show variants of this machine } } MenuItem {