3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-30 22:31:21 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Added quality type to setting stack

Browse source 
CURA-1278
This commit is contained in:
Jaime van Kessel 2016-05-17 10:39:10 +02:00
parent d1d2e1cea7
commit 9bfe31aeef
1 changed files with 17 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

17
cura/MachineManagerModel.py
View file

@ -13,10 +13,12 @@ class MachineManagerModel(QObject):
## When the global container is changed, active material probably needs to be updated. ## When the global container is changed, active material probably needs to be updated.
self.globalContainerChanged.connect(self.activeMaterialChanged) self.globalContainerChanged.connect(self.activeMaterialChanged)
self.globalContainerChanged.connect(self.activeVariantChanged) self.globalContainerChanged.connect(self.activeVariantChanged)
self.globalContainerChanged.connect(self.activeQualityChanged)
Preferences.getInstance().addPreference("cura/active_machine", "") Preferences.getInstance().addPreference("cura/active_machine", "")
active_machine_id = Preferences.getInstance().getValue("cura/active_machine") active_machine_id = Preferences.getInstance().getValue("cura/active_machine")
if active_machine_id != "": if active_machine_id != "":
# An active machine was saved, so restore it. # An active machine was saved, so restore it.
self.setActiveMachine(active_machine_id) self.setActiveMachine(active_machine_id)
@ -26,6 +28,7 @@ class MachineManagerModel(QObject):
globalContainerChanged = pyqtSignal() globalContainerChanged = pyqtSignal()
activeMaterialChanged = pyqtSignal() activeMaterialChanged = pyqtSignal()
activeVariantChanged = pyqtSignal() activeVariantChanged = pyqtSignal()
activeQualityChanged = pyqtSignal()
def _onGlobalContainerChanged(self): def _onGlobalContainerChanged(self):
Preferences.getInstance().setValue("cura/active_machine", Application.getInstance().getGlobalContainerStack().getId()) Preferences.getInstance().setValue("cura/active_machine", Application.getInstance().getGlobalContainerStack().getId())
@ -38,6 +41,8 @@ class MachineManagerModel(QObject):
self.activeMaterialChanged.emit() self.activeMaterialChanged.emit()
elif container_type == "variant": elif container_type == "variant":
self.activeVariantChanged.emit() self.activeVariantChanged.emit()
elif container_type == "quality":
self.activeQualityChanged.emit()
@pyqtSlot(str) @pyqtSlot(str)
def setActiveMachine(self, stack_id): def setActiveMachine(self, stack_id):
@ -99,6 +104,18 @@ class MachineManagerModel(QObject):
if material: if material:
return material.getId() return material.getId()
@pyqtProperty(str, notify=activeQualityChanged)
def activeQualityName(self):
quality = Application.getInstance().getGlobalContainerStack().findContainer({"type": "quality"})
if quality:
return quality.getName()
@pyqtProperty(str, notify=activeQualityChanged)
def activeQualityId(self):
quality = Application.getInstance().getGlobalContainerStack().findContainer({"type": "quality"})
if quality:
return quality.getId()
@pyqtSlot(str) @pyqtSlot(str)
def setActiveMaterial(self, material_id): def setActiveMaterial(self, material_id):
containers = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(id=material_id) containers = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(id=material_id)