Merge pull request #8404 from DonLakeFlyer/RelAlt

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

Merge pull request #8404 from DonLakeFlyer/RelAlt
Altitude Text fields: Don't show (Rel) additional units label all the time
e721fdd9 · Don Gagne · GitHub · 59b5fc31 · ba0d1550 · e721fdd9
Unverified Commit e721fdd9 authored Feb 25, 2020 by Don Gagne Committed by GitHub Feb 25, 2020
Showing with 4 additions and 3 deletions

AltitudeFactTextField.qml src/FactSystem/FactControls/AltitudeFactTextField.qml +2 -1

CorridorScanEditor.qml src/PlanView/CorridorScanEditor.qml +1 -1

SurveyItemEditor.qml src/PlanView/SurveyItemEditor.qml +1 -1

No files found.
--- a/src/FactSystem/FactControls/AltitudeFactTextField.qml
+++ b/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) {

--- a/src/PlanView/CorridorScanEditor.qml
+++ b/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")
                }

--- a/src/PlanView/SurveyItemEditor.qml
+++ b/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")
                }