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

Avoid mega-tons of object copying when building compressed gcode

Browse source 
CL-541
This commit is contained in:
Simon Edwards 2018-01-03 16:15:12 +01:00
parent 182e7de07d
commit 3173eb6740
1 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
cura/PrinterOutput/NetworkedPrinterOutputDevice.py
View file

@ -80,28 +80,32 @@ class NetworkedPrinterOutputDevice(PrinterOutputDevice):
## Mash the data into single string ## Mash the data into single string
max_chars_per_line = int(1024 * 1024 / 4) # 1/4 MB per line. max_chars_per_line = int(1024 * 1024 / 4) # 1/4 MB per line.
byte_array_file_data = b"" file_data_bytes_list = []
batched_line = "" batched_lines = []
batched_lines_count = 0
for line in self._gcode: for line in self._gcode:
if not self._compressing_gcode: if not self._compressing_gcode:
self._progress_message.hide() self._progress_message.hide()
# Stop trying to zip / send as abort was called. # Stop trying to zip / send as abort was called.
return None return None
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.
if len(batched_line) < max_chars_per_line: batched_lines.append(line)
continue batched_lines_count += len(line)
byte_array_file_data += self._compressDataAndNotifyQt(batched_line)
batched_line = "" if batched_lines_count >= max_chars_per_line:
file_data_bytes_list.append(self._compressDataAndNotifyQt("".join(batched_lines)))
batched_lines = []
batched_lines_count
# Don't miss the last batch (If any) # Don't miss the last batch (If any)
if batched_line: if len(batched_lines) != 0:
byte_array_file_data += self._compressDataAndNotifyQt(batched_line) file_data_bytes_list.append(self._compressDataAndNotifyQt("".join(batched_lines)))
self._compressing_gcode = False self._compressing_gcode = False
return byte_array_file_data return b"".join(file_data_bytes_list)
def _update(self) -> bool: def _update(self) -> bool:
if self._last_response_time: if self._last_response_time: