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

We now compress the g-code layer by layer so the GIL won't always lock fully

Browse Source 
CURA-2286
This commit is contained in:
Jaime van Kessel 2016-09-09 15:44:02 +02:00
parent 3747db0f4d
commit 7f0194cce0
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
NetworkPrinterOutputDevice.py
View File

@ -18,8 +18,10 @@ from PyQt5.QtWidgets import QMessageBox
import json import json
import os import os
import gzip import gzip
import zlib
from time import time from time import time
from time import sleep
i18n_catalog = i18nCatalog("cura") i18n_catalog = i18nCatalog("cura")
@ -544,21 +546,22 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
self._progress_message = Message(i18n_catalog.i18nc("@info:status", "Sending data to printer"), 0, False, -1) self._progress_message = Message(i18n_catalog.i18nc("@info:status", "Sending data to printer"), 0, False, -1)
self._progress_message.show() self._progress_message.show()
Logger.log("d", "Started sending g-code to remote printer.") Logger.log("d", "Started sending g-code to remote printer.")
## Mash the data into single string
single_string_file_data = ""
for line in self._gcode:
single_string_file_data += line
## Mash the data into single string
byte_array_file_data = b""
for line in self._gcode:
if self._use_gzip: if self._use_gzip:
file_name = "%s.gcode.gz" % Application.getInstance().getPrintInformation().jobName byte_array_file_data += gzip.compress(line.encode("utf-8"))
compress_time = time() sleep(0) # Yield.
single_string_file_data = gzip.compress(single_string_file_data.encode("utf-8"))
Logger.log("d", "It took %s seconds to compress the file", time() - compress_time)
# 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()
else:
byte_array_file_data += line.encode("utf-8")
if self._use_gzip:
file_name = "%s.gcode.gz" % Application.getInstance().getPrintInformation().jobName
else: else:
file_name = "%s.gcode" % Application.getInstance().getPrintInformation().jobName file_name = "%s.gcode" % Application.getInstance().getPrintInformation().jobName
single_string_file_data = single_string_file_data.encode("utf-8")
## Create multi_part request ## Create multi_part request
self._post_multi_part = QHttpMultiPart(QHttpMultiPart.FormDataType) self._post_multi_part = QHttpMultiPart(QHttpMultiPart.FormDataType)
@ -567,7 +570,7 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
self._post_part = QHttpPart() self._post_part = QHttpPart()
self._post_part.setHeader(QNetworkRequest.ContentDispositionHeader, self._post_part.setHeader(QNetworkRequest.ContentDispositionHeader,
"form-data; name=\"file\"; filename=\"%s\"" % file_name) "form-data; name=\"file\"; filename=\"%s\"" % file_name)
self._post_part.setBody(single_string_file_data) self._post_part.setBody(byte_array_file_data)
self._post_multi_part.append(self._post_part) self._post_multi_part.append(self._post_part)
url = QUrl("http://" + self._address + self._api_prefix + "print_job") url = QUrl("http://" + self._address + self._api_prefix + "print_job")