1 files changed, 77 insertions, 29 deletions

diff --git a/desktop-widgets/undocommands.cpp b/desktop-widgets/undocommands.cpp
index d58ac7a4b..668a84f9e 100644
--- a/desktop-widgets/undocommands.cpp
+++ b/desktop-widgets/undocommands.cpp
@@ -1,10 +1,83 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "desktop-widgets/undocommands.h"
 #include "desktop-widgets/mainwindow.h"
+#include "desktop-widgets/divelistview.h"
 #include "core/divelist.h"
 #include "core/subsurface-string.h"
 #include "core/gettextfromc.h"
 
+// This helper function removes a dive, takes ownership of the dive and adds it to a DiveToAdd structure.
+// It is crucial that dives are added in reverse order of deletion, so the the indices are correctly
+// set and that the trips are added before they are used!
+static DiveToAdd removeDive(struct dive *d)
+{
+	DiveToAdd res;
+	res.idx = get_divenr(d);
+	if (res.idx < 0)
+		qWarning() << "Deletion of unknown dive!";
+
+	// remove dive from trip - if this is the last dive in the trip
+	// remove the whole trip.
+	res.trip = unregister_dive_from_trip(d, false);
+	if (res.trip && res.trip->nrdives == 0) {
+		unregister_trip(res.trip);		// Remove trip from backend
+		res.tripToAdd.reset(res.trip);		// Take ownership of trip
+	}
+
+	res.dive.reset(unregister_dive(res.idx));	// Remove dive from backend
+	return res;
+}
+
+// This helper function adds a dive and returns ownership to the backend. It may also add a dive trip.
+// It is crucial that dives are added in reverse order of deletion (see comment above)!
+// Returns pointer to added dive (which is owned by the backend!)
+static dive *addDive(DiveToAdd &d)
+{
+	if (d.tripToAdd) {
+		dive_trip *t = d.tripToAdd.release();	// Give up ownership of trip
+		insert_trip(&t);			// Return ownership to backend
+	}
+	if (d.trip)
+		add_dive_to_trip(d.dive.get(), d.trip);
+	dive *res = d.dive.release();			// Give up ownership of dive
+	add_single_dive(d.idx, res);			// Return ownership to backend
+	return res;
+}
+
+UndoAddDive::UndoAddDive(dive *d)
+{
+	setText(gettextFromC::tr("add dive"));
+	// TODO: handle tags
+	//saveTags();
+	d->maxdepth.mm = 0;
+	fixup_dive(d);
+	diveToAdd.trip = d->divetrip;
+	d->divetrip = nullptr;
+	diveToAdd.idx = dive_get_insertion_index(d);
+	d->number = get_dive_nr_at_idx(diveToAdd.idx);
+	diveToAdd.dive.reset(clone_dive(d));
+}
+
+void UndoAddDive::redo()
+{
+	diveToRemove = addDive(diveToAdd);
+	mark_divelist_changed(true);
+
+	// Finally, do the UI stuff:
+	MainWindow::instance()->dive_list()->unselectDives();
+	MainWindow::instance()->dive_list()->selectDive(diveToAdd.idx, true);
+	MainWindow::instance()->refreshDisplay();
+}
+
+void UndoAddDive::undo()
+{
+	// Simply remove the dive that was previously added
+	diveToAdd = removeDive(diveToRemove);
+
+	// Finally, do the UI stuff:
+	MainWindow::instance()->refreshDisplay();
+}
+
 UndoDeleteDive::UndoDeleteDive(const QVector<struct dive*> &divesToDeleteIn) : divesToDelete(divesToDeleteIn)
 {
 	setText(tr("delete %n dive(s)", "", divesToDelete.size()));
@@ -12,19 +85,9 @@ UndoDeleteDive::UndoDeleteDive(const QVector<struct dive*> &divesToDeleteIn) : d
 
 void UndoDeleteDive::undo()
 {
-	// first bring back the trip(s)
-	for (auto &trip: tripsToAdd) {
-		dive_trip *t = trip.release();	// Give up ownership
-		insert_trip(&t);		// Return ownership to backend
-	}
-	tripsToAdd.clear();
+	for (auto it = divesToAdd.rbegin(); it != divesToAdd.rend(); ++it)
+		divesToDelete.append(addDive(*it));
 
-	for (DiveToAdd &d: divesToAdd) {
-		if (d.trip)
-			add_dive_to_trip(d.dive.get(), d.trip);
-		divesToDelete.append(d.dive.get());		// Delete dive on redo
-		add_single_dive(d.idx, d.dive.release());	// Return ownership to backend
-	}
 	mark_divelist_changed(true);
 	divesToAdd.clear();
 
@@ -34,24 +97,9 @@ void UndoDeleteDive::undo()
 
 void UndoDeleteDive::redo()
 {
-	for (dive *d: divesToDelete) {
-		int idx = get_divenr(d);
-		if (idx < 0) {
-			qWarning() << "Deletion of unknown dive!";
-			continue;
-		}
-		// remove dive from trip - if this is the last dive in the trip
-		// remove the whole trip.
-		dive_trip *trip = unregister_dive_from_trip(d, false);
-		if (trip && trip->nrdives == 0) {
-			unregister_trip(trip);			// Remove trip from backend
-			tripsToAdd.emplace_back(trip);		// Take ownership of trip
-		}
+	for (dive *d: divesToDelete)
+		divesToAdd.push_back(removeDive(d));
 
-		unregister_dive(idx);			// Remove dive from backend
-		divesToAdd.push_back({ OwningDivePtr(d), trip, idx });
-							// Take ownership for dive
-	}
 	divesToDelete.clear();
 	mark_divelist_changed(true);