Skip to content

Q
qgroundcontrol
Commit b051e8b8 authored by Gus Grubba's avatar Gus Grubba
Browse files
Options

Merge pull request #2130 from dogmaphobic/telemetryData 

Adjustments to Telemetry Data
parents a1acb4ab c4aecb7c
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 84 deletions
src/FlightDisplay/FlightDisplayView.qml
View file @ b051e8b8
...@@ -75,6 +75,8 @@ Item { ...@@ -75,6 +75,8 @@ Item {
property var _flightVideo: null property var _flightVideo: null
property var _savedZoomLevel: 0 property var _savedZoomLevel: 0
property real _pipSize: ScreenTools.isAndroid ? ScreenTools.defaultFontPixelSize * (8) : ScreenTools.defaultFontPixelSize * (9)
FlightDisplayViewController { id: _controller } FlightDisplayViewController { id: _controller }
MissionController { MissionController {
...@@ -126,8 +128,8 @@ Item { ...@@ -126,8 +128,8 @@ Item {
anchors.margins: ScreenTools.defaultFontPixelHeight anchors.margins: ScreenTools.defaultFontPixelHeight
anchors.left: parent.left anchors.left: parent.left
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
height: ScreenTools.defaultFontPixelSize * (9) height: _pipSize
width: ScreenTools.defaultFontPixelSize * (9) * (16/9) width: _pipSize * (16/9)
color: "#000010" color: "#000010"
border.width: 4 border.width: 4
radius: 4 radius: 4
......
src/FlightDisplay/FlightDisplayViewWidgets.qml
View file @ b051e8b8
...@@ -87,7 +87,6 @@ Item { ...@@ -87,7 +87,6 @@ Item {
altitude: _altitudeWGS84 altitude: _altitudeWGS84
groundSpeed: _groundSpeed groundSpeed: _groundSpeed
airSpeed: _airSpeed airSpeed: _airSpeed
climbRate: _climbRate
isSatellite: _mainIsMap ? _flightMap ? _flightMap.isSatelliteMap : true : true isSatellite: _mainIsMap ? _flightMap ? _flightMap.isSatelliteMap : true : true
z: QGroundControl.zOrderWidgets z: QGroundControl.zOrderWidgets
} }
...@@ -97,7 +96,7 @@ Item { ...@@ -97,7 +96,7 @@ Item {
id: toolColumn id: toolColumn
anchors.margins: ScreenTools.defaultFontPixelHeight anchors.margins: ScreenTools.defaultFontPixelHeight
anchors.left: parent.left anchors.left: parent.left
anchors.verticalCenter: parent.verticalCenter anchors.top: parent.top
spacing: ScreenTools.defaultFontPixelHeight spacing: ScreenTools.defaultFontPixelHeight
//-- Map Center Control //-- Map Center Control
......
src/FlightMap/Widgets/QGCInstrumentWidget.qml
View file @ b051e8b8
...@@ -42,7 +42,6 @@ Item { ...@@ -42,7 +42,6 @@ Item {
property real altitude: 0 property real altitude: 0
property real groundSpeed: 0 property real groundSpeed: 0
property real airSpeed: 0 property real airSpeed: 0
property real climbRate: 0
property real size: ScreenTools.defaultFontPixelSize * (10) property real size: ScreenTools.defaultFontPixelSize * (10)
property bool isSatellite: false property bool isSatellite: false
property bool active: false property bool active: false
...@@ -78,24 +77,21 @@ Item { ...@@ -78,24 +77,21 @@ Item {
color: isSatellite ? Qt.rgba(0,0,0,0.25) : Qt.rgba(1,1,1,0.25) color: isSatellite ? Qt.rgba(0,0,0,0.25) : Qt.rgba(1,1,1,0.25)
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
} }
Row { QGCLabel {
width: root.size * 0.8 text: "Altitude"
anchors.horizontalCenter: parent.horizontalCenter font.pixelSize: ScreenTools.defaultFontPixelSize * 0.75
QGCLabel { width: parent.width
text: "H" height: ScreenTools.defaultFontPixelHeight * 0.5
font.pixelSize: ScreenTools.defaultFontPixelSize * 1.25 color: isSatellite ? "black" : "white"
width: parent.width * 0.45 horizontalAlignment: TextEdit.AlignHCenter
color: isSatellite ? "black" : "white" }
horizontalAlignment: TextEdit.AlignHCenter QGCLabel {
} text: altitude < 10000 ? altitude.toFixed(1) : altitude.toFixed(0)
QGCLabel { font.pixelSize: ScreenTools.defaultFontPixelSize * 2.5
text: altitude.toFixed(1) font.weight: Font.DemiBold
font.pixelSize: ScreenTools.defaultFontPixelSize * 1.25 width: parent.width
font.weight: Font.DemiBold color: isSatellite ? "black" : "white"
width: parent.width * 0.549 horizontalAlignment: TextEdit.AlignHCenter
color: isSatellite ? "black" : "white"
horizontalAlignment: TextEdit.AlignHCenter
}
} }
//-- Ground Speed //-- Ground Speed
Rectangle { Rectangle {
...@@ -103,25 +99,25 @@ Item { ...@@ -103,25 +99,25 @@ Item {
width: parent.width * 0.9 width: parent.width * 0.9
color: isSatellite ? Qt.rgba(0,0,0,0.25) : Qt.rgba(1,1,1,0.25) color: isSatellite ? Qt.rgba(0,0,0,0.25) : Qt.rgba(1,1,1,0.25)
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
visible: airSpeed <= 0
} }
Row { QGCLabel {
width: root.size * 0.8 text: "Ground Speed"
anchors.horizontalCenter: parent.horizontalCenter font.pixelSize: ScreenTools.defaultFontPixelSize * 0.75
QGCLabel { width: parent.width
text: "GS" height: ScreenTools.defaultFontPixelHeight * 0.75
font.pixelSize: ScreenTools.defaultFontPixelSize * 0.75 color: isSatellite ? "black" : "white"
width: parent.width * 0.45 horizontalAlignment: TextEdit.AlignHCenter
color: isSatellite ? "black" : "white" visible: airSpeed <= 0
horizontalAlignment: TextEdit.AlignHCenter }
} QGCLabel {
QGCLabel { text: groundSpeed.toFixed(1)
text: groundSpeed.toFixed(1) font.pixelSize: ScreenTools.defaultFontPixelSize * 1.25
font.pixelSize: ScreenTools.defaultFontPixelSize * 0.75 font.weight: Font.DemiBold
font.weight: Font.DemiBold width: parent.width
width: parent.width * 0.549 color: isSatellite ? "black" : "white"
color: isSatellite ? "black" : "white" horizontalAlignment: TextEdit.AlignHCenter
horizontalAlignment: TextEdit.AlignHCenter visible: airSpeed <= 0
}
} }
//-- Air Speed //-- Air Speed
Rectangle { Rectangle {
...@@ -131,51 +127,23 @@ Item { ...@@ -131,51 +127,23 @@ Item {
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
visible: airSpeed > 0 visible: airSpeed > 0
} }
Row { QGCLabel {
width: root.size * 0.8 text: "Air Speed"
anchors.horizontalCenter: parent.horizontalCenter font.pixelSize: ScreenTools.defaultFontPixelSize * 0.75
width: parent.width
height: ScreenTools.defaultFontPixelHeight * 0.75
color: isSatellite ? "black" : "white"
visible: airSpeed > 0 visible: airSpeed > 0
QGCLabel { horizontalAlignment: TextEdit.AlignHCenter
text: "AS"
font.pixelSize: ScreenTools.defaultFontPixelSize * 0.75
width: parent.width * 0.45
color: isSatellite ? "black" : "white"
horizontalAlignment: TextEdit.AlignHCenter
}
QGCLabel {
text: airSpeed.toFixed(1)
font.pixelSize: ScreenTools.defaultFontPixelSize * 0.75
font.weight: Font.DemiBold
width: parent.width * 0.549
color: isSatellite ? "black" : "white"
horizontalAlignment: TextEdit.AlignHCenter
}
} }
//-- Climb Rate QGCLabel {
Rectangle { text: airSpeed.toFixed(1)
height: 1 font.pixelSize: ScreenTools.defaultFontPixelSize * 1.25
width: parent.width * 0.9 font.weight: Font.DemiBold
color: isSatellite ? Qt.rgba(0,0,0,0.25) : Qt.rgba(1,1,1,0.25) width: parent.width
anchors.horizontalCenter: parent.horizontalCenter color: isSatellite ? "black" : "white"
} visible: airSpeed > 0
Row { horizontalAlignment: TextEdit.AlignHCenter
width: root.size * 0.8
anchors.horizontalCenter: parent.horizontalCenter
QGCLabel {
text: "VS"
font.pixelSize: ScreenTools.defaultFontPixelSize * 0.75
width: parent.width * 0.45
color: isSatellite ? "black" : "white"
horizontalAlignment: TextEdit.AlignHCenter
}
QGCLabel {
text: climbRate.toFixed(1)
font.pixelSize: ScreenTools.defaultFontPixelSize * 0.75
font.weight: Font.DemiBold
width: parent.width * 0.549
color: isSatellite ? "black" : "white"
horizontalAlignment: TextEdit.AlignHCenter
}
} }
//-- Compass //-- Compass
Rectangle { Rectangle {
......
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