Commit 285ac2ba authored by dogmaphobic's avatar dogmaphobic

Finalizing thumbstick WIP.

parent 16480717
...@@ -128,7 +128,7 @@ Item { ...@@ -128,7 +128,7 @@ Item {
} }
//-- PIP Window //-- PIP Window
Rectangle { Item {
id: pip id: pip
visible: _controller.hasVideo && _isPipVisible visible: _controller.hasVideo && _isPipVisible
anchors.margins: ScreenTools.defaultFontPixelHeight anchors.margins: ScreenTools.defaultFontPixelHeight
...@@ -136,8 +136,6 @@ Item { ...@@ -136,8 +136,6 @@ Item {
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
width: _pipSize width: _pipSize
height: _pipSize * (9/16) height: _pipSize * (9/16)
color: "#000010"
border.color: isBackgroundDark ? Qt.rgba(1,1,1,0.75) : Qt.rgba(0,0,0,0.75)
Loader { Loader {
id: pipLoader id: pipLoader
anchors.fill: parent anchors.fill: parent
...@@ -219,10 +217,12 @@ Item { ...@@ -219,10 +217,12 @@ Item {
//-- Virtual Joystick //-- Virtual Joystick
Item { Item {
id: multiTouchItem id: multiTouchItem
width: parent.width * 0.6 width: parent.width - (pip.width / 2)
height: thumbAreaHeight height: thumbAreaHeight
visible: QGroundControl.virtualTabletJoystick 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) readonly property real thumbAreaHeight: Math.min(parent.height * 0.25, ScreenTools.defaultFontPixelWidth * 16)
......
...@@ -39,7 +39,7 @@ Item { ...@@ -39,7 +39,7 @@ Item {
Rectangle { Rectangle {
id: noVideo id: noVideo
anchors.fill: parent anchors.fill: parent
color: "black" color: Qt.rgba(0,0,0,0.75)
visible: !_controller.videoRunning visible: !_controller.videoRunning
QGCLabel { QGCLabel {
text: "NO VIDEO" text: "NO VIDEO"
......
...@@ -92,7 +92,7 @@ Item { ...@@ -92,7 +92,7 @@ Item {
anchors.margins: ScreenTools.defaultFontPixelHeight anchors.margins: ScreenTools.defaultFontPixelHeight
anchors.right: parent.right anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
visible: _isInstrumentVisible visible: _isInstrumentVisible && !QGroundControl.virtualTabletJoystick
size: getGadgetWidth() size: getGadgetWidth()
active: _activeVehicle != null active: _activeVehicle != null
heading: _heading heading: _heading
...@@ -109,6 +109,65 @@ Item { ...@@ -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 //-- Show (Hidden) Instrument Panel
Rectangle { Rectangle {
id: openButton id: openButton
...@@ -118,7 +177,7 @@ Item { ...@@ -118,7 +177,7 @@ Item {
height: ScreenTools.defaultFontPixelSize * 2 height: ScreenTools.defaultFontPixelSize * 2
width: ScreenTools.defaultFontPixelSize * 2 width: ScreenTools.defaultFontPixelSize * 2
radius: ScreenTools.defaultFontPixelSize / 3 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) color: isBackgroundDark ? Qt.rgba(0,0,0,0.75) : Qt.rgba(0,0,0,0.5)
Image { Image {
width: parent.width * 0.75 width: parent.width * 0.75
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment