cmake: MissionManager add new source and delete obsolete

src/MissionManager/CMakeLists.txt

@@ -3,67 +3,126 @@ set(EXTRA_SRC)
 if(BUILD_TESTING)
 	list(APPEND EXTRA_SRC
 		CameraCalcTest.cc
+		CameraCalcTest.h
 		CameraSectionTest.cc
+		CameraSectionTest.h
 		CorridorScanComplexItemTest.cc
+		CorridorScanComplexItemTest.h
 		FWLandingPatternTest.cc
+		FWLandingPatternTest.h
 		MissionCommandTreeTest.cc
+		MissionCommandTreeTest.h
 		MissionControllerManagerTest.cc
+		MissionControllerManagerTest.h
 		MissionControllerTest.cc
+		MissionControllerTest.h
 		MissionItemTest.cc
+		MissionItemTest.h
 		MissionManagerTest.cc
+		MissionManagerTest.h
 		MissionSettingsTest.cc
+		MissionSettingsTest.h
 		PlanMasterControllerTest.cc
+		PlanMasterControllerTest.h
 		QGCMapPolygonTest.cc
+		QGCMapPolygonTest.h
 		QGCMapPolylineTest.cc
+		QGCMapPolylineTest.h
 		SectionTest.cc
+		SectionTest.h
 		SimpleMissionItemTest.cc
+		SimpleMissionItemTest.h
 		SpeedSectionTest.cc
+		SpeedSectionTest.h
 		StructureScanComplexItemTest.cc
+		StructureScanComplexItemTest.h
 		SurveyComplexItemTest.cc
+		SurveyComplexItemTest.h
 		TransectStyleComplexItemTest.cc
+		TransectStyleComplexItemTest.h
 		VisualMissionItemTest.cc
+		VisualMissionItemTest.h
 	)
 endif()
 
 add_library(MissionManager
+	BlankPlanCreator.cc
+	BlankPlanCreator.h
 	CameraCalc.cc
+	CameraCalc.h
 	CameraSection.cc
+	CameraSection.h
 	CameraSpec.cc
+	CameraSpec.h
 	ComplexMissionItem.cc
+	ComplexMissionItem.h
 	CorridorScanComplexItem.cc
+	CorridorScanComplexItem.h
 	CorridorScanPlanCreator.cc
-	CustomPlanCreator.cc
+	CorridorScanPlanCreator.h
 	FixedWingLandingComplexItem.cc
+	FixedWingLandingComplexItem.h
 	GeoFenceController.cc
+	GeoFenceController.h
 	GeoFenceManager.cc
+	GeoFenceManager.h
 	KML.cc
+	KML.h
 	MissionCommandList.cc
+	MissionCommandList.h
 	MissionCommandTree.cc
+	MissionCommandTree.h
 	MissionCommandUIInfo.cc
+	MissionCommandUIInfo.h
 	MissionController.cc
+	MissionController.h
 	MissionItem.cc
+	MissionItem.h
 	MissionManager.cc
+	MissionManager.h
 	MissionSettingsItem.cc
+	MissionSettingsItem.h
 	PlanCreator.cc
+	PlanCreator.h
 	PlanElementController.cc
+	PlanElementController.h
 	PlanManager.cc
+	PlanManager.h
 	PlanMasterController.cc
+	PlanMasterController.h
 	QGCFenceCircle.cc
+	QGCFenceCircle.h
 	QGCFencePolygon.cc
+	QGCFencePolygon.h
 	QGCMapCircle.cc
+	QGCMapCircle.h
 	QGCMapPolygon.cc
+	QGCMapPolygon.h
 	QGCMapPolyline.cc
+	QGCMapPolyline.h
 	RallyPoint.cc
 	RallyPointController.cc
+	RallyPointController.h
+	RallyPoint.h
 	RallyPointManager.cc
+	RallyPointManager.h
+	Section.h
 	SimpleMissionItem.cc
+	SimpleMissionItem.h
 	SpeedSection.cc
+	SpeedSection.h
 	StructureScanComplexItem.cc
+	StructureScanComplexItem.h
 	StructureScanPlanCreator.cc
+	StructureScanPlanCreator.h
 	SurveyComplexItem.cc
+	SurveyComplexItem.h
 	SurveyPlanCreator.cc
+	SurveyPlanCreator.h
 	TransectStyleComplexItem.cc
+	TransectStyleComplexItem.h
 	VisualMissionItem.cc
+	VisualMissionItem.h
 
 	Section.h # shouldn't be listed here, but isn't named properly for AUTOMOC
 

src/MissionManager/MissionLoader.h

-/****************************************************************************
- *
- *   (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
- *
- * QGroundControl is licensed according to the terms in the file
- * COPYING.md in the root of the source code directory.
- *
- ****************************************************************************/
-
-
-#ifndef MissionController_H
-#define MissionController_H
-
-#include "PlanElementController.h"
-#include "QmlObjectListModel.h"
-#include "Vehicle.h"
-#include "QGCLoggingCategory.h"
-#include "MavlinkQmlSingleton.h"
-#include "VisualMissionItem.h"
-
-#include <QHash>
-
-class CoordinateVector;
-
-Q_DECLARE_LOGGING_CATEGORY(MissionControllerLog)
-
-typedef QPair<VisualMissionItem*,VisualMissionItem*> VisualItemPair;
-typedef QHash<VisualItemPair, CoordinateVector*> CoordVectHashTable;
-class MissionController : public PlanElementController
-{
-    Q_OBJECT
-
-public:
-    MissionController(QObject* parent = NULL);
-    ~MissionController();
-
-    Q_PROPERTY(QGeoCoordinate       plannedHomePosition READ plannedHomePosition    NOTIFY plannedHomePositionChanged)
-    Q_PROPERTY(QmlObjectListModel*  visualItems         READ visualItems            NOTIFY visualItemsChanged)
-    Q_PROPERTY(QmlObjectListModel*  complexVisualItems  READ complexVisualItems     NOTIFY complexVisualItemsChanged)
-    Q_PROPERTY(QmlObjectListModel*  waypointLines       READ waypointLines          NOTIFY waypointLinesChanged)
-
-    Q_PROPERTY(double               missionDistance         READ missionDistance        NOTIFY missionDistanceChanged)
-    Q_PROPERTY(double               missionTime             READ missionTime            NOTIFY missionTimeChanged)
-    Q_PROPERTY(double               missionHoverDistance    READ missionHoverDistance   NOTIFY missionHoverDistanceChanged)
-    Q_PROPERTY(double               missionCruiseDistance   READ missionCruiseDistance  NOTIFY missionCruiseDistanceChanged)
-    Q_PROPERTY(double               missionHoverTime        READ missionHoverTime       NOTIFY missionHoverTimeChanged)
-    Q_PROPERTY(double               missionCruiseTime       READ missionCruiseTime      NOTIFY missionCruiseTimeChanged)
-    Q_PROPERTY(double               missionMaxTelemetry     READ missionMaxTelemetry    NOTIFY missionMaxTelemetryChanged)
-
-    Q_INVOKABLE void removeMissionItem(int index);
-
-    /// Add a new simple mission item to the list
-    ///     @param i: index to insert at
-    /// @return Sequence number for new item
-    Q_INVOKABLE int insertSimpleMissionItem(QGeoCoordinate coordinate, int i);
-
-    /// Add a new complex mission item to the list
-    ///     @param i: index to insert at
-    /// @return Sequence number for new item
-    Q_INVOKABLE int insertComplexMissionItem(QGeoCoordinate coordinate, int i);
-
-    // Overrides from PlanElementController
-    void start                      (bool editMode) final;
-    void startStaticActiveVehicle   (Vehicle* vehicle) final;
-    void loadFromVehicle            (void) final;
-    void sendToVehicle              (void) final;
-    void loadFromFilePicker         (void) final;
-    void loadFromFile               (const QString& filename) final;
-    void saveToFilePicker           (void) final;
-    void saveToFile                 (const QString& filename) final;
-    void removeAll                  (void) final;
-    bool syncInProgress             (void) const final;
-    bool dirty                      (void) const final;
-    void setDirty                   (bool dirty) final;
-
-    QString fileExtension(void) const final;
-
-    // Property accessors
-
-    QGeoCoordinate      plannedHomePosition (void);
-    QmlObjectListModel* visualItems         (void) { return _visualItems; }
-    QmlObjectListModel* complexVisualItems  (void) { return _complexItems; }
-    QmlObjectListModel* waypointLines       (void) { return &_waypointLines; }
-
-    double  missionDistance         (void) const { return _missionDistance; }
-    double  missionTime             (void) const { return _missionTime; }
-    double  missionHoverDistance    (void) const { return _missionHoverDistance; }
-    double  missionHoverTime        (void) const { return _missionHoverTime; }
-    double  missionCruiseDistance   (void) const { return _missionCruiseDistance; }
-    double  missionCruiseTime       (void) const { return _missionCruiseTime; }
-    double  missionMaxTelemetry     (void) const { return _missionMaxTelemetry; }
-    double  cruiseSpeed             (void) const;
-    double  hoverSpeed              (void) const;
-
-    static void createVisualItemsFromFile(const QString& filename);
-
-signals:
-    void plannedHomePositionChanged(QGeoCoordinate plannedHomePosition);
-    void visualItemsChanged(void);
-    void complexVisualItemsChanged(void);
-    void waypointLinesChanged(void);
-    void newItemsFromVehicle(void);
-    void missionDistanceChanged(double missionDistance);
-    void missionTimeChanged(void);
-    void missionHoverDistanceChanged(double missionHoverDistance);
-    void missionHoverTimeChanged(void);
-    void missionCruiseDistanceChanged(double missionCruiseDistance);
-    void missionCruiseTimeChanged(void);
-    void missionMaxTelemetryChanged(double missionMaxTelemetry);
-    void cruiseDistanceChanged(double cruiseDistance);
-    void hoverDistanceChanged(double hoverDistance);
-    void cruiseSpeedChanged(double cruiseSpeed);
-    void hoverSpeedChanged(double hoverSpeed);
-
-private slots:
-    void _newMissionItemsAvailableFromVehicle();
-    void _itemCommandChanged(void);
-    void _activeVehicleHomePositionAvailableChanged(bool homePositionAvailable);
-    void _activeVehicleHomePositionChanged(const QGeoCoordinate& homePosition);
-    void _inProgressChanged(bool inProgress);
-    void _currentMissionItemChanged(int sequenceNumber);
-    void _recalcWaypointLines(void);
-    void _recalcAltitudeRangeBearing(void);
-    void _homeCoordinateChanged(void);
-
-private:
-    void _init(void);
-    void _recalcSequence(void);
-    void _recalcChildItems(void);
-    void _recalcAll(void);
-    void _initAllVisualItems(void);
-    void _deinitAllVisualItems(void);
-    void _initVisualItem(VisualMissionItem* item);
-    void _deinitVisualItem(VisualMissionItem* item);
-    void _setupActiveVehicle(Vehicle* activeVehicle, bool forceLoadFromVehicle);
-    static void _calcPrevWaypointValues(double homeAlt, VisualMissionItem* currentItem, VisualMissionItem* prevItem, double* azimuth, double* distance, double* altDifference);
-    static double _calcDistanceToHome(VisualMissionItem* currentItem, VisualMissionItem* homeItem);
-    bool _findLastAltitude(double* lastAltitude, MAV_FRAME* frame);
-    bool _findLastAcceptanceRadius(double* lastAcceptanceRadius);
-    void _addPlannedHomePosition(QmlObjectListModel* visualItems, bool addToCenter);
-    double _normalizeLat(double lat);
-    double _normalizeLon(double lon);
-    bool _loadJsonMissionFile(const QByteArray& bytes, QmlObjectListModel* visualItems, QmlObjectListModel* complexItems, QString& errorString);
-    bool _loadJsonMissionFileV1(const QJsonObject& json, QmlObjectListModel* visualItems, QmlObjectListModel* complexItems, QString& errorString);
-    bool _loadJsonMissionFileV2(const QJsonObject& json, QmlObjectListModel* visualItems, QmlObjectListModel* complexItems, QString& errorString);
-    bool _loadTextMissionFile(QTextStream& stream, QmlObjectListModel* visualItems, QString& errorString);
-    int _nextSequenceNumber(void);
-    void _setMissionDistance(double missionDistance);
-    void _setMissionTime(double missionTime);
-    void _setMissionHoverDistance(double missionHoverDistance);
-    void _setMissionHoverTime(double missionHoverTime);
-    void _setMissionCruiseDistance(double missionCruiseDistance);
-    void _setMissionCruiseTime(double missionCruiseTime);
-    void _setMissionMaxTelemetry(double missionMaxTelemetry);
-
-    // Overrides from PlanElementController
-    void _activeVehicleBeingRemoved(void) final;
-    void _activeVehicleSet(void) final;
-
-private:
-    QmlObjectListModel* _visualItems;
-    QmlObjectListModel* _complexItems;
-    QmlObjectListModel  _waypointLines;
-    CoordVectHashTable  _linesTable;
-    bool                _firstItemsFromVehicle;
-    bool                _missionItemsRequested;
-    bool                _queuedSend;
-    double              _missionDistance;
-    double              _missionTime;
-    double              _missionHoverDistance;
-    double              _missionHoverTime;
-    double              _missionCruiseDistance;
-    double              _missionCruiseTime;
-    double              _missionMaxTelemetry;
-
-    static const char*  _settingsGroup;
-    static const char*  _jsonFileTypeValue;
-    static const char*  _jsonFirmwareTypeKey;
-    static const char*  _jsonVehicleTypeKey;
-    static const char*  _jsonCruiseSpeedKey;
-    static const char*  _jsonHoverSpeedKey;
-    static const char*  _jsonItemsKey;
-    static const char*  _jsonPlannedHomePositionKey;
-    static const char*  _jsonParamsKey;
-
-    // Deprecated V1 format keys
-    static const char*  _jsonMavAutopilotKey;
-    static const char*  _jsonComplexItemsKey;
-
-    static const int    _missionFileVersion;
-};
-
-#endif

src/PlanView/CMakeLists.txt

@@ -14,7 +14,6 @@ add_custom_target(PlanViewQml
 		MissionItemStatus.qml
 		MissionSettingsEditor.qml
 		PlanEditToolbar.qml
-		PlanStartOverlay.qml
 		PlanToolBarIndicators.qml
 		PlanToolBar.qml
 		PlanView.qml