GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-05 21:06:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Ultimaker/JediWifiPrintingPlugin

Browse Source
This commit is contained in:
Jaime van Kessel 2016-08-11 10:37:56 +02:00
commit d7b3dd828b
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
NetworkPrinterOutputDevice.py
View File

@ -134,6 +134,8 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
self._response_timeout_time = 5
self._not_authenticated_message = None
self._last_command = ""
def _onAuthenticationTimer(self):
self._authentication_counter += 1
self._authentication_requested_message.setProgress(self._authentication_counter / self._max_authentication_counter * 100)
@ -358,6 +360,7 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
return self._camera_image
def _setJobState(self, job_state):
self._last_command = job_state
url = QUrl("http://" + self._address + self._api_prefix + "print_job/state")
put_request = QNetworkRequest(url)
put_request.setHeader(QNetworkRequest.ContentTypeHeader, "application/json")
@ -515,12 +518,12 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
# If this happens before the print has reached progress == 1, the print has
# been aborted.
if state == "none" or state == "":
if self._print_finished:
state = "printing"
else:
if self._last_command == "abort":
self.setErrorText(i18n_catalog.i18nc("@label:MonitorStatus", "Aborting print..."))
state = "error"
if state == "wait_cleanup" and not self._print_finished:
else:
state = "printing"
if state == "wait_cleanup" and self._last_command == "abort":
# Keep showing the "aborted" error state until after the buildplate has been cleaned
self.setErrorText(i18n_catalog.i18nc("@label:MonitorStatus", "Print aborted. Please check the printer"))
state = "error"