diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 27d8fbbc78..b5d43ba8a1 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1764,14 +1764,21 @@ class MachineManager(QObject): global_stack = self._application.getGlobalContainerStack() return global_stack is None or global_stack.qualityChanges != empty_quality_changes_container - @pyqtProperty(str, notify = activeQualityGroupChanged) - def activeQualityOrQualityChangesName(self) -> str: + def activeQualityOrQualityChanges(self) -> GlobalStack: global_container_stack = self._application.getGlobalContainerStack() if not global_container_stack: - return empty_quality_container.getName() + return empty_quality_container if global_container_stack.qualityChanges != empty_quality_changes_container: - return global_container_stack.qualityChanges.getName() - return global_container_stack.quality.getName() + return global_container_stack.qualityChanges + return global_container_stack.quality + + @pyqtProperty(str, notify = activeQualityGroupChanged) + def activeQualityOrQualityChangesName(self) -> str: + return self.activeQualityOrQualityChanges().getName() + + @pyqtProperty(str, notify = activeQualityGroupChanged) + def activeQualityOrQualityChangesId(self) -> str: + return self.activeQualityOrQualityChanges().getId() @pyqtProperty(bool, notify = activeQualityGroupChanged) def hasNotSupportedQuality(self) -> bool: diff --git a/plugins/UFPWriter/UFPWriter.py b/plugins/UFPWriter/UFPWriter.py index d7671d02c8..f328bb2b11 100644 --- a/plugins/UFPWriter/UFPWriter.py +++ b/plugins/UFPWriter/UFPWriter.py @@ -227,6 +227,7 @@ class UFPWriter(MeshWriter): }, "intent": machine_manager.activeIntentCategory, "quality": machine_manager.activeQualityOrQualityChangesName, + "quality_type": machine_manager.activeQualityOrQualityChangesId, } global_stack = cast(GlobalStack, Application.getInstance().getGlobalContainerStack())