Skip to content

Q
qgroundcontrol
Commit 98c4bbe4 authored by dogmaphobic's avatar dogmaphobic
Browse files
Options

Fixing black on black font issue.

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