Skip to content

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

Merge pull request #2301 from dogmaphobic/fontIssue 

Fixing black on black font issue.
parents 2a4b7c0a 98c4bbe4
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 0 deletions
src/ui/toolbar/MainToolBar.qml
View file @ 7148d7b8
......@@ -228,6 +228,7 @@ Rectangle {
id: gpsLabel
text: (activeVehicle && (activeVehicle.satelliteCount > 0)) ? "GPS Status" : "GPS Data Unavailable"
font.weight:Font.DemiBold
color: colorWhite
anchors.horizontalCenter: parent.horizontalCenter
}
GridLayout {
......@@ -239,15 +240,19 @@ Rectangle {
columns: 2
QGCLabel {
text: "GPS Count:"
color: colorWhite
}
QGCLabel {
text: activeVehicle ? (activeVehicle.satelliteCount) : "N/A"
color: colorWhite
}
QGCLabel {
text: "GPS Lock:"
color: colorWhite
}
QGCLabel {
text: getGpsLockStatus()
color: colorWhite
}
}
}
......@@ -277,6 +282,7 @@ Rectangle {
QGCLabel {
id: battLabel
text: (activeVehicle && (activeVehicle.batteryVoltage > 0)) ? "Battery Status" : "Battery Data Unavailable"
color: colorWhite
font.weight:Font.DemiBold
anchors.horizontalCenter: parent.horizontalCenter
}
......@@ -289,6 +295,7 @@ Rectangle {
columns: 2
QGCLabel {
text: "Voltage:"
color: colorWhite
}
QGCLabel {
text: activeVehicle ? (activeVehicle.batteryVoltage.toFixed(1) + " V") : "N/A"
......@@ -306,6 +313,7 @@ Rectangle {
*/
QGCLabel {
text: "Accumulated Consumption:"
color: colorWhite
}
QGCLabel {
text: activeVehicle ? (activeVehicle.batteryConsumed + " mA") : "N/A"
......@@ -339,6 +347,7 @@ Rectangle {
QGCLabel {
id: rssiLabel
text: activeVehicle ? (activeVehicle.rcRSSI > 0 ? "RC RSSI Status" : "RC RSSI Data Unavailable") : "N/A"
color: colorWhite
font.weight:Font.DemiBold
anchors.horizontalCenter: parent.horizontalCenter
}
......@@ -351,9 +360,11 @@ Rectangle {
columns: 2
QGCLabel {
text: "RSSI:"
color: colorWhite
}
QGCLabel {
text: activeVehicle ? (activeVehicle.rcRSSI + "%") : 0
color: colorWhite
}
}
}
......@@ -383,6 +394,7 @@ Rectangle {
QGCLabel {
id: telemLabel
text: "Telemetry RSSI Status"
color: colorWhite
font.weight:Font.DemiBold
anchors.horizontalCenter: parent.horizontalCenter
}
......@@ -394,45 +406,59 @@ Rectangle {
columns: 2
QGCLabel {
text: "Local RSSI:"
color: colorWhite
}
QGCLabel {
text: _controller.telemetryLRSSI + " dBm"
color: colorWhite
}
QGCLabel {
text: "Remote RSSI:"
color: colorWhite
}
QGCLabel {
text: _controller.telemetryRRSSI + " dBm"
color: colorWhite
}
QGCLabel {
text: "RX Errors:"
color: colorWhite
}
QGCLabel {
text: _controller.telemetryRXErrors
color: colorWhite
}
QGCLabel {
text: "Errors Fixed:"
color: colorWhite
}
QGCLabel {
text: _controller.telemetryFixed
color: colorWhite
}
QGCLabel {
text: "TX Buffer:"
color: colorWhite
}
QGCLabel {
text: _controller.telemetryTXBuffer
color: colorWhite
}
QGCLabel {
text: "Local Noise:"
color: colorWhite
}
QGCLabel {
text: _controller.telemetryLNoise
color: colorWhite
}
QGCLabel {
text: "Remote Noise:"
color: colorWhite
}
QGCLabel {
text: _controller.telemetryRNoise
color: colorWhite
}
}
}
......
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