diff options
| -rw-r--r-- | core/dive.h | 1 | ||||
| -rw-r--r-- | core/divelist.c | 13 | ||||
| -rw-r--r-- | desktop-widgets/undocommands.cpp | 26 | ||||
| -rw-r--r-- | desktop-widgets/undocommands.h | 1 |
4 files changed, 33 insertions, 8 deletions
diff --git a/core/dive.h b/core/dive.h index 1b58eef4c..569232a38 100644 --- a/core/dive.h +++ b/core/dive.h @@ -507,6 +507,7 @@ extern void delete_single_dive(int idx); extern void add_single_dive(int idx, struct dive *dive); extern void insert_trip(dive_trip_t **trip); +extern struct dive_trip *clone_empty_trip(struct dive_trip *trip); extern const struct units SI_units, IMPERIAL_units; diff --git a/core/divelist.c b/core/divelist.c index 7291de23e..a9b793517 100644 --- a/core/divelist.c +++ b/core/divelist.c @@ -727,6 +727,19 @@ void insert_trip(dive_trip_t **dive_trip_p) #endif } +/* create a copy of a dive trip, but don't add any dives. */ +dive_trip_t *clone_empty_trip(dive_trip_t *trip) +{ + dive_trip_t *copy = malloc(sizeof(struct dive_trip)); + *copy = *trip; + copy->location = copy_string(trip->location); + copy->notes = copy_string(trip->notes); + copy->nrdives = 0; + copy->next = NULL; + copy->dives = NULL; + return copy; +} + static void delete_trip(dive_trip_t *trip) { dive_trip_t **p, *tmp; diff --git a/desktop-widgets/undocommands.cpp b/desktop-widgets/undocommands.cpp index 0c1a4b541..06879eb51 100644 --- a/desktop-widgets/undocommands.cpp +++ b/desktop-widgets/undocommands.cpp @@ -48,13 +48,7 @@ void UndoDeleteDive::redo() // check for trip - if this is the last dive in the trip // the trip will get deleted, so we need to remember it as well if (d->divetrip && d->divetrip->nrdives == 1) { - struct dive_trip *undo_trip = (struct dive_trip *)calloc(1, sizeof(struct dive_trip)); - *undo_trip = *d->divetrip; - undo_trip->location = copy_string(d->divetrip->location); - undo_trip->notes = copy_string(d->divetrip->notes); - undo_trip->nrdives = 0; - undo_trip->next = NULL; - undo_trip->dives = NULL; + dive_trip *undo_trip = clone_empty_trip(d->divetrip); // update all the dives who were in this trip to point to the copy of the // trip that we are about to delete implicitly when deleting its last dive below Q_FOREACH(struct dive *inner_dive, newList) { @@ -141,10 +135,15 @@ UndoRemoveDivesFromTrip::UndoRemoveDivesFromTrip(QMap<dive *, dive_trip *> remov void UndoRemoveDivesFromTrip::undo() { + // first bring back the trip(s) + Q_FOREACH(struct dive_trip *trip, tripList) + insert_trip(&trip); + tripList.clear(); + QMapIterator<dive*, dive_trip*> i(divesToUndo); while (i.hasNext()) { i.next(); - add_dive_to_trip(i.key (), i.value()); + add_dive_to_trip(i.key(), i.value()); } mark_divelist_changed(true); MainWindow::instance()->refreshDisplay(); @@ -155,6 +154,17 @@ void UndoRemoveDivesFromTrip::redo() QMapIterator<dive*, dive_trip*> i(divesToUndo); while (i.hasNext()) { i.next(); + // If the trip will be deleted, remember it so that we can restore it later. + dive_trip *trip = i.value(); + if (trip->nrdives == 1) { + dive_trip *cloned_trip = clone_empty_trip(trip); + tripList.append(cloned_trip); + // Rewrite the dive list, such that the dives will be added to the resurrected trip. + for (dive_trip *&old_trip: divesToUndo) { + if (old_trip == trip) + old_trip = cloned_trip; + } + } remove_dive_from_trip(i.key(), false); } mark_divelist_changed(true); diff --git a/desktop-widgets/undocommands.h b/desktop-widgets/undocommands.h index f0626377c..1403b23bb 100644 --- a/desktop-widgets/undocommands.h +++ b/desktop-widgets/undocommands.h @@ -45,6 +45,7 @@ public: private: QMap<struct dive*, dive_trip*> divesToUndo; + QList<struct dive_trip*> tripList; }; #endif // UNDOCOMMANDS_H |