GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 21:25:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

If a machine inherits qualities, it tries to select the correct variant ID's as well

Browse Source 
CURA-2424
This commit is contained in:
Jaime van Kessel 2016-09-21 16:36:45 +02:00
parent b7351a56e4
commit 92389365b6
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cura/Settings/MachineManager.py
View File

@ -860,14 +860,13 @@ class MachineManager(QObject):
def _updateVariantContainer(self, definition): def _updateVariantContainer(self, definition):
if not definition.getMetaDataEntry("has_variants"): if not definition.getMetaDataEntry("has_variants"):
return self._empty_variant_container return self._empty_variant_container
machine_definition_id = UM.Application.getInstance().getMachineManager().getQualityDefinitionId(definition)
containers = [] containers = []
preferred_variant = definition.getMetaDataEntry("preferred_variant") preferred_variant = definition.getMetaDataEntry("preferred_variant")
if 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: 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: if containers:
return containers[0] return containers[0]

2
resources/qml/Menus/NozzleMenu.qml
View File

@ -52,7 +52,7 @@ Menu
filter: filter:
{ {
"type": "variant", "type": "variant",
"definition": Cura.MachineManager.activeDefinitionId //Only show variants of this machine "definition": Cura.MachineManager.activeQualityDefinitionId //Only show variants of this machine
} }
} }
MenuItem { MenuItem {