SurveyMissionItem -> SurveyComplexItem

qgroundcontrol.pro

@@ -433,7 +433,7 @@ DebugBuild { PX4FirmwarePlugin { PX4FirmwarePluginFactory  { APMFirmwarePlugin {
         src/MissionManager/SimpleMissionItemTest.h \
         src/MissionManager/SpeedSectionTest.h \
         src/MissionManager/StructureScanComplexItemTest.h \
-        src/MissionManager/SurveyMissionItemTest.h \
+        src/MissionManager/SurveyComplexItemTest.h \
         src/MissionManager/TransectStyleComplexItemTest.h \
         src/MissionManager/VisualMissionItemTest.h \
         src/qgcunittest/FileDialogTest.h \
@@ -474,7 +474,7 @@ DebugBuild { PX4FirmwarePlugin { PX4FirmwarePluginFactory  { APMFirmwarePlugin {
         src/MissionManager/SimpleMissionItemTest.cc \
         src/MissionManager/SpeedSectionTest.cc \
         src/MissionManager/StructureScanComplexItemTest.cc \
-        src/MissionManager/SurveyMissionItemTest.cc \
+        src/MissionManager/SurveyComplexItemTest.cc \
         src/MissionManager/TransectStyleComplexItemTest.cc \
         src/MissionManager/VisualMissionItemTest.cc \
         src/qgcunittest/FileDialogTest.cc \
@@ -546,7 +546,7 @@ HEADERS += \
     src/MissionManager/Section.h \
     src/MissionManager/SpeedSection.h \
     src/MissionManager/StructureScanComplexItem.h \
-    src/MissionManager/SurveyMissionItem.h \
+    src/MissionManager/SurveyComplexItem.h \
     src/MissionManager/TransectStyleComplexItem.h \
     src/MissionManager/VisualMissionItem.h \
     src/PositionManager/PositionManager.h \
@@ -740,7 +740,7 @@ SOURCES += \
     src/MissionManager/SimpleMissionItem.cc \
     src/MissionManager/SpeedSection.cc \
     src/MissionManager/StructureScanComplexItem.cc \
-    src/MissionManager/SurveyMissionItem.cc \
+    src/MissionManager/SurveyComplexItem.cc \
     src/MissionManager/TransectStyleComplexItem.cc \
     src/MissionManager/VisualMissionItem.cc \
     src/PositionManager/PositionManager.cpp \

src/MissionManager/CorridorScanComplexItemTest.cc

@@ -117,10 +117,10 @@ void CorridorScanComplexItemTest::_testEntryLocation(void)
 
         QList<QGeoCoordinate> rgSeenEntryCoords;
         QList<int> rgEntryLocation;
-        rgEntryLocation << SurveyMissionItem::EntryLocationTopLeft
-                        << SurveyMissionItem::EntryLocationTopRight
-                        << SurveyMissionItem::EntryLocationBottomLeft
-                        << SurveyMissionItem::EntryLocationBottomRight;
+        rgEntryLocation << SurveyComplexItem::EntryLocationTopLeft
+                        << SurveyComplexItem::EntryLocationTopRight
+                        << SurveyComplexItem::EntryLocationBottomLeft
+                        << SurveyComplexItem::EntryLocationBottomRight;
 
         // Validate that each entry location is unique
         for (int i=0; i<rgEntryLocation.count(); i++) {

src/MissionManager/MissionController.cc

@@ -16,7 +16,7 @@
 #include "FirmwarePlugin.h"
 #include "QGCApplication.h"
 #include "SimpleMissionItem.h"
-#include "SurveyMissionItem.h"
+#include "SurveyComplexItem.h"
 #include "FixedWingLandingComplexItem.h"
 #include "StructureScanComplexItem.h"
 #include "CorridorScanComplexItem.h"
@@ -394,7 +394,7 @@ int MissionController::insertComplexMissionItem(QString itemName, QGeoCoordinate
 
     int sequenceNumber = _nextSequenceNumber();
     if (itemName == _surveyMissionItemName) {
-        newItem = new SurveyMissionItem(_controllerVehicle, _visualItems);
+        newItem = new SurveyComplexItem(_controllerVehicle, _visualItems);
         newItem->setCoordinate(mapCenterCoordinate);
         surveyStyleItem = true;
     } else if (itemName == _fwLandingMissionItemName) {
@@ -452,7 +452,7 @@ void MissionController::removeMissionItem(int index)
         return;
     }
 
-    bool removeSurveyStyle = _visualItems->value<SurveyMissionItem*>(index) || _visualItems->value<CorridorScanComplexItem*>(index);
+    bool removeSurveyStyle = _visualItems->value<SurveyComplexItem*>(index) || _visualItems->value<CorridorScanComplexItem*>(index);
     VisualMissionItem* item = qobject_cast<VisualMissionItem*>(_visualItems->removeAt(index));
 
     _deinitVisualItem(item);
@@ -462,7 +462,7 @@ void MissionController::removeMissionItem(int index)
         // Determine if the mission still has another survey style item in it
         bool foundSurvey = false;
         for (int i=1; i<_visualItems->count(); i++) {
-            if (_visualItems->value<SurveyMissionItem*>(i) || _visualItems->value<CorridorScanComplexItem*>(i)) {
+            if (_visualItems->value<SurveyComplexItem*>(i) || _visualItems->value<CorridorScanComplexItem*>(i)) {
                 foundSurvey = true;
                 break;
             }
@@ -519,7 +519,7 @@ bool MissionController::_loadJsonMissionFileV1(const QJsonObject& json, QmlObjec
     }
 
     // Read complex items
-    QList<SurveyMissionItem*> surveyItems;
+    QList<SurveyComplexItem*> surveyItems;
     QJsonArray complexArray(json[_jsonComplexItemsKey].toArray());
     qCDebug(MissionControllerLog) << "Json load: complex item count" << complexArray.count();
     for (int i=0; i<complexArray.count(); i++) {
@@ -530,7 +530,7 @@ bool MissionController::_loadJsonMissionFileV1(const QJsonObject& json, QmlObjec
             return false;
         }
 
-        SurveyMissionItem* item = new SurveyMissionItem(_controllerVehicle, visualItems);
+        SurveyComplexItem* item = new SurveyComplexItem(_controllerVehicle, visualItems);
         const QJsonObject itemObject = itemValue.toObject();
         if (item->load(itemObject, itemObject["id"].toInt(), errorString)) {
             surveyItems.append(item);
@@ -552,7 +552,7 @@ bool MissionController::_loadJsonMissionFileV1(const QJsonObject& json, QmlObjec
 
         // If there is a complex item that should be next in sequence add it in
         if (nextComplexItemIndex < surveyItems.count()) {
-            SurveyMissionItem* complexItem = surveyItems[nextComplexItemIndex];
+            SurveyComplexItem* complexItem = surveyItems[nextComplexItemIndex];
 
             if (complexItem->sequenceNumber() == nextSequenceNumber) {
                 qCDebug(MissionControllerLog) << "Json load: injecting complex item expectedSequence:actualSequence:" << nextSequenceNumber << complexItem->sequenceNumber();
@@ -686,9 +686,9 @@ bool MissionController::_loadJsonMissionFileV2(const QJsonObject& json, QmlObjec
             }
             QString complexItemType = itemObject[ComplexMissionItem::jsonComplexItemTypeKey].toString();
 
-            if (complexItemType == SurveyMissionItem::jsonComplexItemTypeValue) {
+            if (complexItemType == SurveyComplexItem::jsonComplexItemTypeValue) {
                 qCDebug(MissionControllerLog) << "Loading Survey: nextSequenceNumber" << nextSequenceNumber;
-                SurveyMissionItem* surveyItem = new SurveyMissionItem(_controllerVehicle, visualItems);
+                SurveyComplexItem* surveyItem = new SurveyComplexItem(_controllerVehicle, visualItems);
                 if (!surveyItem->load(itemObject, nextSequenceNumber++, errorString)) {
                     return false;
                 }

src/MissionManager/MissionItem.h

@@ -25,7 +25,7 @@
 #include "QGCLoggingCategory.h"
 #include "QmlObjectListModel.h"
 
-class SurveyMissionItem;
+class SurveyComplexItem;
 class SimpleMissionItem;
 class MissionController;
 #ifdef UNITTEST_BUILD
@@ -151,7 +151,7 @@ private:
     static const char*  _jsonParam3Key;
     static const char*  _jsonParam4Key;
 
-    friend class SurveyMissionItem;
+    friend class SurveyComplexItem;
     friend class SimpleMissionItem;
     friend class MissionController;
 #ifdef UNITTEST_BUILD

src/MissionManager/QGCMapPolygonTest.h

@@ -14,7 +14,6 @@
 #include "QGCMapPolygon.h"
 #include "QmlObjectListModel.h"
 
-/// Unit test for SurveyMissionItem
 class QGCMapPolygonTest : public UnitTest
 {
     Q_OBJECT

src/MissionManager/SectionTest.cc

@@ -8,7 +8,7 @@
  ****************************************************************************/
 
 #include "SectionTest.h"
-#include "SurveyMissionItem.h"
+#include "SurveyComplexItem.h"
 
 SectionTest::SectionTest(void)
     : _simpleItem(NULL)
@@ -83,7 +83,7 @@ void SectionTest::_commonScanTest(Section* section)
     waypointVisualItems.append(&simpleItem);
 
     QmlObjectListModel complexVisualItems;
-    SurveyMissionItem surveyItem(_offlineVehicle);
+    SurveyComplexItem surveyItem(_offlineVehicle);
     complexVisualItems.append(&surveyItem);
 
     // This tests the common cases which should not lead to scan succeess

src/MissionManager/SurveyMissionItem.h → src/MissionManager/SurveyComplexItem.h

@@ -7,9 +7,7 @@
  *
  ****************************************************************************/
 
-
-#ifndef SurveyMissionItem_H
-#define SurveyMissionItem_H
+#pragma once
 
 #include "ComplexMissionItem.h"
 #include "MissionItem.h"
@@ -17,14 +15,14 @@
 #include "QGCLoggingCategory.h"
 #include "QGCMapPolygon.h"
 
-Q_DECLARE_LOGGING_CATEGORY(SurveyMissionItemLog)
+Q_DECLARE_LOGGING_CATEGORY(SurveyComplexItemLog)
 
-class SurveyMissionItem : public ComplexMissionItem
+class SurveyComplexItem : public ComplexMissionItem
 {
     Q_OBJECT
 
 public:
-    SurveyMissionItem(Vehicle* vehicle, QObject* parent = NULL);
+    SurveyComplexItem(Vehicle* vehicle, QObject* parent = NULL);
 
     Q_PROPERTY(Fact*                gridAltitude                READ gridAltitude                   CONSTANT)
     Q_PROPERTY(Fact*                gridAltitudeRelative        READ gridAltitudeRelative           CONSTANT)
@@ -297,5 +295,3 @@ private:
 
     static const int _hoverAndCaptureDelaySeconds = 4;
 };
-
-#endif

src/MissionManager/SurveyMissionItemTest.cc → src/MissionManager/SurveyComplexItemTest.cc

@@ -7,17 +7,17 @@
  *
  ****************************************************************************/
 
-#include "SurveyMissionItemTest.h"
+#include "SurveyComplexItemTest.h"
 #include "QGCApplication.h"
 
-SurveyMissionItemTest::SurveyMissionItemTest(void)
+SurveyComplexItemTest::SurveyComplexItemTest(void)
     : _offlineVehicle(NULL)
 {
     _polyPoints << QGeoCoordinate(47.633550640000003, -122.08982199) << QGeoCoordinate(47.634129020000003, -122.08887249) <<
                    QGeoCoordinate(47.633619320000001, -122.08811074) << QGeoCoordinate(47.633189139999999, -122.08900124);
 }
 
-void SurveyMissionItemTest::init(void)
+void SurveyComplexItemTest::init(void)
 {
     UnitTest::init();
 
@@ -32,7 +32,7 @@ void SurveyMissionItemTest::init(void)
     _rgSurveySignals[dirtyChangedIndex] =                   SIGNAL(dirtyChanged(bool));
 
     _offlineVehicle = new Vehicle(MAV_AUTOPILOT_PX4, MAV_TYPE_QUADROTOR, qgcApp()->toolbox()->firmwarePluginManager(), this);
-    _surveyItem = new SurveyMissionItem(_offlineVehicle, this);
+    _surveyItem = new SurveyComplexItem(_offlineVehicle, this);
     _surveyItem->setTurnaroundDist(0);  // Unit test written for no turnaround distance
     _surveyItem->setDirty(false);
     _mapPolygon = _surveyItem->mapPolygon();
@@ -46,14 +46,14 @@ void SurveyMissionItemTest::init(void)
     QCOMPARE(_multiSpy->init(_surveyItem, _rgSurveySignals, _cSurveySignals), true);
 }
 
-void SurveyMissionItemTest::cleanup(void)
+void SurveyComplexItemTest::cleanup(void)
 {
     delete _surveyItem;
     delete _offlineVehicle;
     delete _multiSpy;
 }
 
-void SurveyMissionItemTest::_testDirty(void)
+void SurveyComplexItemTest::_testDirty(void)
 {
     QVERIFY(!_surveyItem->dirty());
     _surveyItem->setDirty(false);
@@ -110,7 +110,7 @@ void SurveyMissionItemTest::_testDirty(void)
     rgFacts.clear();
 }
 
-void SurveyMissionItemTest::_testCameraValueChanged(void)
+void SurveyComplexItemTest::_testCameraValueChanged(void)
 {
     // These facts should trigger cameraValueChanged when changed
     QList<Fact*> rgFacts;
@@ -145,7 +145,7 @@ void SurveyMissionItemTest::_testCameraValueChanged(void)
     rgFacts.clear();
 }
 
-void SurveyMissionItemTest::_testCameraTrigger(void)
+void SurveyComplexItemTest::_testCameraTrigger(void)
 {
 #if 0
     QCOMPARE(_surveyItem->property("cameraTrigger").toBool(), true);
@@ -182,7 +182,7 @@ void SurveyMissionItemTest::_testCameraTrigger(void)
 }
 
 // Clamp expected grid angle from 0<->180. We don't care about opposite angles like 90/270
-double SurveyMissionItemTest::_clampGridAngle180(double gridAngle)
+double SurveyComplexItemTest::_clampGridAngle180(double gridAngle)
 {
     if (gridAngle >= 0.0) {
         if (gridAngle == 360.0) {
@@ -200,7 +200,7 @@ double SurveyMissionItemTest::_clampGridAngle180(double gridAngle)
     return gridAngle;
 }
 
-void SurveyMissionItemTest::_setPolygon(void)
+void SurveyComplexItemTest::_setPolygon(void)
 {
     for (int i=0; i<_polyPoints.count(); i++) {
         QGeoCoordinate& vertex = _polyPoints[i];
@@ -208,7 +208,7 @@ void SurveyMissionItemTest::_setPolygon(void)
     }
 }
 
-void SurveyMissionItemTest::_testGridAngle(void)
+void SurveyComplexItemTest::_testGridAngle(void)
 {
     _setPolygon();
 
@@ -224,7 +224,7 @@ void SurveyMissionItemTest::_testGridAngle(void)
     }
 }
 
-void SurveyMissionItemTest::_testEntryLocation(void)
+void SurveyComplexItemTest::_testEntryLocation(void)
 {
     _setPolygon();
 
@@ -233,10 +233,10 @@ void SurveyMissionItemTest::_testEntryLocation(void)
 
         QList<QGeoCoordinate> rgSeenEntryCoords;
         QList<int> rgEntryLocation;
-        rgEntryLocation << SurveyMissionItem::EntryLocationTopLeft
-                        << SurveyMissionItem::EntryLocationTopRight
-                        << SurveyMissionItem::EntryLocationBottomLeft
-                        << SurveyMissionItem::EntryLocationBottomRight;
+        rgEntryLocation << SurveyComplexItem::EntryLocationTopLeft
+                        << SurveyComplexItem::EntryLocationTopRight
+                        << SurveyComplexItem::EntryLocationBottomLeft
+                        << SurveyComplexItem::EntryLocationBottomRight;
 
         // Validate that each entry location is unique
         for (int i=0; i<rgEntryLocation.count(); i++) {
@@ -251,7 +251,7 @@ void SurveyMissionItemTest::_testEntryLocation(void)
 }
 
 
-void SurveyMissionItemTest::_testItemCount(void)
+void SurveyComplexItemTest::_testItemCount(void)
 {
     QList<MissionItem*> items;
 

src/MissionManager/SurveyMissionItemTest.h → src/MissionManager/SurveyComplexItemTest.h

@@ -7,24 +7,22 @@
  *
  ****************************************************************************/
 
-
-#ifndef SurveyMissionItemTest_H
-#define SurveyMissionItemTest_H
+#pragma once
 
 #include "UnitTest.h"
 #include "TCPLink.h"
 #include "MultiSignalSpy.h"
-#include "SurveyMissionItem.h"
+#include "SurveyComplexItem.h"
 
 #include <QGeoCoordinate>
 
-/// Unit test for SurveyMissionItem
-class SurveyMissionItemTest : public UnitTest
+/// Unit test for SurveyComplexItem
+class SurveyComplexItemTest : public UnitTest
 {
     Q_OBJECT
     
 public:
-    SurveyMissionItemTest(void);
+    SurveyComplexItemTest(void);
 
 protected:
     void init(void) final;
@@ -72,9 +70,7 @@ private:
 
     Vehicle*                _offlineVehicle;
     MultiSignalSpy*         _multiSpy;
-    SurveyMissionItem*      _surveyItem;
+    SurveyComplexItem*      _surveyItem;
     QGCMapPolygon*          _mapPolygon;
     QList<QGeoCoordinate>   _polyPoints;
 };
-
-#endif

src/qgcunittest/UnitTestList.cc

@@ -20,7 +20,7 @@
 #include "MessageBoxTest.h"
 #include "MissionItemTest.h"
 #include "SimpleMissionItemTest.h"
-#include "SurveyMissionItemTest.h"
+#include "SurveyComplexItemTest.h"
 #include "MissionControllerTest.h"
 #include "MissionManagerTest.h"
 #include "RadioConfigTest.h"
@@ -63,7 +63,7 @@ UT_REGISTER_TEST(ParameterManagerTest)
 UT_REGISTER_TEST(MissionCommandTreeTest)
 UT_REGISTER_TEST(LogDownloadTest)
 UT_REGISTER_TEST(SendMavCommandTest)
-UT_REGISTER_TEST(SurveyMissionItemTest)
+UT_REGISTER_TEST(SurveyComplexItemTest)
 UT_REGISTER_TEST(CameraSectionTest)
 UT_REGISTER_TEST(SpeedSectionTest)
 UT_REGISTER_TEST(PlanMasterControllerTest)