From b8a9c2fdfd01d6647e3e9c06f31575d3349a6d0b Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Tue, 3 Sep 2019 16:57:22 -0700 Subject: [PATCH] Fix missing waypointLinesChanged signal. Remove unnecessary directionArrowChanged signal. --- src/MissionManager/MissionController.cc | 3 +-- src/MissionManager/MissionController.h | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/MissionManager/MissionController.cc b/src/MissionManager/MissionController.cc index ca29a9987..14c138de4 100644 --- a/src/MissionManager/MissionController.cc +++ b/src/MissionManager/MissionController.cc @@ -1196,9 +1196,8 @@ void MissionController::_recalcWaypointLines(void) _waypointPath.append(QVariant::fromValue(QGeoCoordinate(0, 0))); } - //emit waypointLinesChanged(); + emit waypointLinesChanged(); emit waypointPathChanged(); - emit directionArrowsChanged(); } void MissionController::_updateBatteryInfo(int waypointIndex) diff --git a/src/MissionManager/MissionController.h b/src/MissionManager/MissionController.h index 500eb3cba..6fa43f346 100644 --- a/src/MissionManager/MissionController.h +++ b/src/MissionManager/MissionController.h @@ -70,7 +70,7 @@ public: 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(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,7 +206,6 @@ signals: void visualItemsChanged (void); void waypointLinesChanged (void); void waypointPathChanged (void); - void directionArrowsChanged (void); void newItemsFromVehicle (void); void missionDistanceChanged (double missionDistance); void missionTimeChanged (void); -- 2.22.0