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

Add in all of the changes for Cura Connect

Browse source 
CURA-4376
This commit is contained in:
Simon Edwards 2017-09-26 16:25:10 +02:00 • committed by Ghostkeeper
parent 823807144f
commit 85efd9249c
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
13 changed files with 1769 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

13
plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py
View file

@ -17,7 +17,7 @@ import cura.Settings.ExtruderManager
from PyQt5.QtNetwork import QHttpMultiPart, QHttpPart, QNetworkRequest, QNetworkAccessManager, QNetworkReply
from PyQt5.QtCore import QUrl, QTimer, pyqtSignal, pyqtProperty, pyqtSlot, QCoreApplication
from PyQt5.QtGui import QImage
from PyQt5.QtGui import QImage, QColor
from PyQt5.QtWidgets import QMessageBox
import json
@ -102,7 +102,7 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
self._target_bed_temperature = 0
self._processing_preheat_requests = True
self.setPriority(2) # Make sure the output device gets selected above local file output
self.setPriority(3) # Make sure the output device gets selected above local file output
self.setName(key)
self.setShortDescription(i18n_catalog.i18nc("@action:button Preceded by 'Ready to'.", "Print over network"))
self.setDescription(i18n_catalog.i18nc("@properties:tooltip", "Print over network"))
@ -340,6 +340,10 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
pass # It can happen that the wrapped c++ object is already deleted.
self._image_reply = None
self._image_request = None
if self._use_stream:
# Reset image (To prevent old images from being displayed)
self._camera_image.fill(QColor(0, 0, 0))
self.newImage.emit()
def _startCamera(self):
if self._use_stream:
@ -1007,7 +1011,8 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
reply_url = reply.url().toString()
if reply.operation() == QNetworkAccessManager.GetOperation:
if "printer" in reply_url: # Status update from printer.
# "printer" is also in "printers", therefore _api_prefix is added.
if self._api_prefix + "printer" in reply_url: # Status update from printer.
if status_code == 200:
if self._connection_state == ConnectionState.connecting:
self.setConnectionState(ConnectionState.connected)
@ -1025,7 +1030,7 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
else:
Logger.log("w", "We got an unexpected status (%s) while requesting printer state", status_code)
pass # TODO: Handle errors
elif "print_job" in reply_url: # Status update from print_job:
elif self._api_prefix + "print_job" in reply_url: # Status update from print_job:
if status_code == 200:
try:
json_data = json.loads(bytes(reply.readAll()).decode("utf-8"))