mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Dive list: unify sorting in core and Qt-model

Browse source 
Ultimately, we want to use a single dive-list and not replicate
it in the Qt-model code. To this goal, let's start with using
the same sort function.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-08-26 14:42:38 +02:00 • committed by Dirk Hohndel
parent 0cca36377b
commit f836b9ae97
4 changed files with 58 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
qt-models/divetripmodel.h
View file

@ -138,6 +138,14 @@ private:
// quite inconvenient to access.
// 2) If "trip" is null, this is a dive and dives is supposed to contain exactly
// one element, which is the corresponding dive.
//
// Top-level items are ordered by timestamp. For dives, the core function
// dive_less_than is used, which guarantees a stable ordering even in the
// case of equal timestamps. For dives and trips, place dives before trips
// in the case of an equal timestamp. For trips with equal timestamps, the
// order is currently undefined. This is currently not a problem, because
// the core doesn't have a list of sorted trips. But nevertheless something
// to keep in mind.
struct Item {
dive_trip *trip;
std::vector<dive *> dives; // std::vector<> instead of QVector for insert() with three iterators
@ -148,6 +156,8 @@ private:
dive *getDive() const; // Helper function: returns top-level-dive or null
timestamp_t when() const; // Helper function: start time of dive *or* trip
};
// Comparison function between dive and arbitrary entry
static bool dive_before_entry(const dive *d, const Item &entry);
// Access trips and dives
int findTripIdx(const dive_trip *trip) const;