From a431840075fbba6f882627496f18a0fb80630e4f Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Tue, 26 Nov 2019 00:08:35 +0100 Subject: Selection: move initialization of selection from view to model The goal here is to unify desktop and mobile by moving selection code from the desktop-only view. Currently, initialization of the selection still has to be called from the view after connecting the appropriate signals. This is due to the weird way in which create completely new models when resetting them. Signed-off-by: Berthold Stoeger --- qt-models/divetripmodel.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'qt-models/divetripmodel.cpp') diff --git a/qt-models/divetripmodel.cpp b/qt-models/divetripmodel.cpp index 04af9c47f..ee0620c5e 100644 --- a/qt-models/divetripmodel.cpp +++ b/qt-models/divetripmodel.cpp @@ -3,6 +3,7 @@ #include "core/divefilter.h" #include "core/gettextfromc.h" #include "core/metrics.h" +#include "core/selection.h" #include "core/trip.h" #include "core/qthelper.h" #include "core/divesite.h" @@ -372,6 +373,19 @@ void DiveTripModelBase::resetModel(DiveTripModelBase::Layout layout) currentModel.reset(new DiveTripModelList); } +// After resetting the model, the higher up model or view may call this +// function to get informed on the current selection. +// TODO: Currently, this reads and resets the selection. Make this more +// efficient by maintaining a list of selected dives. +void DiveTripModelBase::initSelection() +{ + std::vector dives = getDiveSelection(); + if (!dives.empty()) + setSelection(dives, current_dive); + else + select_newest_visible_dive(); +} + void DiveTripModelBase::clear() { beginResetModel(); -- cgit v1.2.3-70-g09d2