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

Revert "Add quality type to ufp files"

Browse Source 
This reverts commit 7e84082aff26195d82b8d3c9239dee863949c099.
This commit is contained in:
c.lamboo 2022-11-24 22:56:35 +01:00
parent 7e84082aff
commit e8f6786e97
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cura/Settings/MachineManager.py
View File

@ -1764,21 +1764,14 @@ class MachineManager(QObject):
global_stack = self._application.getGlobalContainerStack() global_stack = self._application.getGlobalContainerStack()
return global_stack is None or global_stack.qualityChanges != empty_quality_changes_container 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) @pyqtProperty(str, notify = activeQualityGroupChanged)
def activeQualityOrQualityChangesName(self) -> str: def activeQualityOrQualityChangesName(self) -> str:
return self.activeQualityOrQualityChanges().getName() global_container_stack = self._application.getGlobalContainerStack()
if not global_container_stack:
@pyqtProperty(str, notify = activeQualityGroupChanged) return empty_quality_container.getName()
def activeQualityOrQualityChangesId(self) -> str: if global_container_stack.qualityChanges != empty_quality_changes_container:
return self.activeQualityOrQualityChanges().getId() return global_container_stack.qualityChanges.getName()
return global_container_stack.quality.getName()
@pyqtProperty(bool, notify = activeQualityGroupChanged) @pyqtProperty(bool, notify = activeQualityGroupChanged)
def hasNotSupportedQuality(self) -> bool: def hasNotSupportedQuality(self) -> bool:

1
plugins/UFPWriter/UFPWriter.py
View File

@ -227,7 +227,6 @@ class UFPWriter(MeshWriter):
}, },
"intent": machine_manager.activeIntentCategory, "intent": machine_manager.activeIntentCategory,
"quality": machine_manager.activeQualityOrQualityChangesName, "quality": machine_manager.activeQualityOrQualityChangesName,
"quality_type": machine_manager.activeQualityOrQualityChangesId,
} }
global_stack = cast(GlobalStack, Application.getInstance().getGlobalContainerStack()) global_stack = cast(GlobalStack, Application.getInstance().getGlobalContainerStack())