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

Fix batched GCode compression

Browse source 
CURA-3604
This commit is contained in:
Lipu Fei 2017-03-31 12:11:11 +02:00
parent 4fe80218bc
commit 08071c3aa5
1 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py
View file

@ -796,25 +796,26 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
byte_array_file_data = b"" byte_array_file_data = b""
batched_line = "" batched_line = ""
def _compress_data_and_notify_qt(file_data, data_to_append): def _compress_data_and_notify_qt(data_to_append):
file_data += gzip.compress(data_to_append.encode("utf-8")) compressed_data = gzip.compress(data_to_append.encode("utf-8"))
QCoreApplication.processEvents() # Ensure that the GUI does not freeze. QCoreApplication.processEvents() # Ensure that the GUI does not freeze.
# Pretend that this is a response, as zipping might take a bit of time. # Pretend that this is a response, as zipping might take a bit of time.
self._last_response_time = 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)
_compress_data_and_notify_qt(byte_array_file_data, batched_line)
batched_line = "" batched_line = ""
else: else:
byte_array_file_data += line.encode("utf-8") byte_array_file_data += line.encode("utf-8")
@ -822,7 +823,7 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
# don't miss the last batch if it's there # don't miss the last batch if it's there
if self._use_gzip: if self._use_gzip:
if batched_line: if batched_line:
_compress_data_and_notify_qt(byte_array_file_data, 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