From c90f9a89b9a59619cb13ea75f140868109c0c85d Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sun, 4 Nov 2018 10:00:16 -0800 Subject: [PATCH] Use correct terminology for Altitude values --- src/PlanView/SimpleItemEditor.qml | 6 +++--- src/Vehicle/VehicleFact.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/PlanView/SimpleItemEditor.qml b/src/PlanView/SimpleItemEditor.qml index 7bbe3b8e4..be5f06599 100644 --- a/src/PlanView/SimpleItemEditor.qml +++ b/src/PlanView/SimpleItemEditor.qml @@ -112,13 +112,13 @@ Rectangle { readonly property string helpText: qsTr("Relative to home altitude") } QGCRadioButton { - text: qsTr("Abs") + text: qsTr("AMSL") exclusiveGroup: altRadios checked: missionItem.altitudeMode === altModeValue visible: QGroundControl.corePlugin.options.showMissionAbsoluteAltitude || missionItem.altitudeMode === altModeValue readonly property int altModeValue: _altModeAbsolute - readonly property string helpText: qsTr("Absolute WGS84") + readonly property string helpText: qsTr("Above Mean Sea Level") } QGCRadioButton { text: qsTr("AGL") @@ -126,7 +126,7 @@ Rectangle { checked: missionItem.altitudeMode === altModeValue readonly property int altModeValue: _altModeAboveTerrain - property string helpText: qsTr("Calculated from terrain data\nAbs Alt ") + missionItem.amslAltAboveTerrain.valueString + " " + missionItem.amslAltAboveTerrain.units + property string helpText: qsTr("Calculated from terrain data\nAMSL Alt ") + missionItem.amslAltAboveTerrain.valueString + " " + missionItem.amslAltAboveTerrain.units } QGCRadioButton { text: qsTr("TerrF") diff --git a/src/Vehicle/VehicleFact.json b/src/Vehicle/VehicleFact.json index 7adda5a1b..07233e5e3 100644 --- a/src/Vehicle/VehicleFact.json +++ b/src/Vehicle/VehicleFact.json @@ -64,14 +64,14 @@ }, { "name": "altitudeRelative", - "shortDescription": "Altitude-rel", + "shortDescription": "Alt (Rel)", "type": "double", "decimalPlaces": 1, "units": "m" }, { "name": "altitudeAMSL", - "shortDescription": "Altitude", + "shortDescription": "Alt (AMSL)", "type": "double", "decimalPlaces": 1, "units": "m" -- 2.22.0