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

NetworkPrinter now uses printerState to store global state

Browse source 
CURA-2235
This commit is contained in:
Jaime van Kessel 2016-09-12 13:31:07 +02:00
parent f914ef5424
commit 1d91827664
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
NetworkPrinterOutputDevice.py
View file

@ -364,6 +364,8 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
head_y = self._json_printer_state["heads"][0]["position"]["y"] head_y = self._json_printer_state["heads"][0]["position"]["y"]
head_z = self._json_printer_state["heads"][0]["position"]["z"] head_z = self._json_printer_state["heads"][0]["position"]["z"]
self._updateHeadPosition(head_x, head_y, head_z) self._updateHeadPosition(head_x, head_y, head_z)
self._updatePrinterState(self._json_printer_state["status"])
def close(self): def close(self):
self._updateJobState("") self._updateJobState("")
@ -397,9 +399,9 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
self._error_message = Message(i18n_catalog.i18nc("@info:status", "Unable to start a new print job because the printer is busy. Please check the printer.")) self._error_message = Message(i18n_catalog.i18nc("@info:status", "Unable to start a new print job because the printer is busy. Please check the printer."))
self._error_message.show() self._error_message.show()
return return
if self._json_printer_state["status"] != "idle": if self._printer_state != "idle":
self._error_message = Message( self._error_message = Message(
i18n_catalog.i18nc("@info:status", "Unable to start a new print job, printer is busy. Current printer status is %s.") % self._json_printer_state["status"]) i18n_catalog.i18nc("@info:status", "Unable to start a new print job, printer is busy. Current printer status is %s.") % self._printer_state)
self._error_message.show() self._error_message.show()
return return
elif self._authentication_state != AuthState.Authenticated: elif self._authentication_state != AuthState.Authenticated: