From d307ae7f7f0c1f3d1e184298ddc5a45d46200e11 Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Tue, 30 Jun 2020 15:29:53 -0700 Subject: [PATCH] No need to call setMissionFlightStatus on newly created items --- src/MissionManager/CorridorScanComplexItemTest.cc | 5 ----- src/MissionManager/MissionController.cc | 2 -- src/MissionManager/MissionController.h | 2 +- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/MissionManager/CorridorScanComplexItemTest.cc b/src/MissionManager/CorridorScanComplexItemTest.cc index de1c7d189..cf85ddc17 100644 --- a/src/MissionManager/CorridorScanComplexItemTest.cc +++ b/src/MissionManager/CorridorScanComplexItemTest.cc @@ -32,11 +32,6 @@ void CorridorScanComplexItemTest::init(void) int expectedTransectCount = _expectedTransectCount; QCOMPARE(_corridorItem->_transectCount(), expectedTransectCount); - // vehicleSpeed need for terrain calcs - MissionController::MissionFlightStatus_t missionFlightStatus; - missionFlightStatus.vehicleSpeed = 5; - _corridorItem->setMissionFlightStatus(missionFlightStatus); - _corridorItem->setDirty(false); _rgCorridorPolygonSignals[corridorPolygonPathChangedIndex] = SIGNAL(pathChanged()); diff --git a/src/MissionManager/MissionController.cc b/src/MissionManager/MissionController.cc index 4a25e9593..ff3410494 100644 --- a/src/MissionManager/MissionController.cc +++ b/src/MissionManager/MissionController.cc @@ -331,7 +331,6 @@ VisualMissionItem* MissionController::_insertSimpleMissionItemWorker(QGeoCoordin } } } - newItem->setMissionFlightStatus(_missionFlightStatus); if (visualItemIndex == -1) { _visualItems->append(newItem); } else { @@ -372,7 +371,6 @@ VisualMissionItem* MissionController::insertTakeoffItem(QGeoCoordinate /*coordin newItem->setAltitudeMode(static_cast(prevAltitudeMode)); } } - newItem->setMissionFlightStatus(_missionFlightStatus); if (visualItemIndex == -1) { _visualItems->append(newItem); } else { diff --git a/src/MissionManager/MissionController.h b/src/MissionManager/MissionController.h index 473c9b17d..7df122531 100644 --- a/src/MissionManager/MissionController.h +++ b/src/MissionManager/MissionController.h @@ -44,7 +44,7 @@ public: MissionController(PlanMasterController* masterController, QObject* parent = nullptr); ~MissionController(); - typedef struct _MissionFlightStatus_t { + typedef struct { double maxTelemetryDistance; double totalDistance; double totalTime; -- 2.22.0