Browse Source

Remove unnecessary signaling

QGC4.4
Don Gagne 6 years ago
parent
commit
06823adfa4
  1. 2
      src/MissionManager/MissionController.cc
  2. 6
      src/MissionManager/MissionController.h
  3. 5
      src/MissionManager/MissionControllerTest.cc
  4. 2
      src/MissionManager/MissionControllerTest.h

2
src/MissionManager/MissionController.cc

@ -1229,8 +1229,6 @@ void MissionController::_recalcWaypointLines(void) @@ -1229,8 +1229,6 @@ void MissionController::_recalcWaypointLines(void)
_waypointPath.append(QVariant::fromValue(QGeoCoordinate(0, 0)));
}
emit waypointLinesChanged();
emit directionArrowsChanged();
emit waypointPathChanged();
}

6
src/MissionManager/MissionController.h

@ -68,9 +68,9 @@ public: @@ -68,9 +68,9 @@ public:
} MissionFlightStatus_t;
Q_PROPERTY(QmlObjectListModel* visualItems READ visualItems NOTIFY visualItemsChanged)
Q_PROPERTY(QmlObjectListModel* waypointLines READ waypointLines NOTIFY waypointLinesChanged) ///< Used by Plan view only for interactive editing
Q_PROPERTY(QmlObjectListModel* waypointLines READ waypointLines CONSTANT) ///< Used by Plan view only for interactive editing
Q_PROPERTY(QVariantList waypointPath READ waypointPath NOTIFY waypointPathChanged) ///< Used by Fly view only for static display
Q_PROPERTY(QmlObjectListModel* directionArrows READ directionArrows NOTIFY directionArrowsChanged)
Q_PROPERTY(QmlObjectListModel* directionArrows READ directionArrows CONSTANT)
Q_PROPERTY(QStringList complexMissionItemNames READ complexMissionItemNames NOTIFY complexMissionItemNamesChanged)
Q_PROPERTY(QGeoCoordinate plannedHomePosition READ plannedHomePosition NOTIFY plannedHomePositionChanged)
@ -206,8 +206,6 @@ public: @@ -206,8 +206,6 @@ public:
signals:
void visualItemsChanged (void);
void waypointLinesChanged (void);
void directionArrowsChanged (void);
void waypointPathChanged (void);
void newItemsFromVehicle (void);
void missionDistanceChanged (double missionDistance);

5
src/MissionManager/MissionControllerTest.cc

@ -48,7 +48,6 @@ void MissionControllerTest::_initForFirmwareType(MAV_AUTOPILOT firmwareType) @@ -48,7 +48,6 @@ void MissionControllerTest::_initForFirmwareType(MAV_AUTOPILOT firmwareType)
// MissionController signals
_rgMissionControllerSignals[visualItemsChangedSignalIndex] = SIGNAL(visualItemsChanged());
_rgMissionControllerSignals[waypointLinesChangedSignalIndex] = SIGNAL(waypointLinesChanged());
// Master controller pulls offline vehicle info from settings
qgcApp()->toolbox()->settingsManager()->appSettings()->offlineEditingFirmwareType()->setRawValue(firmwareType);
@ -62,7 +61,7 @@ void MissionControllerTest::_initForFirmwareType(MAV_AUTOPILOT firmwareType) @@ -62,7 +61,7 @@ void MissionControllerTest::_initForFirmwareType(MAV_AUTOPILOT firmwareType)
_masterController->start(false /* flyView */);
// All signals should some through on start
QCOMPARE(_multiSpyMissionController->checkOnlySignalsByMask(visualItemsChangedSignalMask | waypointLinesChangedSignalMask), true);
QCOMPARE(_multiSpyMissionController->checkOnlySignalsByMask(visualItemsChangedSignalMask), true);
_multiSpyMissionController->clearAllSignals();
QmlObjectListModel* visualItems = _missionController->visualItems();
@ -120,8 +119,6 @@ void MissionControllerTest::_testAddWaypointWorker(MAV_AUTOPILOT firmwareType) @@ -120,8 +119,6 @@ void MissionControllerTest::_testAddWaypointWorker(MAV_AUTOPILOT firmwareType)
_missionController->insertSimpleMissionItem(coordinate, _missionController->visualItems()->count());
QCOMPARE(_multiSpyMissionController->checkOnlySignalsByMask(waypointLinesChangedSignalMask), true);
QmlObjectListModel* visualItems = _missionController->visualItems();
QVERIFY(visualItems);

2
src/MissionManager/MissionControllerTest.h

@ -70,13 +70,11 @@ private: @@ -70,13 +70,11 @@ private:
enum {
visualItemsChangedSignalIndex = 0,
waypointLinesChangedSignalIndex,
missionControllerMaxSignalIndex
};
enum {
visualItemsChangedSignalMask = 1 << visualItemsChangedSignalIndex,
waypointLinesChangedSignalMask = 1 << waypointLinesChangedSignalIndex,
};
MultiSignalSpy* _multiSpyMissionController;

Loading…
Cancel
Save