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

No longer possible to send print_jobs when print just started

Browse source 
CURA-49
This commit is contained in:
Jaime van Kessel 2016-06-14 13:23:05 +02:00
parent 1acf155e19
commit 1220d32ca5
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
NetworkPrinterOutputDevice.py
View file

@ -160,9 +160,9 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
self._error_message.show() self._error_message.show()
except Exception as e: except Exception as e:
self._progress_message.hide() self._progress_message.hide()
Logger.log("e" , "An exception occured in network connection: %s" % str(e)) Logger.log("e", "An exception occurred in network connection: %s" % str(e))
## Handler for all requests that have finshed. ## Handler for all requests that have finished.
def _onFinished(self, reply): def _onFinished(self, reply):
if reply.operation() == QNetworkAccessManager.GetOperation: if reply.operation() == QNetworkAccessManager.GetOperation:
if "printer" in reply.url().toString(): # Status update from printer. if "printer" in reply.url().toString(): # Status update from printer.
@ -176,7 +176,11 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
pass # TODO: Handle errors pass # TODO: Handle errors
elif "print_job" in reply.url().toString(): # Status update from print_job: elif "print_job" in reply.url().toString(): # Status update from print_job:
if reply.attribute(QNetworkRequest.HttpStatusCodeAttribute) == 200: if reply.attribute(QNetworkRequest.HttpStatusCodeAttribute) == 200:
self.setProgress(json.loads(bytes(reply.readAll()).decode("utf-8"))["progress"]) progress = json.loads(bytes(reply.readAll()).decode("utf-8"))["progress"]
## If progress is 0 add a bit so another print can't be sent.
if progress == 0:
progress += 0.1
self.setProgress(progress)
elif reply.attribute(QNetworkRequest.HttpStatusCodeAttribute) == 404: elif reply.attribute(QNetworkRequest.HttpStatusCodeAttribute) == 404:
self.setProgress(0) # No print job found, so there can't be progress! self.setProgress(0) # No print job found, so there can't be progress!
@ -184,7 +188,7 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
reply.uploadProgress.disconnect(self._onUploadProgress) reply.uploadProgress.disconnect(self._onUploadProgress)
self._progress_message.hide() self._progress_message.hide()
else: else:
print("got unhandled operation:", reply.operation()) Logger.log("d", "NetworkPrinterOutputDevice got an unhandled operation %s", reply.operation())
def _onUploadProgress(self, bytes_sent, bytes_total): def _onUploadProgress(self, bytes_sent, bytes_total):
if bytes_total > 0: if bytes_total > 0: