From f395c92732f3ee5680b80b90d72372023240bb92 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Wed, 25 Sep 2019 08:28:21 +0200 Subject: [PATCH] Fix custom profile menu CURA-6599 --- cura/Machines/QualityChangesGroup.py | 8 +++++++- .../PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml | 5 ++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/cura/Machines/QualityChangesGroup.py b/cura/Machines/QualityChangesGroup.py index f2bb0f737d..cd88368e2a 100644 --- a/cura/Machines/QualityChangesGroup.py +++ b/cura/Machines/QualityChangesGroup.py @@ -1,9 +1,11 @@ # Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from PyQt5.QtCore import QObject from typing import Any, Dict, Optional +from PyQt5.QtCore import QObject, pyqtSlot + + ## Data struct to group several quality changes instance containers together. # # Each group represents one "custom profile" as the user sees it, which @@ -20,5 +22,9 @@ class QualityChangesGroup(QObject): self.metadata_for_global = {} # type: Dict[str, Any] self.metadata_per_extruder = {} # type: Dict[int, Dict[str, Any]] + @pyqtSlot(result = str) + def getName(self) -> str: + return self.name + def __str__(self) -> str: return "{class_name}[{name}, available = {is_available}]".format(class_name = self.__class__.__name__, name = self.name, is_available = self.is_available) diff --git a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml index 2d5f880344..5ebf653332 100644 --- a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml +++ b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml @@ -163,7 +163,6 @@ Popup //Add all the custom profiles. Repeater { - visible: false model: Cura.CustomQualityProfilesDropDownMenuModel MenuButton { @@ -172,8 +171,8 @@ Popup width: parent.width checkable: true visible: model.available - text: model.name + " - " + model.layer_height + " mm" - checked: Cura.MachineManager.activeQualityChangesGroup == model.quality_changes_group + text: model.name + checked: Cura.MachineManager.activeQualityChangesGroup.getName() == model.quality_changes_group.getName() ButtonGroup.group: buttonGroup } }