From e8f6786e972898ed715ce63015c91bf86faafd94 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Thu, 24 Nov 2022 22:56:35 +0100 Subject: [PATCH] Revert "Add quality type to ufp files" This reverts commit 7e84082aff26195d82b8d3c9239dee863949c099. --- cura/Settings/MachineManager.py | 19 ++++++------------- plugins/UFPWriter/UFPWriter.py | 1 - 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index b5d43ba8a1..27d8fbbc78 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1764,21 +1764,14 @@ class MachineManager(QObject): global_stack = self._application.getGlobalContainerStack() return global_stack is None or global_stack.qualityChanges != empty_quality_changes_container - def activeQualityOrQualityChanges(self) -> GlobalStack: - global_container_stack = self._application.getGlobalContainerStack() - if not global_container_stack: - return empty_quality_container - if global_container_stack.qualityChanges != empty_quality_changes_container: - 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() + global_container_stack = self._application.getGlobalContainerStack() + if not global_container_stack: + return empty_quality_container.getName() + if global_container_stack.qualityChanges != empty_quality_changes_container: + return global_container_stack.qualityChanges.getName() + return global_container_stack.quality.getName() @pyqtProperty(bool, notify = activeQualityGroupChanged) def hasNotSupportedQuality(self) -> bool: diff --git a/plugins/UFPWriter/UFPWriter.py b/plugins/UFPWriter/UFPWriter.py index f328bb2b11..d7671d02c8 100644 --- a/plugins/UFPWriter/UFPWriter.py +++ b/plugins/UFPWriter/UFPWriter.py @@ -227,7 +227,6 @@ class UFPWriter(MeshWriter): }, "intent": machine_manager.activeIntentCategory, "quality": machine_manager.activeQualityOrQualityChangesName, - "quality_type": machine_manager.activeQualityOrQualityChangesId, } global_stack = cast(GlobalStack, Application.getInstance().getGlobalContainerStack())