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

Added cancel button to upload print

Browse source 
CURA-2384
This commit is contained in:
Jaime van Kessel 2016-09-20 17:45:55 +02:00
parent 7da05e0f36
commit df9f940ff4
1 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

18
NetworkPrinterOutputDevice.py
View file

@ -151,6 +151,8 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
self._last_command = ""
self._compressing_print = False
def _onNetworkAccesibleChanged(self, accessible):
Logger.log("d", "Network accessible state changed to: %s", accessible)
@ -585,6 +587,14 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
return user
return "Unknown User" # Couldn't find out username.
def _progressMessageActionTrigger(self, message_id = None, action_id="abort"):
if action_id == "abort":
Logger.log("d", "User aborted sending print to remote.")
self._progress_message.hide()
self._compressing_print = False
if self._post_reply:
self._post_reply.abort()
## Attempt to start a new print.
# This function can fail to actually start a print due to not being authenticated or another print already
# being in progress.
@ -592,12 +602,17 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
try:
self._send_gcode_start = time()
self._progress_message = Message(i18n_catalog.i18nc("@info:status", "Sending data to printer"), 0, False, -1)
self._progress_message.addAction("abort", i18n_catalog.i18nc("@action:button", "Cancel"), None, "")
self._progress_message.actionTriggered.connect(self._progressMessageActionTrigger)
self._progress_message.show()
Logger.log("d", "Started sending g-code to remote printer.")
self._compressing_print = True
## Mash the data into single string
byte_array_file_data = b""
for line in self._gcode:
if not self._compressing_print:
self._progress_message.hide()
return # Stop trying to zip, abort was called.
if self._use_gzip:
byte_array_file_data += gzip.compress(line.encode("utf-8"))
QCoreApplication.processEvents() # Ensure that the GUI does not freeze.
@ -611,6 +626,7 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
else:
file_name = "%s.gcode" % Application.getInstance().getPrintInformation().jobName
self._compressing_print = False
## Create multi_part request
self._post_multi_part = QHttpMultiPart(QHttpMultiPart.FormDataType)