src/MissionManager/QGCMapPolygon.cc

@@ -29,6 +29,7 @@ QGCMapPolygon::QGCMapPolygon(QObject* parent)
     , _centerDrag           (false)
     , _ignoreCenterUpdates  (false)
     , _interactive          (false)
+    , _resetActive          (false)
 {
     _init();
 }
@@ -39,6 +40,7 @@ QGCMapPolygon::QGCMapPolygon(const QGCMapPolygon& other, QObject* parent)
     , _centerDrag           (false)
     , _ignoreCenterUpdates  (false)
     , _interactive          (false)
+    , _resetActive          (false)
 {
     *this = other;
 
@@ -265,11 +267,14 @@ void QGCMapPolygon::appendVertices(const QList<QGeoCoordinate>& coordinates)
 {
     QList<QObject*> objects;
 
+    _beginResetIfNotActive();
     for (const QGeoCoordinate& coordinate: coordinates) {
         objects.append(new QGCQGeoCoordinate(coordinate, this));
         _polygonPath.append(QVariant::fromValue(coordinate));
     }
     _polygonModel.append(objects);
+    _endResetIfNotActive();
+
     emit pathChanged();
 }
 
@@ -448,8 +453,10 @@ void QGCMapPolygon::offset(double distance)
     }
 
     // Update internals
+    _beginResetIfNotActive();
     clear();
     appendVertices(rgNewPolygon);
+    _endResetIfNotActive();
 }
 
 bool QGCMapPolygon::loadKMLOrSHPFile(const QString& file)
@@ -461,8 +468,10 @@ bool QGCMapPolygon::loadKMLOrSHPFile(const QString& file)
         return false;
     }
 
+    _beginResetIfNotActive();
     clear();
     appendVertices(rgCoords);
+    _endResetIfNotActive();
 
     return true;
 }
@@ -509,7 +518,37 @@ void QGCMapPolygon::verifyClockwiseWinding(void)
             rgReversed.prepend(varCoord.value<QGeoCoordinate>());
         }
 
+        _beginResetIfNotActive();
         clear();
         appendVertices(rgReversed);
+        _endResetIfNotActive();
+    }
+}
+
+void QGCMapPolygon::beginReset(void)
+{
+    _resetActive = true;
+    _polygonModel.beginReset();
+}
+
+void QGCMapPolygon::endReset(void)
+{
+    _resetActive = false;
+    _polygonModel.endReset();
+    emit pathChanged();
+    emit centerChanged(_center);
+}
+
+void QGCMapPolygon::_beginResetIfNotActive(void)
+{
+    if (!_resetActive) {
+        beginReset();
+    }
+}
+
+void QGCMapPolygon::_endResetIfNotActive(void)
+{
+    if (!_resetActive) {
+        endReset();
     }
 }

src/MissionManager/QGCMapPolygon.h

@@ -36,6 +36,8 @@ public:
     Q_PROPERTY(QGeoCoordinate       center      READ center         WRITE setCenter         NOTIFY centerChanged)
     Q_PROPERTY(bool                 centerDrag  READ centerDrag     WRITE setCenterDrag     NOTIFY centerDragChanged)
     Q_PROPERTY(bool                 interactive READ interactive    WRITE setInteractive    NOTIFY interactiveChanged)
+    Q_PROPERTY(bool                 isValid     READ isValid                                NOTIFY countChanged)
+    Q_PROPERTY(bool                 empty       READ empty                                  NOTIFY countChanged)
 
     Q_INVOKABLE void clear(void);
     Q_INVOKABLE void appendVertex(const QGeoCoordinate& coordinate);
@@ -69,6 +71,9 @@ public:
     /// Adjust polygon winding order to be clockwise (if needed)
     Q_INVOKABLE void verifyClockwiseWinding(void);
 
+    Q_INVOKABLE void beginReset (void);
+    Q_INVOKABLE void endReset   (void);
+
     /// Saves the polygon to the json object.
     ///     @param json Json object to save to
     void saveToJson(QJsonObject& json);
@@ -94,6 +99,8 @@ public:
     QGeoCoordinate  center      (void) const { return _center; }
     bool            centerDrag  (void) const { return _centerDrag; }
     bool            interactive (void) const { return _interactive; }
+    bool            isValid     (void) const { return _polygonModel.count() >= 3; }
+    bool            empty       (void) const { return _polygonModel.count() == 0; }
 
     QVariantList        path        (void) const { return _polygonPath; }
     QmlObjectListModel* qmlPathModel(void) { return &_polygonModel; }
@@ -122,10 +129,12 @@ private slots:
     void _updateCenter(void);
 
 private:
-    void _init(void);
-    QPolygonF _toPolygonF(void) const;
-    QGeoCoordinate _coordFromPointF(const QPointF& point) const;
-    QPointF _pointFFromCoord(const QGeoCoordinate& coordinate) const;
+    void            _init                   (void);
+    QPolygonF       _toPolygonF             (void) const;
+    QGeoCoordinate  _coordFromPointF        (const QPointF& point) const;
+    QPointF         _pointFFromCoord        (const QGeoCoordinate& coordinate) const;
+    void            _beginResetIfNotActive  (void);
+    void            _endResetIfNotActive    (void);
 
     QVariantList        _polygonPath;
     QmlObjectListModel  _polygonModel;
@@ -134,6 +143,7 @@ private:
     bool                _centerDrag;
     bool                _ignoreCenterUpdates;
     bool                _interactive;
+    bool                _resetActive;
 };
 
 #endif