Merge pull request #6248 from DonLakeFlyer/Stats

Make reusable Stats control for TransectStyleComplexItem

qgroundcontrol.qrc

@@ -125,6 +125,7 @@
         <file alias="QGroundControl/Controls/SliderSwitch.qml">src/QmlControls/SliderSwitch.qml</file>
         <file alias="QGroundControl/Controls/SubMenuButton.qml">src/QmlControls/SubMenuButton.qml</file>
         <file alias="QGroundControl/Controls/SurveyMapVisual.qml">src/PlanView/SurveyMapVisual.qml</file>
+		<file alias="QGroundControl/Controls/TransectStyleComplexItemStats.qml">src/PlanView/TransectStyleComplexItemStats.qml</file>
         <file alias="QGroundControl/Controls/ToolStrip.qml">src/QmlControls/ToolStrip.qml</file>
         <file alias="QGroundControl/Controls/VehicleRotationCal.qml">src/QmlControls/VehicleRotationCal.qml</file>
         <file alias="QGroundControl/Controls/VehicleSummaryRow.qml">src/QmlControls/VehicleSummaryRow.qml</file>

src/PlanView/CorridorScanEditor.qml

@@ -189,16 +189,6 @@ Rectangle {
             text:   qsTr("Statistics")
         }
 
-        Grid {
-            columns:        2
-            columnSpacing:  ScreenTools.defaultFontPixelWidth
-            visible:        statsHeader.checked
-
-            QGCLabel { text: qsTr("Photo count") }
-            QGCLabel { text: missionItem.cameraShots }
-
-            QGCLabel { text: qsTr("Photo interval") }
-            QGCLabel { text: missionItem.timeBetweenShots.toFixed(1) + " " + qsTr("secs") }
-        }
+        TransectStyleComplexItemStats { }
     } // Column
 } // Rectangle

src/PlanView/TransectStyleComplexItemStats.qml

+import QtQuick          2.3
+import QtQuick.Controls 1.2
+
+import QGroundControl               1.0
+import QGroundControl.ScreenTools   1.0
+import QGroundControl.Controls      1.0
+
+// Statistics section for TransectStyleComplexItems
+Grid {
+    // The following properties must be available up the hierarchy chain
+    //property var    missionItem       ///< Mission Item for editor
+
+    anchors.left:   parent.left
+    anchors.right:  parent.right
+    columns:        2
+    columnSpacing:  ScreenTools.defaultFontPixelWidth
+    visible:        statsHeader.checked
+
+    QGCLabel { text: qsTr("Survey Area") }
+    QGCLabel { text: QGroundControl.squareMetersToAppSettingsAreaUnits(missionItem.coveredArea).toFixed(2) + " " + QGroundControl.appSettingsAreaUnitsString }
+
+    QGCLabel { text: qsTr("Photo Count") }
+    QGCLabel { text: missionItem.cameraShots }
+
+    QGCLabel { text: qsTr("Photo Interval") }
+    QGCLabel { text: missionItem.timeBetweenShots.toFixed(1) + " " + qsTr("secs") }
+
+    QGCLabel { text: qsTr("Trigger Distance") }
+    QGCLabel { text: missionItem.cameraCalc.adjustedFootprintFrontal.valueString + " " + missionItem.cameraCalc.adjustedFootprintFrontal.units }
+}

src/QmlControls/QGroundControl.Controls.qmldir

@@ -71,6 +71,7 @@ SimpleItemMapVisuals    1.0 SimpleItemMapVisuals.qml
 SliderSwitch            1.0 SliderSwitch.qml
 SubMenuButton           1.0 SubMenuButton.qml
 SurveyMapVisuals        1.0 SurveyMapVisuals.qml
+TransectStyleComplexItemStats 1.0 TransectStyleComplexItemStats.qml
 ToolStrip               1.0 ToolStrip.qml
 VehicleRotationCal      1.0 VehicleRotationCal.qml
 VehicleSummaryRow       1.0 VehicleSummaryRow.qml