From 7d25e161c35284881fe759c881dfd56723d1cf23 Mon Sep 17 00:00:00 2001
From: Don Gagne <dongagne@outlook.com>
Date: Mon, 6 Aug 2018 09:37:34 -0700
Subject: [PATCH] Respect app units

---
 src/MissionManager/QGCMapPolygonVisuals.qml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/MissionManager/QGCMapPolygonVisuals.qml b/src/MissionManager/QGCMapPolygonVisuals.qml
index 670ee44ce..d82db1e2d 100644
--- a/src/MissionManager/QGCMapPolygonVisuals.qml
+++ b/src/MissionManager/QGCMapPolygonVisuals.qml
@@ -123,7 +123,6 @@ Item {
         _circle = false
     }
 
-    /// Reset polygon to a circle which fits within initial polygon
     function setCircleRadius(center, radius) {
         var unboundCenter = center.atDistanceAndAzimuth(0, 0)
         _circleRadius = radius
@@ -460,7 +459,8 @@ Item {
             }
 
             function setRadiusFromDialog() {
-                setCircleRadius(mapPolygon.center, radiusField.text)
+                var radius = QGroundControl.appSettingsDistanceUnitsToMeters(radiusField.text)
+                setCircleRadius(mapPolygon.center, radius)
                 _editCircleRadius = false
             }
 
@@ -484,7 +484,9 @@ Item {
 
                     QGCTextField {
                         id:                 radiusField
-                        text:               _circleRadius.toFixed(2)
+                        showUnits:          true
+                        unitsLabel:         QGroundControl.appSettingsDistanceUnitsString
+                        text:               QGroundControl.metersToAppSettingsDistanceUnits(_circleRadius).toFixed(2)
                         onEditingFinished:  setRadiusFromDialog()
                         inputMethodHints:   Qt.ImhFormattedNumbersOnly
                     }
-- 
2.22.0