mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
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>
This commit is contained in:
parent
d5691cd7cb
commit
cddd5942f8
7 changed files with 97 additions and 67 deletions
|
@ -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);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue