Browse Source

No need to call setMissionFlightStatus on newly created items

QGC4.4
DonLakeFlyer 5 years ago
parent
commit
d307ae7f7f
  1. 5
      src/MissionManager/CorridorScanComplexItemTest.cc
  2. 2
      src/MissionManager/MissionController.cc
  3. 2
      src/MissionManager/MissionController.h

5
src/MissionManager/CorridorScanComplexItemTest.cc

@ -32,11 +32,6 @@ void CorridorScanComplexItemTest::init(void) @@ -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());

2
src/MissionManager/MissionController.cc

@ -331,7 +331,6 @@ VisualMissionItem* MissionController::_insertSimpleMissionItemWorker(QGeoCoordin @@ -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 @@ -372,7 +371,6 @@ VisualMissionItem* MissionController::insertTakeoffItem(QGeoCoordinate /*coordin
newItem->setAltitudeMode(static_cast<QGroundControlQmlGlobal::AltitudeMode>(prevAltitudeMode));
}
}
newItem->setMissionFlightStatus(_missionFlightStatus);
if (visualItemIndex == -1) {
_visualItems->append(newItem);
} else {

2
src/MissionManager/MissionController.h

@ -44,7 +44,7 @@ public: @@ -44,7 +44,7 @@ public:
MissionController(PlanMasterController* masterController, QObject* parent = nullptr);
~MissionController();
typedef struct _MissionFlightStatus_t {
typedef struct {
double maxTelemetryDistance;
double totalDistance;
double totalTime;

Loading…
Cancel
Save