diff --git a/src/FlightDisplay/FlightDisplayView.qml b/src/FlightDisplay/FlightDisplayView.qml index 279b7dd5133f3fc710252dffd90774ae0adb95e6..66fd18604fe80d4b469cb34a7679c4469b960cd0 100644 --- a/src/FlightDisplay/FlightDisplayView.qml +++ b/src/FlightDisplay/FlightDisplayView.qml @@ -128,7 +128,7 @@ Item { } //-- PIP Window - Rectangle { + Item { id: pip visible: _controller.hasVideo && _isPipVisible anchors.margins: ScreenTools.defaultFontPixelHeight @@ -136,8 +136,6 @@ Item { anchors.bottom: parent.bottom width: _pipSize height: _pipSize * (9/16) - color: "#000010" - border.color: isBackgroundDark ? Qt.rgba(1,1,1,0.75) : Qt.rgba(0,0,0,0.75) Loader { id: pipLoader anchors.fill: parent @@ -219,10 +217,12 @@ Item { //-- Virtual Joystick Item { id: multiTouchItem - width: parent.width * 0.6 + width: parent.width - (pip.width / 2) height: thumbAreaHeight visible: QGroundControl.virtualTabletJoystick - anchors.centerIn: parent + anchors.bottom: pip.top + anchors.bottomMargin: ScreenTools.defaultFontPixelHeight * 2 + anchors.horizontalCenter: parent.horizontalCenter readonly property real thumbAreaHeight: Math.min(parent.height * 0.25, ScreenTools.defaultFontPixelWidth * 16) diff --git a/src/FlightDisplay/FlightDisplayViewVideo.qml b/src/FlightDisplay/FlightDisplayViewVideo.qml index 0a5c505f7c1bf6d22d9499dcc29834d5c5e5792a..f98c0b5fa256f2249ca2f64dc87aed9bf571881e 100644 --- a/src/FlightDisplay/FlightDisplayViewVideo.qml +++ b/src/FlightDisplay/FlightDisplayViewVideo.qml @@ -39,7 +39,7 @@ Item { Rectangle { id: noVideo anchors.fill: parent - color: "black" + color: Qt.rgba(0,0,0,0.75) visible: !_controller.videoRunning QGCLabel { text: "NO VIDEO" diff --git a/src/FlightDisplay/FlightDisplayViewWidgets.qml b/src/FlightDisplay/FlightDisplayViewWidgets.qml index 85abdd70195078f9024ff24c45aef6045b50fde3..67810a4959f0c6db4461a829045299c841c91c94 100644 --- a/src/FlightDisplay/FlightDisplayViewWidgets.qml +++ b/src/FlightDisplay/FlightDisplayViewWidgets.qml @@ -92,7 +92,7 @@ Item { anchors.margins: ScreenTools.defaultFontPixelHeight anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter - visible: _isInstrumentVisible + visible: _isInstrumentVisible && !QGroundControl.virtualTabletJoystick size: getGadgetWidth() active: _activeVehicle != null heading: _heading @@ -109,6 +109,65 @@ Item { } } + //-- Alternate Instrument Panel + Rectangle { + visible: QGroundControl.virtualTabletJoystick + anchors.margins: ScreenTools.defaultFontPixelHeight + anchors.right: parent.right + anchors.bottom: parent.bottom + width: _pipSize + height: _pipSize * (9/16) + color: Qt.rgba(0,0,0,0.75) + Column { + id: instruments + width: parent.width + spacing: ScreenTools.defaultFontPixelSize * 0.33 + Item { + height: ScreenTools.defaultFontPixelHeight * 0.33 + width: 1 + } + QGCLabel { + text: "Altitude (m)" + font.pixelSize: ScreenTools.defaultFontPixelSize * 0.75 + width: parent.width + height: ScreenTools.defaultFontPixelSize * 0.75 + color: "white" + horizontalAlignment: TextEdit.AlignHCenter + } + QGCLabel { + text: _altitudeWGS84 < 10000 ? _altitudeWGS84.toFixed(1) : _altitudeWGS84.toFixed(0) + font.pixelSize: ScreenTools.defaultFontPixelSize * 2.5 + font.weight: Font.DemiBold + width: parent.width + color: "white" + horizontalAlignment: TextEdit.AlignHCenter + } + //-- Ground Speed + Rectangle { + height: 1 + width: parent.width * 0.9 + color: Qt.rgba(1,1,1,0.25) + anchors.horizontalCenter: parent.horizontalCenter + } + QGCLabel { + text: "Ground Speed (km/h)" + font.pixelSize: ScreenTools.defaultFontPixelSize * 0.75 + width: parent.width + height: ScreenTools.defaultFontPixelSize * 0.75 + color: "white" + horizontalAlignment: TextEdit.AlignHCenter + } + QGCLabel { + text: (_groundSpeed * 3.6).toFixed(1) + font.pixelSize: ScreenTools.defaultFontPixelSize * 1.5 + font.weight: Font.DemiBold + width: parent.width + color: "white" + horizontalAlignment: TextEdit.AlignHCenter + } + } + } + //-- Show (Hidden) Instrument Panel Rectangle { id: openButton @@ -118,7 +177,7 @@ Item { height: ScreenTools.defaultFontPixelSize * 2 width: ScreenTools.defaultFontPixelSize * 2 radius: ScreenTools.defaultFontPixelSize / 3 - visible: !_isInstrumentVisible + visible: !_isInstrumentVisible && !QGroundControl.virtualTabletJoystick color: isBackgroundDark ? Qt.rgba(0,0,0,0.75) : Qt.rgba(0,0,0,0.5) Image { width: parent.width * 0.75