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

Merge branch '2.5'

Browse Source
This commit is contained in:
Lipu Fei 2017-03-31 12:12:29 +02:00
commit c5bf107be6
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py
View File

@ -801,26 +801,36 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
byte_array_file_data = b"" byte_array_file_data = b""
batched_line = "" batched_line = ""
def _compress_data_and_notify_qt(data_to_append):
compressed_data = gzip.compress(data_to_append.encode("utf-8"))
QCoreApplication.processEvents() # Ensure that the GUI does not freeze.
# Pretend that this is a response, as zipping might take a bit of time.
self._last_response_time = time()
return compressed_data
for line in self._gcode: for line in self._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 # Stop trying to zip, abort was called.
if self._use_gzip:
# 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.
if len(batched_line) < max_chars_per_line: if len(batched_line) < max_chars_per_line:
batched_line += line batched_line += line
continue continue
if self._use_gzip: byte_array_file_data += _compress_data_and_notify_qt(batched_line)
byte_array_file_data += gzip.compress(batched_line.encode("utf-8"))
batched_line = "" batched_line = ""
QCoreApplication.processEvents() # Ensure that the GUI does not freeze.
# Pretend that this is a response, as zipping might take a bit of time.
self._last_response_time = time()
else: else:
byte_array_file_data += line.encode("utf-8") byte_array_file_data += line.encode("utf-8")
# don't miss the last batch if it's there
if self._use_gzip:
if batched_line:
byte_array_file_data += _compress_data_and_notify_qt(batched_line)
if self._use_gzip: if self._use_gzip:
file_name = "%s.gcode.gz" % Application.getInstance().getPrintInformation().jobName file_name = "%s.gcode.gz" % Application.getInstance().getPrintInformation().jobName
else: else: