summaryrefslogtreecommitdiffstats
path: root/desktop-widgets/command_edit.cpp
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2019-02-11 15:34:43 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2019-04-12 18:19:07 +0300
commitcddd5942f8accaa612d8e107b45c1bf3d47a5c95 (patch)
tree12fccf925d13078caa338f3c72332e9a3ec0cd79 /desktop-widgets/command_edit.cpp
parentd5691cd7cba5ffac6ffe1b6e85802abfc262decc (diff)
downloadsubsurface-cddd5942f8accaa612d8e107b45c1bf3d47a5c95.tar.gz
Undo: update dive list after edit command
The dive list was not updated automatically when an edit command was executed. There was already a signal to do that, viz. divesChanged(). But that signal worked by-trip and didn't have a dive-field specifier. The edit-commands used the divesEdited() signal that isn't by-trip but has a dive-field specifier. Unify these two signals to be by-trip and with dive-field specifier. This needs common code to generate the by-trip list that is moved to a command_private.h header. Since there might now be multiple signals (one per trip) actually check in the main-tab whether the current trip is affected to avoid multiple update of fields. This has the positive(?) effect of not doing any update if the current dive isn't changed. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'desktop-widgets/command_edit.cpp')
-rw-r--r--desktop-widgets/command_edit.cpp13
1 files changed, 11 insertions, 2 deletions
diff --git a/desktop-widgets/command_edit.cpp b/desktop-widgets/command_edit.cpp
index 73080061b..dd681e1d8 100644
--- a/desktop-widgets/command_edit.cpp
+++ b/desktop-widgets/command_edit.cpp
@@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
#include "command_edit.h"
+#include "command_private.h"
#include "core/divelist.h"
#include "core/qthelper.h" // for copy_qstring
#include "desktop-widgets/mapwidget.h" // TODO: Replace desktop-dependency by signal
@@ -59,7 +60,11 @@ void EditBase<T>::undo()
std::swap(old, value);
- emit diveListNotifier.divesEdited(QVector<dive *>::fromStdVector(dives), fieldId());
+ // Send signals.
+ DiveField id = fieldId();
+ processByTrip(dives, [&](dive_trip *trip, const QVector<dive *> &divesInTrip) {
+ emit diveListNotifier.divesChanged(trip, divesInTrip, id);
+ });
mark_divelist_changed(true);
}
@@ -460,7 +465,11 @@ void EditTagsBase::undo()
std::swap(tagsToAdd, tagsToRemove);
- emit diveListNotifier.divesEdited(QVector<dive *>::fromStdVector(dives), fieldId());
+ // Send signals.
+ DiveField id = fieldId();
+ processByTrip(dives, [&](dive_trip *trip, const QVector<dive *> &divesInTrip) {
+ emit diveListNotifier.divesChanged(trip, divesInTrip, id);
+ });
mark_divelist_changed(true);
}