From e7044bd2ced8a1e687def310e088b348179b12c1 Mon Sep 17 00:00:00 2001 From: Nate Weibley Date: Thu, 16 Jun 2016 16:51:21 -0400 Subject: [PATCH] Fix waypoint insertion so it actually works --- src/MissionManager/MissionController.cc | 4 ++-- src/MissionManager/SimpleMissionItem.cc | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/MissionManager/MissionController.cc b/src/MissionManager/MissionController.cc index bbdb3434e..aad4a0ad8 100644 --- a/src/MissionManager/MissionController.cc +++ b/src/MissionManager/MissionController.cc @@ -186,7 +186,7 @@ int MissionController::insertSimpleMissionItem(QGeoCoordinate coordinate, int i) _recalcAll(); - return sequenceNumber; + return newItem->sequenceNumber(); } int MissionController::insertComplexMissionItem(QGeoCoordinate coordinate, int i) @@ -202,7 +202,7 @@ int MissionController::insertComplexMissionItem(QGeoCoordinate coordinate, int i _recalcAll(); - return sequenceNumber; + return newItem->sequenceNumber(); } void MissionController::removeMissionItem(int index) diff --git a/src/MissionManager/SimpleMissionItem.cc b/src/MissionManager/SimpleMissionItem.cc index 9e22704fe..7f0e78e09 100644 --- a/src/MissionManager/SimpleMissionItem.cc +++ b/src/MissionManager/SimpleMissionItem.cc @@ -593,5 +593,10 @@ void SimpleMissionItem::setCoordinate(const QGeoCoordinate& coordinate) void SimpleMissionItem::setSequenceNumber(int sequenceNumber) { - _missionItem.setSequenceNumber(sequenceNumber); + if (_missionItem.sequenceNumber() != sequenceNumber) { + _missionItem.setSequenceNumber(sequenceNumber); + emit sequenceNumberChanged(sequenceNumber); + // This is too likely to ignore + emit abbreviationChanged(); + } } -- 2.22.0