3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-10 00:07:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '2.3' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Jaime van Kessel 2016-10-16 13:16:21 +02:00
commit 87fc0db543
8 changed files with 27 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
cura/Settings/MachineManager.py
View file

@ -514,6 +514,17 @@ class MachineManager(QObject):
return quality.getId()
return ""
@pyqtProperty(str, notify=activeQualityChanged)
def globalQualityId(self):
if self._global_container_stack:
quality = self._global_container_stack.findContainer({"type": "quality_changes"})
if quality and quality != self._empty_quality_changes_container:
return quality.getId()
quality = self._global_container_stack.findContainer({"type": "quality"})
if quality:
return quality.getId()
return ""
@pyqtProperty(str, notify = activeQualityChanged)
def activeQualityType(self):
if self._active_container_stack: