Merge pull request #8404 from DonLakeFlyer/RelAlt

Altitude Text fields: Don't show (Rel) additional units label all the time

src/FactSystem/FactControls/AltitudeFactTextField.qml

@@ -38,7 +38,8 @@ FactTextField {
         if (altitudeMode === QGroundControl.AltitudeModeNone) {
             _altitudeModeExtraUnits = _altModeNoneExtraUnits
         } else if (altitudeMode === QGroundControl.AltitudeModeRelative) {
-            _altitudeModeExtraUnits = _altModeRelativeExtraUnits
+            //_altitudeModeExtraUnits = _altModeRelativeExtraUnits
+            _altitudeModeExtraUnits = "" // Showing (rel) all the time is too noisy
         } else if (altitudeMode === QGroundControl.AltitudeModeAbsolute) {
             _altitudeModeExtraUnits = _altModeAbsoluteExtraUnits
         } else if (altitudeMode === QGroundControl.AltitudeModeAboveTerrain) {

src/PlanView/CorridorScanEditor.qml

@@ -118,7 +118,7 @@ Rectangle {
                     distanceToSurfaceLabel:         qsTr("Altitude")
                     distanceToSurfaceAltitudeMode:  missionItem.followTerrain ?
                                                         QGroundControl.AltitudeModeAboveTerrain :
-                                                        missionItem.cameraCalc.distanceToSurfaceRelative
+                                                        (missionItem.cameraCalc.distanceToSurfaceRelative ? QGroundControl.AltitudeModeRelative : QGroundControl.AltitudeModeAbsolute)
                     frontalDistanceLabel:           qsTr("Trigger Dist")
                     sideDistanceLabel:              qsTr("Spacing")
                 }

src/PlanView/SurveyItemEditor.qml

@@ -211,7 +211,7 @@ Rectangle {
                     distanceToSurfaceLabel:         qsTr("Altitude")
                     distanceToSurfaceAltitudeMode:  missionItem.followTerrain ?
                                                         QGroundControl.AltitudeModeAboveTerrain :
-                                                        missionItem.cameraCalc.distanceToSurfaceRelative
+                                                        (missionItem.cameraCalc.distanceToSurfaceRelative ? QGroundControl.AltitudeModeRelative : QGroundControl.AltitudeModeAbsolute)
                     frontalDistanceLabel:           qsTr("Trigger Dist")
                     sideDistanceLabel:              qsTr("Spacing")
                 }