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

Stop building and sending the POST request if the user has already aborted it all

Browse source 
CL-511
This commit is contained in:
Simon Edwards 2017-10-02 16:31:32 +02:00
parent 8e4bc433d6
commit 4439ce1e43
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
plugins/UM3NetworkPrinting/NetworkClusterPrinterOutputDevice.py
View file

@ -275,7 +275,10 @@ class NetworkClusterPrinterOutputDevice(NetworkPrinterOutputDevice.NetworkPrinte
self._file_name = "%s.gcode.gz" % file_name self._file_name = "%s.gcode.gz" % file_name
self._showProgressMessage() self._showProgressMessage()
self._request = self._buildSendPrintJobHttpRequest(require_printer_name) new_request = self._buildSendPrintJobHttpRequest(require_printer_name)
if new_request is None or self._stage != OutputStage.uploading:
return
self._request = new_request
self._reply = self._manager.post(self._request, self._multipart) self._reply = self._manager.post(self._request, self._multipart)
self._reply.uploadProgress.connect(self._onUploadProgress) self._reply.uploadProgress.connect(self._onUploadProgress)
# See _finishedPostPrintJobRequest() # See _finishedPostPrintJobRequest()
@ -294,7 +297,7 @@ class NetworkClusterPrinterOutputDevice(NetworkPrinterOutputDevice.NetworkPrinte
gcode = getattr(Application.getInstance().getController().getScene(), "gcode_list") gcode = getattr(Application.getInstance().getController().getScene(), "gcode_list")
compressed_gcode = self._compressGcode(gcode) compressed_gcode = self._compressGcode(gcode)
if compressed_gcode is None: if compressed_gcode is None:
return # User aborted print, so stop trying. return None # User aborted print, so stop trying.
part.setBody(compressed_gcode) part.setBody(compressed_gcode)
self._multipart.append(part) self._multipart.append(part)
@ -331,7 +334,7 @@ class NetworkClusterPrinterOutputDevice(NetworkPrinterOutputDevice.NetworkPrinte
for line in gcode: for line in gcode:
if not self._compressing_print: if not self._compressing_print:
self._progress_message.hide() self._progress_message.hide()
return # Stop trying to zip, abort was called. return None # Stop trying to zip, abort was called.
batched_line += line batched_line += line
# if the gcode was read from a gcode file, self._gcode will be a list of all lines in that file. # if the gcode was read from a gcode file, self._gcode will be a list of all lines in that file.
# Compressing line by line in this case is extremely slow, so we need to batch them. # Compressing line by line in this case is extremely slow, so we need to batch them.