zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Remote id fronted: hide all indicators if RID not connected: 

All this remote id feature depends on a device being detected
so it makes sense to not show the rest of the flags until
a healthy connection has been detected.

Also change label from RID COMMS to NOT CONNECTED when there is
no RID connection, so it is more descriptive to the user.
QGC4.4
davidsastresas 2 years ago committed by Philipp Borgers
parent
4433837670
commit
bec246a41a
2 changed files with 13 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      src/ui/preferences/RemoteIDSettings.qml
  2. 7
      src/ui/toolbar/RemoteIDIndicator.qml

10
src/ui/preferences/RemoteIDSettings.qml
Unescape View File

@ -42,6 +42,9 @@ Rectangle { @@ -42,6 +42,9 @@ Rectangle {
// Flag to get active vehicle and active RID
property var _activeRID: _activeVehicle && _activeVehicle.remoteIDManager ? _activeVehicle.remoteIDManager : null
// Healthy connection with RID device
property bool commsGood: _activeVehicle && _activeVehicle.remoteIDManager ? _activeVehicle.remoteIDManager.commsGood : false
// General properties
property var _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle
property int _regionOperation: QGroundControl.settingsManager.remoteIDSettings.region.value
@ -151,6 +154,7 @@ Rectangle { @@ -151,6 +154,7 @@ Rectangle {
Layout.preferredWidth: flagsWidth
color: _activeRID ? (_activeVehicle.remoteIDManager.armStatusGood ? qgcPal.colorGreen : qgcPal.colorRed) : qgcPal.colorGrey
radius: radiusFlags
visible: commsGood
QGCLabel {
anchors.fill: parent
@ -178,7 +182,7 @@ Rectangle { @@ -178,7 +182,7 @@ Rectangle {
QGCLabel {
anchors.fill: parent
text: qsTr("RID COMMS")
text: _activeRID && _activeVehicle.remoteIDManager.commsGood ? qsTr("RID COMMS") : qsTr("NOT CONNECTED")
wrapMode: Text.WordWrap
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
@ -192,6 +196,7 @@ Rectangle { @@ -192,6 +196,7 @@ Rectangle {
Layout.preferredWidth: flagsWidth
color: _activeRID ? (_activeVehicle.remoteIDManager.gcsGPSGood ? qgcPal.colorGreen : qgcPal.colorRed) : qgcPal.colorGrey
radius: radiusFlags
visible: commsGood
QGCLabel {
anchors.fill: parent
@ -215,6 +220,7 @@ Rectangle { @@ -215,6 +220,7 @@ Rectangle {
Layout.preferredWidth: flagsWidth
color: _activeRID ? (_activeVehicle.remoteIDManager.basicIDGood ? qgcPal.colorGreen : qgcPal.colorRed) : qgcPal.colorGrey
radius: radiusFlags
visible: commsGood
QGCLabel {
anchors.fill: parent
@ -238,7 +244,7 @@ Rectangle { @@ -238,7 +244,7 @@ Rectangle {
Layout.preferredWidth: flagsWidth
color: _activeRID ? (_activeVehicle.remoteIDManager.operatorIDGood ? qgcPal.colorGreen : qgcPal.colorRed) : qgcPal.colorGrey
radius: radiusFlags
visible: _activeRID ? (QGroundControl.settingsManager.remoteIDSettings.sendOperatorID.value || _regionOperation == RemoteIDSettings.RegionOperation.EU) : false
visible: commsGood && _activeRID ? (QGroundControl.settingsManager.remoteIDSettings.sendOperatorID.value || _regionOperation == RemoteIDSettings.RegionOperation.EU) : false
QGCLabel {
anchors.fill: parent

7
src/ui/toolbar/RemoteIDIndicator.qml
Unescape View File

@ -142,6 +142,7 @@ Item { @@ -142,6 +142,7 @@ Item {
source: armFlag ? "/qmlimages/RidFlagBackgroundGreen.svg" : "/qmlimages/RidFlagBackgroundRed.svg"
fillMode: Image.PreserveAspectFit
sourceSize.height: height
visible: commsFlag
QGCLabel {
anchors.fill: parent
@ -169,7 +170,7 @@ Item { @@ -169,7 +170,7 @@ Item {
QGCLabel {
anchors.fill: parent
text: qsTr("RID COMMS")
text: commsFlag ? qsTr("RID COMMS") : qsTr("NOT CONNECTED")
wrapMode: Text.WordWrap
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
@ -190,6 +191,7 @@ Item { @@ -190,6 +191,7 @@ Item {
source: gpsFlag ? "/qmlimages/RidFlagBackgroundGreen.svg" : "/qmlimages/RidFlagBackgroundRed.svg"
fillMode: Image.PreserveAspectFit
sourceSize.height: height
visible: commsFlag
QGCLabel {
anchors.fill: parent
@ -214,6 +216,7 @@ Item { @@ -214,6 +216,7 @@ Item {
source: basicIDFlag ? "/qmlimages/RidFlagBackgroundGreen.svg" : "/qmlimages/RidFlagBackgroundRed.svg"
fillMode: Image.PreserveAspectFit
sourceSize.height: height
visible: commsFlag
QGCLabel {
anchors.fill: parent
@ -238,7 +241,7 @@ Item { @@ -238,7 +241,7 @@ Item {
source: operatorIDFlag ? "/qmlimages/RidFlagBackgroundGreen.svg" : "/qmlimages/RidFlagBackgroundRed.svg"
fillMode: Image.PreserveAspectFit
sourceSize.height: height
visible: _activeVehicle ? (QGroundControl.settingsManager.remoteIDSettings.sendOperatorID.value || _regionOperation == RemoteIDIndicator.RegionOperation.EU) : false
visible: commsFlag && _activeVehicle ? (QGroundControl.settingsManager.remoteIDSettings.sendOperatorID.value || _regionOperation == RemoteIDIndicator.RegionOperation.EU) : false
QGCLabel {
anchors.fill: parent

Write Preview
Loading…
Cancel
Save