From 06823adfa43be2b926128f235e0cb5597d9b5ed4 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Fri, 6 Sep 2019 14:45:10 -0700 Subject: [PATCH] Remove unnecessary signaling --- src/MissionManager/MissionController.cc | 2 -- src/MissionManager/MissionController.h | 6 ++---- src/MissionManager/MissionControllerTest.cc | 5 +---- src/MissionManager/MissionControllerTest.h | 2 -- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/MissionManager/MissionController.cc b/src/MissionManager/MissionController.cc index 82309fac29..a11afb3317 100644 --- a/src/MissionManager/MissionController.cc +++ b/src/MissionManager/MissionController.cc @@ -1229,8 +1229,6 @@ void MissionController::_recalcWaypointLines(void) _waypointPath.append(QVariant::fromValue(QGeoCoordinate(0, 0))); } - emit waypointLinesChanged(); - emit directionArrowsChanged(); emit waypointPathChanged(); } diff --git a/src/MissionManager/MissionController.h b/src/MissionManager/MissionController.h index cdb517262e..62b4235ec2 100644 --- a/src/MissionManager/MissionController.h +++ b/src/MissionManager/MissionController.h @@ -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: signals: void visualItemsChanged (void); - void waypointLinesChanged (void); - void directionArrowsChanged (void); void waypointPathChanged (void); void newItemsFromVehicle (void); void missionDistanceChanged (double missionDistance); diff --git a/src/MissionManager/MissionControllerTest.cc b/src/MissionManager/MissionControllerTest.cc index 29d3f2c9c7..effced1e72 100644 --- a/src/MissionManager/MissionControllerTest.cc +++ b/src/MissionManager/MissionControllerTest.cc @@ -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) _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) _missionController->insertSimpleMissionItem(coordinate, _missionController->visualItems()->count()); - QCOMPARE(_multiSpyMissionController->checkOnlySignalsByMask(waypointLinesChangedSignalMask), true); - QmlObjectListModel* visualItems = _missionController->visualItems(); QVERIFY(visualItems); diff --git a/src/MissionManager/MissionControllerTest.h b/src/MissionManager/MissionControllerTest.h index 101c20482d..88a4ec6e03 100644 --- a/src/MissionManager/MissionControllerTest.h +++ b/src/MissionManager/MissionControllerTest.h @@ -70,13 +70,11 @@ private: enum { visualItemsChangedSignalIndex = 0, - waypointLinesChangedSignalIndex, missionControllerMaxSignalIndex }; enum { visualItemsChangedSignalMask = 1 << visualItemsChangedSignalIndex, - waypointLinesChangedSignalMask = 1 << waypointLinesChangedSignalIndex, }; MultiSignalSpy* _multiSpyMissionController; -- GitLab