3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 14:04:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Set stage icon for monitor depending on output device state, prevent crash when accessing back-end from unloaded component

Browse source
This commit is contained in:
ChrisTerBeke 2017-12-07 10:38:06 +01:00
parent dd92d8d5e0
commit f91a4db617
3 changed files with 38 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

75
plugins/MonitorStage/MonitorStage.py
View file

@ -16,7 +16,8 @@ class MonitorStage(CuraStage):
# Wait until QML engine is created, otherwise creating the new QML components will fail
Application.getInstance().engineCreatedSignal.connect(self._setComponents)
# TODO: connect output device state to icon source
# Update the status icon when the output device is changed
Application.getInstance().getOutputDeviceManager().activeDeviceChanged.connect(self._setIconSource)
def _setComponents(self):
self._setMainOverlay()
@ -34,41 +35,39 @@ class MonitorStage(CuraStage):
def _setIconSource(self):
if Application.getInstance().getTheme() is not None:
self.setIconSource(Application.getInstance().getTheme().getIcon("tab_status_connected"))
icon_name = self._getActiveOutputDeviceStatusIcon()
self.setIconSource(Application.getInstance().getTheme().getIcon(icon_name))
# property string iconSource:
# // {
# // if (!printerConnected)
# // {
# // return UM.Theme.getIcon("tab_status_unknown");
# // }
# // else if (!printerAcceptsCommands)
# // {
# // return UM.Theme.getIcon("tab_status_unknown");
# // }
# //
# // if (Cura.MachineManager.printerOutputDevices[0].printerState == "maintenance")
# // {
# // return UM.Theme.getIcon("tab_status_busy");
# // }
# //
# // switch (Cura.MachineManager.printerOutputDevices[0].jobState)
# // {
# // case "printing":
# // case "pre_print":
# // case "pausing":
# // case "resuming":
# // return UM.Theme.getIcon("tab_status_busy");
# // case "wait_cleanup":
# // return UM.Theme.getIcon("tab_status_finished");
# // case "ready":
# // case "":
# // return UM.Theme.getIcon("tab_status_connected")
# // case "paused":
# // return UM.Theme.getIcon("tab_status_paused")
# // case "error":
# // return UM.Theme.getIcon("tab_status_stopped")
# // default:
# // return UM.Theme.getIcon("tab_status_unknown")
# // }
# // }
## Find the correct status icon depending on the active output device state
def _getActiveOutputDeviceStatusIcon(self):
output_device = Application.getInstance().getOutputDeviceManager().getActiveDevice()
if not output_device:
return "tab_status_unknown"
if hasattr(output_device, "acceptsCommands") and not output_device.acceptsCommands:
return "tab_status_unknown"
if not hasattr(output_device, "printerState") or not hasattr(output_device, "jobState"):
return "tab_status_unknown"
# TODO: refactor to use enum instead of hardcoded strings?
if output_device.printerState == "maintenance":
return "tab_status_busy"
if output_device.jobState in ["printing", "pre_print", "pausing", "resuming"]:
return "tab_status_busy"
if output_device.jobState == "wait_cleanup":
return "tab_status_finished"
if output_device.jobState in ["ready", ""]:
return "tab_status_connected"
if output_device.jobState == "paused":
return "tab_status_paused"
if output_device.jobState == "error":
return "tab_status_stopped"
return "tab_status_unknown"

2
resources/qml/Cura.qml
View file

@ -378,7 +378,6 @@ UM.MainWindow
z: 1
source: UM.Controller.activeStage.sidebarComponent
asynchronous: true
}
Loader
@ -402,7 +401,6 @@ UM.MainWindow
}
source: UM.Controller.activeStage.mainComponent
asynchronous: true
}
UM.MessageStack

2
resources/qml/SaveButton.qml
View file

@ -46,7 +46,7 @@ Item {
}
function sliceOrStopSlicing() {
if ([1, 5].indexOf(UM.Backend.state) != -1) {
if (backend != "undefined" && [1, 5].indexOf(UM.Backend.state) != -1) {
backend.forceSlice();
} else {
backend.stopSlicing();