2017-04-27 18:25:32 +00:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
2015-05-28 21:33:51 +00:00
|
|
|
#ifndef DIVETRIPMODEL_H
|
|
|
|
#define DIVETRIPMODEL_H
|
|
|
|
|
2016-04-05 05:02:03 +00:00
|
|
|
#include "core/dive.h"
|
2020-02-03 18:33:06 +00:00
|
|
|
#include "core/subsurface-qt/divelistnotifier.h"
|
2018-09-30 14:06:17 +00:00
|
|
|
#include <QAbstractItemModel>
|
2020-03-24 08:01:24 +00:00
|
|
|
#include <QBrush>
|
|
|
|
#include <QFont>
|
2015-05-28 21:33:51 +00:00
|
|
|
|
2019-12-16 16:26:57 +00:00
|
|
|
class DiveFilter;
|
2019-11-19 20:40:03 +00:00
|
|
|
|
2018-12-27 09:06:11 +00:00
|
|
|
// There are two different representations of the dive list:
|
|
|
|
// 1) Tree view: two-level model where dives are grouped by trips
|
|
|
|
// 2) List view: one-level model where dives are sorted by one out
|
|
|
|
// of many keys (e.g. date, depth, etc.).
|
|
|
|
//
|
2019-11-09 09:45:08 +00:00
|
|
|
// These two representations are realized by two classes, viz.
|
2018-12-27 09:06:11 +00:00
|
|
|
// DiveTripModelTree and DiveTripModelList. Both classes derive
|
|
|
|
// from DiveTripModelBase, which implements common features (e.g.
|
|
|
|
// definition of the column types, access of data from the core
|
|
|
|
// structures) and a common interface.
|
|
|
|
class DiveTripModelBase : public QAbstractItemModel {
|
2015-05-28 21:33:51 +00:00
|
|
|
Q_OBJECT
|
|
|
|
public:
|
|
|
|
enum Column {
|
|
|
|
NR,
|
|
|
|
DATE,
|
|
|
|
RATING,
|
|
|
|
DEPTH,
|
|
|
|
DURATION,
|
|
|
|
TEMPERATURE,
|
|
|
|
TOTALWEIGHT,
|
|
|
|
SUIT,
|
|
|
|
CYLINDER,
|
|
|
|
GAS,
|
|
|
|
SAC,
|
|
|
|
OTU,
|
|
|
|
MAXCNS,
|
2018-04-04 06:18:29 +00:00
|
|
|
TAGS,
|
2016-11-19 12:23:54 +00:00
|
|
|
PHOTOS,
|
2018-09-04 15:10:11 +00:00
|
|
|
BUDDIES,
|
2022-02-12 13:35:22 +00:00
|
|
|
DIVEGUIDE,
|
2017-10-02 15:52:07 +00:00
|
|
|
COUNTRY,
|
2015-05-28 21:33:51 +00:00
|
|
|
LOCATION,
|
2023-03-16 00:29:43 +00:00
|
|
|
NOTES,
|
2015-05-28 21:33:51 +00:00
|
|
|
COLUMNS
|
|
|
|
};
|
|
|
|
|
|
|
|
enum ExtraRoles {
|
|
|
|
STAR_ROLE = Qt::UserRole + 1,
|
2019-11-11 20:36:51 +00:00
|
|
|
IS_TRIP_ROLE,
|
2015-05-28 21:33:51 +00:00
|
|
|
DIVE_ROLE,
|
|
|
|
TRIP_ROLE,
|
2018-08-01 08:47:09 +00:00
|
|
|
DIVE_IDX,
|
2020-01-12 00:40:20 +00:00
|
|
|
SELECTED_ROLE,
|
2020-03-06 15:33:34 +00:00
|
|
|
CURRENT_ROLE,
|
2019-11-11 20:16:48 +00:00
|
|
|
TRIP_HAS_CURRENT_ROLE, // Returns true if this is a trip and it contains the current dive
|
|
|
|
LAST_ROLE
|
2015-05-28 21:33:51 +00:00
|
|
|
};
|
|
|
|
enum Layout {
|
|
|
|
TREE,
|
|
|
|
LIST,
|
|
|
|
};
|
|
|
|
|
2019-11-25 23:08:35 +00:00
|
|
|
// Call after having set the model to be informed of the current selection.
|
|
|
|
void initSelection();
|
|
|
|
|
2015-05-28 21:33:51 +00:00
|
|
|
Qt::ItemFlags flags(const QModelIndex &index) const;
|
2018-09-29 20:13:44 +00:00
|
|
|
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
|
2018-12-27 09:06:11 +00:00
|
|
|
DiveTripModelBase(QObject *parent = 0);
|
2018-09-30 14:06:17 +00:00
|
|
|
int columnCount(const QModelIndex&) const;
|
2018-10-29 19:17:53 +00:00
|
|
|
|
|
|
|
// Used for sorting. This is a bit of a layering violation, as sorting should be performed
|
|
|
|
// by the higher-up QSortFilterProxyModel, but it makes things so much easier!
|
2018-12-27 09:06:11 +00:00
|
|
|
virtual bool lessThan(const QModelIndex &i1, const QModelIndex &i2) const = 0;
|
cleanup: invert control-flow when resetting the core structures
To reset the core data structures, the mobile and desktop UIs
were calling into the dive-list models, which then reset the
core data structures, themselves and the unrelated
locationinformation model. The UI code then reset various other
things, such as the TankInformation model or the map. . This was
unsatisfying from a control-flow perspective, as the models should
display the core data, not act on it. Moreover, this meant lots
of intricate intermodule-dependencies.
Thus, straighten up the control flow: give the C core the
possibility to send a "all data reset" event. And do that
in those functions that reset the core data structures.
Let each module react to this event by itself. This removes
inter-module dependencies. For example, the MainWindow now
doesn't have to reset the TankInfoModel or the MapWidget.
Then, to reset the core data structures, let the UI code
simply directly call the respective core functions.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2020-05-04 22:12:36 +00:00
|
|
|
protected slots:
|
|
|
|
void reset();
|
Undo: select dives after add, remove, merge, split dive commands
Select the proper dives after the add, remove, split and merge
dives commands on undo *and* redo. Generally, select the added
dives. For undo of add, remember the pre-addition selection.
For redo of remove, select the closest dive to the first removed
dive.
The biggest part of the commit is the signal-interface between
the dive commands and the dive-list model and dive-list view.
This is done in two steps:
1) To the DiveTripModel in batches of trips. The dive trip model
transforms the dives into indices.
2) To the DiveListView. The DiveListView has to translate the
DiveTripModel indexes to actual indexes via its QSortFilterProxy-
model.
For code-reuse, derive all divelist-changing commands from a new base-class,
which has a flag that describes whether the divelist changed. The helper
functions which add and remove dives are made members of the base class and
set the flag is a selected dive is added or removed.
To properly detect when the current dive was deleted it
became necessary to turn the current dive from an index
to a pointer, because indices are not stable.
Unfortunately, in some cases an index was expected and these
places now have to transform the dive into an index. These
should be converted in due course.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-08-03 09:35:43 +00:00
|
|
|
signals:
|
|
|
|
// The propagation of selection changes is complex.
|
|
|
|
// The control flow of dive-selection goes:
|
|
|
|
// Commands/DiveListNotifier ---(dive */dive_trip *)---> DiveTripModel ---(QModelIndex)---> DiveListView
|
|
|
|
// i.e. The command objects send changes in terms of pointer-to-dives, which the DiveTripModel transforms
|
|
|
|
// into QModelIndexes according to the current view (tree/list). Finally, the DiveListView transforms these
|
2020-03-11 10:30:51 +00:00
|
|
|
// indices into local indices according to current sorting/filtering and instructs the QSelectionModel to
|
Undo: select dives after add, remove, merge, split dive commands
Select the proper dives after the add, remove, split and merge
dives commands on undo *and* redo. Generally, select the added
dives. For undo of add, remember the pre-addition selection.
For redo of remove, select the closest dive to the first removed
dive.
The biggest part of the commit is the signal-interface between
the dive commands and the dive-list model and dive-list view.
This is done in two steps:
1) To the DiveTripModel in batches of trips. The dive trip model
transforms the dives into indices.
2) To the DiveListView. The DiveListView has to translate the
DiveTripModel indexes to actual indexes via its QSortFilterProxy-
model.
For code-reuse, derive all divelist-changing commands from a new base-class,
which has a flag that describes whether the divelist changed. The helper
functions which add and remove dives are made members of the base class and
set the flag is a selected dive is added or removed.
To properly detect when the current dive was deleted it
became necessary to turn the current dive from an index
to a pointer, because indices are not stable.
Unfortunately, in some cases an index was expected and these
places now have to transform the dive into an index. These
should be converted in due course.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-08-03 09:35:43 +00:00
|
|
|
// perform the appropriate actions.
|
2020-03-11 10:30:51 +00:00
|
|
|
void selectionChanged(const QVector<QModelIndex> &indices);
|
2019-11-24 14:05:35 +00:00
|
|
|
void currentDiveChanged(QModelIndex index);
|
2018-12-27 09:06:11 +00:00
|
|
|
protected:
|
2020-03-06 15:57:58 +00:00
|
|
|
dive *oldCurrent;
|
2020-03-24 08:01:24 +00:00
|
|
|
QBrush invalidForeground;
|
|
|
|
QFont invalidFont;
|
2020-03-06 15:57:58 +00:00
|
|
|
|
2018-12-27 09:06:11 +00:00
|
|
|
// Access trip and dive data
|
2020-03-24 08:01:24 +00:00
|
|
|
QVariant diveData(const struct dive *d, int column, int role) const; // Not static because we have to access invalidFont
|
2018-12-27 09:06:11 +00:00
|
|
|
static QVariant tripData(const dive_trip *trip, int column, int role);
|
2019-11-12 05:31:56 +00:00
|
|
|
static QString tripTitle(const dive_trip *trip);
|
|
|
|
static QString tripShortDate(const dive_trip *trip);
|
2022-02-12 13:43:04 +00:00
|
|
|
static QString getDescription(int column);
|
2020-03-06 15:57:58 +00:00
|
|
|
void currentChanged();
|
2018-12-27 09:06:11 +00:00
|
|
|
|
|
|
|
virtual dive *diveOrNull(const QModelIndex &index) const = 0; // Returns a dive if this index represents a dive, null otherwise
|
2019-11-18 17:44:17 +00:00
|
|
|
virtual void clearData() = 0;
|
2019-12-11 08:50:38 +00:00
|
|
|
virtual void populate() = 0;
|
2020-03-06 15:57:58 +00:00
|
|
|
virtual QModelIndex diveToIdx(const dive *d) const = 0;
|
2018-12-27 09:06:11 +00:00
|
|
|
};
|
|
|
|
|
2020-02-20 11:12:23 +00:00
|
|
|
class DiveTripModelTree final : public DiveTripModelBase
|
2018-12-27 09:06:11 +00:00
|
|
|
{
|
|
|
|
Q_OBJECT
|
|
|
|
public slots:
|
Dive list: implement proper Qt-model semantics for DiveTripModel
Previously, each dive-list modifying function would lead to a
full model reset. Instead, implement proper Qt-model semantics
using beginInsertRows()/endInsertRows(), beginRemoveRows()/
endRemoveRows(), dataChange().
To do so, a DiveListNotifer singleton is generatated, which
broadcasts all changes to the dive-list. Signals are sent by
the commands and received by the DiveTripModel. Signals are
batched by dive-trip. This seems to be an adequate compromise
for the two kinds of list-views (tree and list). In the common
usecase mostly dives of a single trip are affected.
Thus, batching of dives is performed in two positions:
- At command-level to batch by trip
- In DiveTripModel to feed batches of contiguous elements
to Qt's begin*/end*-functions.
This is conceptually simple, but rather complex code. To avoid
repetition of complex loops, the batching is implemented in
templated-functions, which are passed lambda-functions, which
are called for each batch.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-30 07:20:25 +00:00
|
|
|
void divesAdded(dive_trip *trip, bool addTrip, const QVector<dive *> &dives);
|
|
|
|
void divesDeleted(dive_trip *trip, bool deleteTrip, const QVector<dive *> &dives);
|
|
|
|
void divesMovedBetweenTrips(dive_trip *from, dive_trip *to, bool deleteFrom, bool createTo, const QVector<dive *> &dives);
|
2019-08-31 13:05:11 +00:00
|
|
|
void diveSiteChanged(dive_site *ds, int field);
|
2019-06-23 07:22:26 +00:00
|
|
|
void divesChanged(const QVector<dive *> &dives);
|
2020-04-19 17:04:56 +00:00
|
|
|
void diveChanged(dive *d);
|
2019-06-23 07:22:26 +00:00
|
|
|
void divesTimeChanged(timestamp_t delta, const QVector<dive *> &dives);
|
2020-03-11 21:21:18 +00:00
|
|
|
void divesSelected(const QVector<dive *> &dives);
|
2019-02-24 22:02:22 +00:00
|
|
|
void tripChanged(dive_trip *trip, TripField);
|
2019-12-09 14:13:53 +00:00
|
|
|
void filterReset();
|
2018-12-27 09:06:11 +00:00
|
|
|
|
|
|
|
public:
|
|
|
|
DiveTripModelTree(QObject *parent = nullptr);
|
2020-02-20 21:22:57 +00:00
|
|
|
int tripInDirection(const struct dive *d, int direction) const;
|
2015-05-28 21:33:51 +00:00
|
|
|
private:
|
2018-12-27 09:06:11 +00:00
|
|
|
int rowCount(const QModelIndex &parent) const override;
|
2019-11-18 17:44:17 +00:00
|
|
|
void clearData() override;
|
2019-12-11 08:50:38 +00:00
|
|
|
void populate() override;
|
2018-12-27 09:06:11 +00:00
|
|
|
QModelIndex index(int row, int column, const QModelIndex &parent) const override;
|
|
|
|
QModelIndex parent(const QModelIndex &index) const override;
|
|
|
|
QVariant data(const QModelIndex &index, int role) const override;
|
|
|
|
bool lessThan(const QModelIndex &i1, const QModelIndex &i2) const override;
|
2019-06-23 09:13:41 +00:00
|
|
|
void divesSelectedTrip(dive_trip *trip, const QVector<dive *> &dives, QVector<QModelIndex> &);
|
2018-12-27 09:06:11 +00:00
|
|
|
dive *diveOrNull(const QModelIndex &index) const override;
|
2019-06-23 07:22:26 +00:00
|
|
|
void divesChangedTrip(dive_trip *trip, const QVector<dive *> &dives);
|
2020-02-09 21:47:47 +00:00
|
|
|
void divesShown(dive_trip *trip, const QVector<dive *> &dives);
|
|
|
|
void divesHidden(dive_trip *trip, const QVector<dive *> &dives);
|
2019-06-23 07:22:26 +00:00
|
|
|
void divesTimeChangedTrip(dive_trip *trip, timestamp_t delta, const QVector<dive *> &dives);
|
2020-03-06 15:57:58 +00:00
|
|
|
void divesDeletedInternal(dive_trip *trip, bool deleteTrip, const QVector<dive *> &dives);
|
2018-12-27 09:06:11 +00:00
|
|
|
|
|
|
|
// The tree model has two levels. At the top level, we have either trips or dives
|
2018-09-30 14:06:17 +00:00
|
|
|
// that do not belong to trips. Such a top-level item is represented by the "Item"
|
2018-11-10 08:07:42 +00:00
|
|
|
// struct, which is based on the dive_or_trip structure.
|
|
|
|
// If it is a trip, additionally, the dives are collected in a vector.
|
|
|
|
// The items are ordered chronologically according to the dive_or_trip_less_than()
|
|
|
|
// function, which guarantees a stable ordering even in the case of equal timestamps.
|
|
|
|
// For dives and trips, it place dives chronologically after trips, so that in
|
|
|
|
// the default-descending view they are shown before trips.
|
2018-09-30 14:06:17 +00:00
|
|
|
struct Item {
|
2018-11-10 08:07:42 +00:00
|
|
|
dive_or_trip d_or_t;
|
|
|
|
std::vector<dive *> dives; // std::vector<> instead of QVector for insert() with three iterators
|
Dive list: implement proper Qt-model semantics for DiveTripModel
Previously, each dive-list modifying function would lead to a
full model reset. Instead, implement proper Qt-model semantics
using beginInsertRows()/endInsertRows(), beginRemoveRows()/
endRemoveRows(), dataChange().
To do so, a DiveListNotifer singleton is generatated, which
broadcasts all changes to the dive-list. Signals are sent by
the commands and received by the DiveTripModel. Signals are
batched by dive-trip. This seems to be an adequate compromise
for the two kinds of list-views (tree and list). In the common
usecase mostly dives of a single trip are affected.
Thus, batching of dives is performed in two positions:
- At command-level to batch by trip
- In DiveTripModel to feed batches of contiguous elements
to Qt's begin*/end*-functions.
This is conceptually simple, but rather complex code. To avoid
repetition of complex loops, the batching is implemented in
templated-functions, which are passed lambda-functions, which
are called for each batch.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-30 07:20:25 +00:00
|
|
|
Item(dive_trip *t, const QVector<dive *> &dives);
|
|
|
|
Item(dive_trip *t, dive *d); // Initialize a trip with one dive
|
|
|
|
Item(dive *d); // Initialize a top-level dive
|
|
|
|
bool isDive(const dive *) const; // Helper function: is this the give dive?
|
|
|
|
dive *getDive() const; // Helper function: returns top-level-dive or null
|
|
|
|
timestamp_t when() const; // Helper function: start time of dive *or* trip
|
2018-09-30 14:06:17 +00:00
|
|
|
};
|
2018-12-27 09:06:11 +00:00
|
|
|
std::vector<Item> items; // Use std::vector for convenience of emplace_back()
|
|
|
|
|
|
|
|
dive_or_trip tripOrDive(const QModelIndex &index) const;
|
|
|
|
// Returns either a pointer to a trip or a dive, or twice null of index is invalid
|
|
|
|
// null, something is really wrong
|
2020-02-09 21:47:47 +00:00
|
|
|
// Addition and deletion of dives and trips
|
|
|
|
void addTrip(dive_trip *trip, const QVector<dive *> &dives);
|
2018-12-27 09:06:11 +00:00
|
|
|
void addDivesToTrip(int idx, const QVector<dive *> &dives);
|
2020-02-09 21:47:47 +00:00
|
|
|
void addDivesTopLevel(const QVector<dive *> &dives);
|
|
|
|
void removeDivesFromTrip(int idx, const QVector<dive *> &dives);
|
|
|
|
void removeDivesTopLevel(const QVector<dive *> &dives);
|
|
|
|
void removeTrip(int idx);
|
2018-12-27 09:06:11 +00:00
|
|
|
void topLevelChanged(int idx);
|
2018-09-30 14:06:17 +00:00
|
|
|
|
Dive list: implement proper Qt-model semantics for DiveTripModel
Previously, each dive-list modifying function would lead to a
full model reset. Instead, implement proper Qt-model semantics
using beginInsertRows()/endInsertRows(), beginRemoveRows()/
endRemoveRows(), dataChange().
To do so, a DiveListNotifer singleton is generatated, which
broadcasts all changes to the dive-list. Signals are sent by
the commands and received by the DiveTripModel. Signals are
batched by dive-trip. This seems to be an adequate compromise
for the two kinds of list-views (tree and list). In the common
usecase mostly dives of a single trip are affected.
Thus, batching of dives is performed in two positions:
- At command-level to batch by trip
- In DiveTripModel to feed batches of contiguous elements
to Qt's begin*/end*-functions.
This is conceptually simple, but rather complex code. To avoid
repetition of complex loops, the batching is implemented in
templated-functions, which are passed lambda-functions, which
are called for each batch.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-30 07:20:25 +00:00
|
|
|
// Access trips and dives
|
|
|
|
int findTripIdx(const dive_trip *trip) const;
|
|
|
|
int findDiveIdx(const dive *d) const; // Find _top_level_ dive
|
2020-03-06 15:57:58 +00:00
|
|
|
QModelIndex diveToIdx(const dive *d) const; // Find _any_ dive
|
Dive list: implement proper Qt-model semantics for DiveTripModel
Previously, each dive-list modifying function would lead to a
full model reset. Instead, implement proper Qt-model semantics
using beginInsertRows()/endInsertRows(), beginRemoveRows()/
endRemoveRows(), dataChange().
To do so, a DiveListNotifer singleton is generatated, which
broadcasts all changes to the dive-list. Signals are sent by
the commands and received by the DiveTripModel. Signals are
batched by dive-trip. This seems to be an adequate compromise
for the two kinds of list-views (tree and list). In the common
usecase mostly dives of a single trip are affected.
Thus, batching of dives is performed in two positions:
- At command-level to batch by trip
- In DiveTripModel to feed batches of contiguous elements
to Qt's begin*/end*-functions.
This is conceptually simple, but rather complex code. To avoid
repetition of complex loops, the batching is implemented in
templated-functions, which are passed lambda-functions, which
are called for each batch.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-30 07:20:25 +00:00
|
|
|
int findDiveInTrip(int tripIdx, const dive *d) const; // Find dive inside trip. Second parameter is index of trip
|
2018-11-11 12:09:51 +00:00
|
|
|
int findInsertionIndex(const dive_trip *trip) const; // Where to insert trip
|
Dive list: implement proper Qt-model semantics for DiveTripModel
Previously, each dive-list modifying function would lead to a
full model reset. Instead, implement proper Qt-model semantics
using beginInsertRows()/endInsertRows(), beginRemoveRows()/
endRemoveRows(), dataChange().
To do so, a DiveListNotifer singleton is generatated, which
broadcasts all changes to the dive-list. Signals are sent by
the commands and received by the DiveTripModel. Signals are
batched by dive-trip. This seems to be an adequate compromise
for the two kinds of list-views (tree and list). In the common
usecase mostly dives of a single trip are affected.
Thus, batching of dives is performed in two positions:
- At command-level to batch by trip
- In DiveTripModel to feed batches of contiguous elements
to Qt's begin*/end*-functions.
This is conceptually simple, but rather complex code. To avoid
repetition of complex loops, the batching is implemented in
templated-functions, which are passed lambda-functions, which
are called for each batch.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-30 07:20:25 +00:00
|
|
|
|
2018-12-27 09:06:11 +00:00
|
|
|
// Comparison function between dive and arbitrary entry
|
|
|
|
static bool dive_before_entry(const dive *d, const Item &entry);
|
|
|
|
};
|
2018-10-14 06:56:53 +00:00
|
|
|
|
2020-02-20 11:12:23 +00:00
|
|
|
class DiveTripModelList final : public DiveTripModelBase
|
2018-12-27 09:06:11 +00:00
|
|
|
{
|
|
|
|
Q_OBJECT
|
|
|
|
public slots:
|
|
|
|
void divesAdded(dive_trip *trip, bool addTrip, const QVector<dive *> &dives);
|
|
|
|
void divesDeleted(dive_trip *trip, bool deleteTrip, const QVector<dive *> &dives);
|
2019-08-31 13:05:11 +00:00
|
|
|
void diveSiteChanged(dive_site *ds, int field);
|
2019-06-23 07:22:26 +00:00
|
|
|
void divesChanged(const QVector<dive *> &dives);
|
2020-04-19 17:04:56 +00:00
|
|
|
void diveChanged(dive *d);
|
2019-06-23 07:22:26 +00:00
|
|
|
void divesTimeChanged(timestamp_t delta, const QVector<dive *> &dives);
|
2018-12-27 09:06:11 +00:00
|
|
|
// Does nothing in list view.
|
|
|
|
//void divesMovedBetweenTrips(dive_trip *from, dive_trip *to, bool deleteFrom, bool createTo, const QVector<dive *> &dives);
|
2020-03-11 21:21:18 +00:00
|
|
|
void divesSelected(const QVector<dive *> &dives);
|
2019-12-09 14:13:53 +00:00
|
|
|
void filterReset();
|
Undo: select dives after add, remove, merge, split dive commands
Select the proper dives after the add, remove, split and merge
dives commands on undo *and* redo. Generally, select the added
dives. For undo of add, remember the pre-addition selection.
For redo of remove, select the closest dive to the first removed
dive.
The biggest part of the commit is the signal-interface between
the dive commands and the dive-list model and dive-list view.
This is done in two steps:
1) To the DiveTripModel in batches of trips. The dive trip model
transforms the dives into indices.
2) To the DiveListView. The DiveListView has to translate the
DiveTripModel indexes to actual indexes via its QSortFilterProxy-
model.
For code-reuse, derive all divelist-changing commands from a new base-class,
which has a flag that describes whether the divelist changed. The helper
functions which add and remove dives are made members of the base class and
set the flag is a selected dive is added or removed.
To properly detect when the current dive was deleted it
became necessary to turn the current dive from an index
to a pointer, because indices are not stable.
Unfortunately, in some cases an index was expected and these
places now have to transform the dive into an index. These
should be converted in due course.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-08-03 09:35:43 +00:00
|
|
|
|
2018-12-27 09:06:11 +00:00
|
|
|
public:
|
|
|
|
DiveTripModelList(QObject *parent = nullptr);
|
|
|
|
private:
|
|
|
|
int rowCount(const QModelIndex &parent) const override;
|
2019-11-18 17:44:17 +00:00
|
|
|
void clearData() override;
|
2019-12-11 08:50:38 +00:00
|
|
|
void populate() override;
|
2018-12-27 09:06:11 +00:00
|
|
|
QModelIndex index(int row, int column, const QModelIndex &parent) const override;
|
|
|
|
QModelIndex parent(const QModelIndex &index) const override;
|
|
|
|
QVariant data(const QModelIndex &index, int role) const override;
|
|
|
|
bool lessThan(const QModelIndex &i1, const QModelIndex &i2) const override;
|
|
|
|
dive *diveOrNull(const QModelIndex &index) const override;
|
2020-02-09 21:47:47 +00:00
|
|
|
void addDives(QVector<dive *> &dives);
|
2020-03-06 15:57:58 +00:00
|
|
|
void removeDives(QVector<dive *> dives);
|
|
|
|
QModelIndex diveToIdx(const dive *d) const;
|
|
|
|
void divesDeletedInternal(const QVector<dive *> &dives);
|
Dive list: implement proper Qt-model semantics for DiveTripModel
Previously, each dive-list modifying function would lead to a
full model reset. Instead, implement proper Qt-model semantics
using beginInsertRows()/endInsertRows(), beginRemoveRows()/
endRemoveRows(), dataChange().
To do so, a DiveListNotifer singleton is generatated, which
broadcasts all changes to the dive-list. Signals are sent by
the commands and received by the DiveTripModel. Signals are
batched by dive-trip. This seems to be an adequate compromise
for the two kinds of list-views (tree and list). In the common
usecase mostly dives of a single trip are affected.
Thus, batching of dives is performed in two positions:
- At command-level to batch by trip
- In DiveTripModel to feed batches of contiguous elements
to Qt's begin*/end*-functions.
This is conceptually simple, but rather complex code. To avoid
repetition of complex loops, the batching is implemented in
templated-functions, which are passed lambda-functions, which
are called for each batch.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-30 07:20:25 +00:00
|
|
|
|
2018-12-27 09:06:11 +00:00
|
|
|
std::vector<dive *> items; // TODO: access core data directly
|
2015-05-28 21:33:51 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
#endif
|