3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-19 12:47:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Camera image is now actually displayed for Legacy

Browse source 
CL-541
This commit is contained in:
Jaime van Kessel 2017-12-06 16:46:33 +01:00
parent ba782b346f
commit b3a3c1e371
2 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

5
plugins/UM3NetworkPrinting/LegacyUM3OutputDevice.py
View file

@ -22,7 +22,7 @@ from .LegacyUM3PrinterOutputController import LegacyUM3PrinterOutputController
from time import time from time import time
import json import json
import os
i18n_catalog = i18nCatalog("cura") i18n_catalog = i18nCatalog("cura")
@ -72,6 +72,9 @@ class LegacyUM3OutputDevice(NetworkedPrinterOutputDevice):
self.setIconName("print") self.setIconName("print")
self._monitor_view_qml_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "MonitorItem.qml")
self._output_controller = LegacyUM3PrinterOutputController(self) self._output_controller = LegacyUM3PrinterOutputController(self)
def _onAuthenticationStateChanged(self): def _onAuthenticationStateChanged(self):

31
plugins/UM3NetworkPrinting/MonitorItem.qml
View file

@ -9,35 +9,32 @@ Component
Image Image
{ {
id: cameraImage id: cameraImage
property bool proportionalHeight: width: Math.min(sourceSize.width === 0 ? 800 * screenScaleFactor : sourceSize.width, maximumWidth)
{ height: Math.floor((sourceSize.height === 0 ? 600 * screenScaleFactor : sourceSize.height) * width / sourceSize.width)
if(sourceSize.height == 0 || maximumHeight == 0)
{
return true;
}
return (sourceSize.width / sourceSize.height) > (maximumWidth / maximumHeight);
}
property real _width: Math.floor(Math.min(maximumWidth, sourceSize.width))
property real _height: Math.floor(Math.min(maximumHeight, sourceSize.height))
width: proportionalHeight ? _width : Math.floor(sourceSize.width * _height / sourceSize.height)
height: !proportionalHeight ? _height : Math.floor(sourceSize.height * _width / sourceSize.width)
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter
z: 1
onVisibleChanged: onVisibleChanged:
{ {
if(visible) if(visible)
{ {
OutputDevice.startCamera() if(OutputDevice.activePrinter != null && OutputDevice.activePrinter.camera != null)
{
OutputDevice.activePrinter.camera.start()
}
} else } else
{ {
OutputDevice.stopCamera() if(OutputDevice.activePrinter != null && OutputDevice.activePrinter.camera != null)
{
OutputDevice.activePrinter.camera.stop()
}
} }
} }
source: source:
{ {
if(OutputDevice.cameraImage) if(OutputDevice.activePrinter != null && OutputDevice.activePrinter.camera != null && OutputDevice.activePrinter.camera.latestImage)
{ {
return OutputDevice.cameraImage; return OutputDevice.activePrinter.camera.latestImage;
} }
return ""; return "";
} }