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

Camera image now works with a image provider

Browse source 
CURA-1036 and CURA-338
This commit is contained in:
Jaime van Kessel 2016-06-16 09:36:19 +02:00
parent df94373664
commit 354d2bc109
1 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
NetworkPrinterOutputDevice.py
View file

@ -8,8 +8,8 @@ from UM.Message import Message
from cura.PrinterOutputDevice import PrinterOutputDevice, ConnectionState from cura.PrinterOutputDevice import PrinterOutputDevice, ConnectionState
from PyQt5.QtNetwork import QHttpMultiPart, QHttpPart, QNetworkRequest, QNetworkAccessManager from PyQt5.QtNetwork import QHttpMultiPart, QHttpPart, QNetworkRequest, QNetworkAccessManager
from PyQt5.QtCore import QUrl, QTimer from PyQt5.QtCore import QUrl, QTimer, pyqtSignal, pyqtProperty
from PyQt5.QtGui import QPixmap from PyQt5.QtGui import QPixmap, QImage
import json import json
@ -72,7 +72,9 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
self._update_timer.setSingleShot(False) self._update_timer.setSingleShot(False)
self._update_timer.timeout.connect(self._update) self._update_timer.timeout.connect(self._update)
self._camera_image = QPixmap() self._camera_image_id = 0
self._camera_image = QImage()
## Get the unique key of this machine ## Get the unique key of this machine
# \return key String containing the key of the machine. # \return key String containing the key of the machine.
@ -129,6 +131,14 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
Logger.log("d", "Connection with printer %s with ip %s started", self._key, self._address) Logger.log("d", "Connection with printer %s with ip %s started", self._key, self._address)
self._update_timer.start() self._update_timer.start()
newImage = pyqtSignal()
@pyqtProperty(QUrl, notify = newImage)
def cameraImage(self):
self._camera_image_id += 1
temp = "image://camera/" + str(self._camera_image_id)
return QUrl(temp, QUrl.TolerantMode)
def getCameraImage(self): def getCameraImage(self):
return self._camera_image return self._camera_image
@ -205,6 +215,7 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
elif "snapshot" in reply.url().toString(): # Status update from image: elif "snapshot" in reply.url().toString(): # Status update from image:
if reply.attribute(QNetworkRequest.HttpStatusCodeAttribute) == 200: if reply.attribute(QNetworkRequest.HttpStatusCodeAttribute) == 200:
self._camera_image.loadFromData(reply.readAll()) self._camera_image.loadFromData(reply.readAll())
self.newImage.emit()
elif reply.operation() == QNetworkAccessManager.PostOperation: elif reply.operation() == QNetworkAccessManager.PostOperation:
reply.uploadProgress.disconnect(self._onUploadProgress) reply.uploadProgress.disconnect(self._onUploadProgress)
self._progress_message.hide() self._progress_message.hide()