bugs solved, area stat. added

src/MissionManager/QGCMapPolygon.cc

@@ -50,6 +50,8 @@ void QGCMapPolygon::_init(void)
     connect(&_polygonModel, &QmlObjectListModel::dirtyChanged, this, &QGCMapPolygon::_polygonModelDirtyChanged);
     connect(&_polygonModel, &QmlObjectListModel::countChanged, this, &QGCMapPolygon::_polygonModelCountChanged);
     connect(this, &QGCMapPolygon::pathChanged, this, &QGCMapPolygon::_updateCenter);
+    connect(this, &QGCMapPolygon::pathChanged, this, &QGCMapPolygon::areaChanged);
+    connect(this, &QGCMapPolygon::countChanged, this, &QGCMapPolygon::areaChanged);
 }
 
 const QGCMapPolygon& QGCMapPolygon::operator=(const QGCMapPolygon& other)

src/MissionManager/QGCMapPolygon.h

@@ -36,6 +36,7 @@ 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(double               area        READ area                                   NOTIFY areaChanged)
 
     Q_INVOKABLE void clear(void);
     Q_INVOKABLE void appendVertex(const QGeoCoordinate& coordinate);
@@ -114,6 +115,7 @@ signals:
     void centerChanged      (QGeoCoordinate center);
     void centerDragChanged  (bool centerDrag);
     void interactiveChanged (bool interactive);
+    void areaChanged        (void);
 
 public slots:
     void setPath                    (const QList<QGeoCoordinate>& path);

src/Wima/WimaPlaner.cc

@@ -93,6 +93,7 @@ void WimaPlaner::removeArea(int index)
             return;
         }
         area->clear();
+        area->borderPolygon()->clear();
 
         emit visualItemsChanged();
 

src/WimaView/WimaCorridorEditor.qml

@@ -168,6 +168,12 @@ Rectangle {
             /*QGCLabel { text: qsTr("Layers") }
             QGCLabel { text: areaItem.layers.valueString }*/
 
+            QGCLabel { text: qsTr("Area") }
+            QGCLabel { text: QGroundControl.squareMetersToAppSettingsAreaUnits(areaItem.area).toFixed(2) + " " + QGroundControl.appSettingsAreaUnitsString }
+
+            QGCLabel { text: qsTr("Nodes") }
+            QGCLabel { text: areaItem.count }
+
             }
     } // Column
 } // Rectangle

src/WimaView/WimaMeasurementAreaEditor.qml

@@ -143,8 +143,11 @@ Rectangle {
             columnSpacing:  ScreenTools.defaultFontPixelWidth
             visible:        statsHeader.checked
 
-            /*QGCLabel { text: qsTr("Layers") }
-            QGCLabel { text: areaItem.layers.valueString }*/
+            QGCLabel { text: qsTr("Area") }
+            QGCLabel { text: QGroundControl.squareMetersToAppSettingsAreaUnits(areaItem.area).toFixed(2) + " " + QGroundControl.appSettingsAreaUnitsString }
+
+            QGCLabel { text: qsTr("Nodes") }
+            QGCLabel { text: areaItem.count }
 
             }
     } // Column

src/WimaView/WimaServiceAreaEditor.qml

@@ -164,6 +164,12 @@ Rectangle {
             /*QGCLabel { text: qsTr("Layers") }
             QGCLabel { text: areaItem.layers.valueString }*/
 
+            QGCLabel { text: qsTr("Area") }
+            QGCLabel { text: QGroundControl.squareMetersToAppSettingsAreaUnits(areaItem.area).toFixed(2) + " " + QGroundControl.appSettingsAreaUnitsString }
+
+            QGCLabel { text: qsTr("Nodes") }
+            QGCLabel { text: areaItem.count }
+
             }
     } // Column
 } // Rectangle