src/MissionManager/QGCMapPolygon.h

@@ -38,6 +38,7 @@ public:
     Q_PROPERTY(bool                 interactive READ interactive    WRITE setInteractive    NOTIFY interactiveChanged)
     Q_PROPERTY(bool                 isValid     READ isValid                                NOTIFY isValidChanged)
     Q_PROPERTY(bool                 empty       READ empty                                  NOTIFY isEmptyChanged)
+    Q_PROPERTY(bool                 traceMode   MEMBER _traceMode                           NOTIFY traceModeChanged)
 
     Q_INVOKABLE void clear(void);
     Q_INVOKABLE void appendVertex(const QGeoCoordinate& coordinate);
@@ -124,6 +125,7 @@ signals:
     void interactiveChanged (bool interactive);
     bool isValidChanged     (void);
     bool isEmptyChanged     (void);
+    void traceModeChanged   (bool traceMode);
 
 private slots:
     void _polygonModelCountChanged(int count);
@@ -146,6 +148,7 @@ private:
     bool                _ignoreCenterUpdates;
     bool                _interactive;
     bool                _resetActive;
+    bool                _traceMode = false;
 };
 
 #endif

src/MissionManager/QGCMapPolygonVisuals.qml

@@ -38,7 +38,6 @@ Item {
     property bool   _circleRadiusDrag:          false
     property var    _circleRadiusDragCoord:     QtPositioning.coordinate()
     property bool   _editCircleRadius:          false
-    property bool   _traceMode:                 false
     property string _instructionText:           _polygonToolsText
     property var    _savedVertices:             [ ]
     property bool   _savedCircleMode
@@ -157,7 +156,7 @@ Item {
             addEditingVisuals()
             addToolbarVisuals()
         } else {
-            _traceMode = false
+            mapPolygon.traceMode = false
             removeEditingVisuals()
             removeToolVisuals()
         }
@@ -183,8 +182,18 @@ Item {
 
     onInteractiveChanged: _handleInteractiveChanged()
 
-    on_TraceModeChanged: {
-        if (_traceMode) {
+    on_CircleModeChanged: {
+        if (_circleMode) {
+            addCircleVisuals()
+        } else {
+            _objMgrCircleVisuals.destroyObjects()
+        }
+    }
+
+    Connections {
+        target: mapPolygon
+        onTraceModeChanged: {
+            if (mapPolygon.traceMode) {
                 _instructionText = _traceText
                 _objMgrTraceVisuals.createObject(traceMouseAreaComponent, mapControl, false)
             } else {
@@ -192,19 +201,13 @@ Item {
                 _objMgrTraceVisuals.destroyObjects()
             }
         }
-
-    on_CircleModeChanged: {
-        if (_circleMode) {
-            addCircleVisuals()
-        } else {
-            _objMgrCircleVisuals.destroyObjects()
-        }
     }
 
     Component.onCompleted: {
         addCommonVisuals()
         _handleInteractiveChanged()
     }
+    Component.onDestruction: map.traceMode = false
 
     QGCDynamicObjectManager { id: _objMgrCommonVisuals }
     QGCDynamicObjectManager { id: _objMgrToolVisuals }
@@ -526,30 +529,30 @@ Item {
             QGCButton {
                 _horizontalPadding: 0
                 text:               qsTr("Basic")
-                visible:            !_traceMode
+                visible:            !mapPolygon.traceMode
                 onClicked:          _resetPolygon()
             }
 
             QGCButton {
                 _horizontalPadding: 0
                 text:               qsTr("Circular")
-                visible:            !_traceMode
+                visible:            !mapPolygon.traceMode
                 onClicked:          _resetCircle()
             }
 
             QGCButton {
                 _horizontalPadding: 0
-                text:               _traceMode ? qsTr("Done Tracing") : qsTr("Trace")
+                text:               mapPolygon.traceMode ? qsTr("Done Tracing") : qsTr("Trace")
                 onClicked: {
-                    if (_traceMode) {
+                    if (mapPolygon.traceMode) {
                         if (mapPolygon.count < 3) {
                             _restorePreviousVertices()
                         }
-                        _traceMode = false
+                        mapPolygon.traceMode = false
                     } else {
                         _saveCurrentVertices()
                         _circleMode = false
-                        _traceMode = true
+                        mapPolygon.traceMode = true
                         mapPolygon.clear();
                     }
                 }
@@ -559,7 +562,7 @@ Item {
                 _horizontalPadding: 0
                 text:               qsTr("Load KML/SHP...")
                 onClicked:          kmlOrSHPLoadDialog.openForLoad()
-                visible:            !_traceMode
+                visible:            !mapPolygon.traceMode
             }
         }
     }

src/PlanView/SurveyItemEditor.qml

@@ -80,7 +80,7 @@ Rectangle {
                 QGCButton {
                     text:               qsTr("Done With Polygon")
                     Layout.fillWidth:   true
-                    enabled:            missionItem.surveyAreaPolygon.isValid
+                    enabled:            missionItem.surveyAreaPolygon.isValid && !missionItem.surveyAreaPolygon.traceMode
                     onClicked: {
                         if (!_presetsAvailable) {
                             missionItem.wizardMode = false