Refactor some code

CURA-5612
This commit is contained in:
Lipu Fei 2018-08-03 14:37:09 +02:00
parent 38ce73365a
commit 20806eeb72
2 changed files with 6 additions and 7 deletions

View file

@ -4,21 +4,20 @@ from PyQt5.QtCore import QSize
from UM.Application import Application
class CameraImageProvider(QQuickImageProvider):
def __init__(self):
QQuickImageProvider.__init__(self, QQuickImageProvider.Image)
super().__init__(QQuickImageProvider.Image)
## Request a new image.
def requestImage(self, id, size):
for output_device in Application.getInstance().getOutputDeviceManager().getOutputDevices():
try:
image = output_device.activePrinter.camera.getImage()
if image.isNull():
return QImage(), QSize(15, 15)
image = QImage()
return image, QSize(15, 15)
except AttributeError:
pass
return QImage(), QSize(15, 15)
return QImage(), QSize(15, 15)

View file

@ -9,7 +9,7 @@ Component
{
Rectangle
{
id: rectangle
id: monitorFrame
width: maximumWidth
height: maximumHeight
color: UM.Theme.getColor("viewport_background")
@ -107,7 +107,7 @@ Component
onVisibleChanged:
{
if(rectangle != null && !rectangle.visible)
if (!monitorFrame.visible)
{
// After switching the Tab ensure that active printer is Null, the video stream image
// might be active