From 7b2020ba9755495c74388c83e9a6a1d6b8f28162 Mon Sep 17 00:00:00 2001
From: DonLakeFlyer <don@thegagnes.com>
Date: Sat, 15 Aug 2020 11:44:25 -0700
Subject: [PATCH] Convert to app units as needed

---
 src/PlanView/TerrainStatus.qml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/PlanView/TerrainStatus.qml b/src/PlanView/TerrainStatus.qml
index b8021cb0b..683183241 100644
--- a/src/PlanView/TerrainStatus.qml
+++ b/src/PlanView/TerrainStatus.qml
@@ -33,6 +33,7 @@ Rectangle {
     property real _minAMSLAltitude:     isNaN(missionController.minAMSLAltitude) ? 0 : missionController.minAMSLAltitude
     property real _maxAMSLAltitude:     isNaN(missionController.maxAMSLAltitude) ? 100 : missionController.maxAMSLAltitude
     property real _missionDistance:     isNaN(missionController.missionDistance) ? 100 : missionController.missionDistance
+    property var  _unitsConversion:     QGroundControl.unitsConversion
 
     function yPosFromAlt(alt) {
         var fullHeight = terrainProfileFlickable.height
@@ -46,9 +47,7 @@ Rectangle {
         anchors.top:            parent.bottom
         width:                  parent.height
         font.pointSize:         ScreenTools.smallFontPointSize
-        text:                   qsTr("Height AMSL (%1)").arg(
-                                    QGroundControl.unitsConversion.appSettingsHorizontalDistanceUnitsString
-                                )
+        text:                   qsTr("Height AMSL (%1)").arg(_unitsConversion.appSettingsHorizontalDistanceUnitsString)
         horizontalAlignment:    Text.AlignHCenter
         rotation:               -90
         transformOrigin:        Item.TopLeft
@@ -82,7 +81,7 @@ Rectangle {
                 ValueAxis {
                     id:                         axisX
                     min:                        0
-                    max:                        missionController.missionDistance
+                    max:                        _unitsConversion.metersToAppSettingsHorizontalDistanceUnits(missionController.missionDistance)
                     lineVisible:                true
                     labelsFont.family:          "Fixed"
                     labelsFont.pointSize:       ScreenTools.smallFontPointSize
@@ -93,8 +92,8 @@ Rectangle {
 
                 ValueAxis {
                     id:                         axisY
-                    min:                        _minAMSLAltitude
-                    max:                        _maxAMSLAltitude
+                    min:                        _unitsConversion.metersToAppSettingsVerticalDistanceUnits(_minAMSLAltitude)
+                    max:                        _unitsConversion.metersToAppSettingsVerticalDistanceUnits(_maxAMSLAltitude)
                     lineVisible:                true
                     labelsFont.family:          "Fixed"
                     labelsFont.pointSize:       ScreenTools.smallFontPointSize
@@ -109,8 +108,8 @@ Rectangle {
                     axisY:      axisY
                     visible:    true
 
-                    XYPoint { x: 0; y: _minAMSLAltitude }
-                    XYPoint { x: _missionDistance; y: _maxAMSLAltitude }
+                    XYPoint { x: 0; y: _unitsConversion.metersToAppSettingsVerticalDistanceUnits(_minAMSLAltitude) }
+                    XYPoint { x: _unitsConversion.metersToAppSettingsHorizontralDistanceUnits(_missionDistance); y: _unitsConversion.metersToAppSettingsVerticalDistanceUnits(_maxAMSLAltitude) }
                 }
             }
 
-- 
2.22.0