Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Prado Gesto <d.pradogesto@ultimaker.com>2018-03-12 12:45:49 +0300
committerDiego Prado Gesto <d.pradogesto@ultimaker.com>2018-03-12 12:45:49 +0300
commit9613103591897cb436b140270136507650be8646 (patch)
treeb6e2b1425cac57fdc43c5a68ff93ecc05efed71a /plugins/MonitorStage
parent85d6919ce6ed7b04f793be247f0d62456f65f751 (diff)
CURA-4870 Remove Monitor stage status icons
Diffstat (limited to 'plugins/MonitorStage')
-rw-r--r--plugins/MonitorStage/MonitorStage.py63
1 files changed, 0 insertions, 63 deletions
diff --git a/plugins/MonitorStage/MonitorStage.py b/plugins/MonitorStage/MonitorStage.py
index 1a1d37cbdf..ed84a8d2ce 100644
--- a/plugins/MonitorStage/MonitorStage.py
+++ b/plugins/MonitorStage/MonitorStage.py
@@ -22,14 +22,7 @@ class MonitorStage(CuraStage):
def _setActivePrintJob(self, print_job):
if self._active_print_job != print_job:
- if self._active_print_job:
- self._active_print_job.stateChanged.disconnect(self._updateIconSource)
self._active_print_job = print_job
- if self._active_print_job:
- self._active_print_job.stateChanged.connect(self._updateIconSource)
-
- # Ensure that the right icon source is returned.
- self._updateIconSource()
def _setActivePrinter(self, printer):
if self._active_printer != printer:
@@ -43,9 +36,6 @@ class MonitorStage(CuraStage):
else:
self._setActivePrintJob(None)
- # Ensure that the right icon source is returned.
- self._updateIconSource()
-
def _onActivePrintJobChanged(self):
self._setActivePrintJob(self._active_printer.activePrintJob)
@@ -58,22 +48,13 @@ class MonitorStage(CuraStage):
new_output_device = Application.getInstance().getMachineManager().printerOutputDevices[0]
if new_output_device != self._printer_output_device:
if self._printer_output_device:
- self._printer_output_device.acceptsCommandsChanged.disconnect(self._updateIconSource)
- self._printer_output_device.connectionStateChanged.disconnect(self._updateIconSource)
self._printer_output_device.printersChanged.disconnect(self._onActivePrinterChanged)
self._printer_output_device = new_output_device
- self._printer_output_device.acceptsCommandsChanged.connect(self._updateIconSource)
self._printer_output_device.printersChanged.connect(self._onActivePrinterChanged)
- self._printer_output_device.connectionStateChanged.connect(self._updateIconSource)
self._setActivePrinter(self._printer_output_device.activePrinter)
-
- # Force an update of the icon source
- self._updateIconSource()
except IndexError:
- #If index error occurs, then the icon on monitor button also should be updated
- self._updateIconSource()
pass
def _onEngineCreated(self):
@@ -82,7 +63,6 @@ class MonitorStage(CuraStage):
self._onOutputDevicesChanged()
self._updateMainOverlay()
self._updateSidebar()
- self._updateIconSource()
def _updateMainOverlay(self):
main_component_path = os.path.join(PluginRegistry.getInstance().getPluginPath("MonitorStage"), "MonitorMainView.qml")
@@ -92,46 +72,3 @@ class MonitorStage(CuraStage):
# TODO: currently the sidebar component for prepare and monitor stages is the same, this will change with the printer output device refactor!
sidebar_component_path = os.path.join(Resources.getPath(Application.getInstance().ResourceTypes.QmlFiles), "Sidebar.qml")
self.addDisplayComponent("sidebar", sidebar_component_path)
-
- def _updateIconSource(self):
- if Application.getInstance().getTheme() is not None:
- icon_name = self._getActiveOutputDeviceStatusIcon()
- self.setIconSource(Application.getInstance().getTheme().getIcon(icon_name))
-
- ## Find the correct status icon depending on the active output device state
- def _getActiveOutputDeviceStatusIcon(self):
- # We assume that you are monitoring the device with the highest priority.
- try:
- output_device = Application.getInstance().getMachineManager().printerOutputDevices[0]
- except IndexError:
- return "tab_status_unknown"
-
- if not output_device.acceptsCommands:
- return "tab_status_unknown"
-
- if output_device.activePrinter is None:
- return "tab_status_connected"
-
- # TODO: refactor to use enum instead of hardcoded strings?
- if output_device.activePrinter.state == "maintenance":
- return "tab_status_busy"
-
- if output_device.activePrinter.activePrintJob is None:
- return "tab_status_connected"
-
- if output_device.activePrinter.activePrintJob.state in ["printing", "pre_print", "pausing", "resuming"]:
- return "tab_status_busy"
-
- if output_device.activePrinter.activePrintJob.state == "wait_cleanup":
- return "tab_status_finished"
-
- if output_device.activePrinter.activePrintJob.state in ["ready", ""]:
- return "tab_status_connected"
-
- if output_device.activePrinter.activePrintJob.state == "paused":
- return "tab_status_paused"
-
- if output_device.activePrinter.activePrintJob.state == "error":
- return "tab_status_stopped"
-
- return "tab_status_unknown"