3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-05 16:51:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Change camera URL to non-optional QUrl

Browse source 
Otherwise pyqt property will complain when it tries to convert a None to
a QUrl.
This commit is contained in:
Lipu Fei 2018-10-29 13:23:10 +01:00
parent 0c1b3931db
commit 02681a5700
5 changed files with 23 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/UM3NetworkPrinting/resources/qml/CameraButton.qml
View file

@ -31,8 +31,8 @@ Rectangle {
anchors.fill: parent;
hoverEnabled: true;
onClicked: {
if (OutputDevice.activeCameraUrl !== null) {
OutputDevice.setActiveCameraUrl(null)
if (OutputDevice.activeCameraUrl != "") {
OutputDevice.setActiveCameraUrl("");
} else {
OutputDevice.setActiveCameraUrl(modelData.cameraUrl);
}

4
plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml
View file

@ -16,7 +16,7 @@ Component {
height: maximumHeight;
onVisibleChanged: {
if (monitorFrame != null && !monitorFrame.visible) {
OutputDevice.setActiveCameraUrl(null);
OutputDevice.setActiveCameraUrl("");
}
}
width: maximumWidth;
@ -126,7 +126,7 @@ Component {
PrinterVideoStream {
anchors.fill: parent;
cameraUrl: OutputDevice.activeCameraUrl;
visible: OutputDevice.activeCameraUrl != null;
visible: OutputDevice.activeCameraUrl != "";
}
}
}

10
plugins/UM3NetworkPrinting/resources/qml/PrinterVideoStream.qml
View file

@ -8,7 +8,7 @@ import UM 1.3 as UM
import Cura 1.0 as Cura
Item {
property var cameraUrl: null;
property var cameraUrl: "";
Rectangle {
anchors.fill:parent;
@ -18,7 +18,7 @@ Item {
MouseArea {
anchors.fill: parent;
onClicked: OutputDevice.setActiveCameraUrl(null);
onClicked: OutputDevice.setActiveCameraUrl("");
z: 0;
}
@ -41,11 +41,11 @@ Item {
height: Math.round((imageHeight === 0 ? 600 * screenScaleFactor : imageHeight) * width / imageWidth);
onVisibleChanged: {
if (visible) {
if (cameraUrl != null) {
if (cameraUrl != "") {
start();
}
} else {
if (cameraUrl != null) {
if (cameraUrl != "") {
stop();
}
}
@ -58,7 +58,7 @@ Item {
MouseArea {
anchors.fill: cameraImage;
onClicked: {
OutputDevice.setActiveCameraUrl(null);
OutputDevice.setActiveCameraUrl("");
}
z: 1;
}