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>

1 files changed, 22 insertions, 4 deletions

diff --git a/qt-models/divetripmodel.h b/qt-models/divetripmodel.h
index f6125d196..a298b1e72 100644
--- a/qt-models/divetripmodel.h
+++ b/qt-models/divetripmodel.h
@@ -108,7 +108,12 @@ public:
 	int rowCount(const QModelIndex &parent) const;
 	QModelIndex index(int row, int column, const QModelIndex &parent) const;
 	QModelIndex parent(const QModelIndex &index) const;
-
+private slots:
+	void divesAdded(dive_trip *trip, bool addTrip, const QVector<dive *> &dives);
+	void divesDeleted(dive_trip *trip, bool deleteTrip, const QVector<dive *> &dives);
+	void divesChanged(dive_trip *trip, const QVector<dive *> &dives);
+	void divesTimeChanged(dive_trip *trip, timestamp_t delta, const QVector<dive *> &dives);
+	void divesMovedBetweenTrips(dive_trip *from, dive_trip *to, bool deleteFrom, bool createTo, const QVector<dive *> &dives);
 private:
 	// The model has up to two levels. At the top level, we have either trips or dives
 	// that do not belong to trips. Such a top-level item is represented by the "Item"
@@ -121,11 +126,24 @@ private:
 	// one element, which is the corresponding dive.
 	struct Item {
 		dive_trip		*trip;
-		QVector<dive *>		 dives;
-		Item(dive_trip *t, dive *d);	// Initialize a trip with one dive
-		Item(dive *d);			// Initialize a top-level dive
+		std::vector<dive *>	 dives;			// std::vector<> instead of QVector for insert() with three iterators
+		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
 	};
 
+	// Access trips and dives
+	int findTripIdx(const dive_trip *trip) const;
+	int findDiveIdx(const dive *d) const;			// Find _top_level_ dive
+	int findDiveInTrip(int tripIdx, const dive *d) const;	// Find dive inside trip. Second parameter is index of trip
+	int findInsertionIndex(timestamp_t when) const;		// Where to insert item with timestamp "when"
+
+	// Addition and deletion of dives
+	void addDivesToTrip(int idx, const QVector<dive *> &dives);
+
 	dive *diveOrNull(const QModelIndex &index) const;	// Returns a dive if this index represents a dive, null otherwise
 	QPair<dive_trip *, dive *> tripOrDive(const QModelIndex &index) const;
 								// Returns either a pointer to a trip or a dive, or twice null of index is invalid