Browse Source

Add quality type to ufp files

Cura-9773
c.lamboo 2 years ago
parent
commit
7e84082aff
2 changed files with 13 additions and 5 deletions
  1. 12 5
      cura/Settings/MachineManager.py
  2. 1 0
      plugins/UFPWriter/UFPWriter.py

+ 12 - 5
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:

+ 1 - 0
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())