2017-04-27 20:26:05 +02:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
2016-04-04 22:02:03 -07:00
|
|
|
#include "desktop-widgets/undocommands.h"
|
|
|
|
#include "desktop-widgets/mainwindow.h"
|
2018-07-19 22:35:25 +02:00
|
|
|
#include "desktop-widgets/divelistview.h"
|
2016-04-04 22:02:03 -07:00
|
|
|
#include "core/divelist.h"
|
2018-05-11 08:25:41 -07:00
|
|
|
#include "core/subsurface-string.h"
|
Undo: fix multi-level undo of delete-dive and remove-dive-from-trip
The original undo-code was fundamentally broken. Not only did it leak
resources (copied trips were never freed), it also kept references
to trips or dives that could be changed by other commands. Thus,
anything more than a single undo could lead to crashes.
Two ways of fixing this were considered
1) Don't store pointers, but unique dive-ids and trip-ids.
Whereas such unique ids exist for dives, they would have to be
implemented for trips.
2) Don't free objects in the backend.
Instead, take ownership of deleted objects in the undo-object.
Thus, all references in previous undo-objects are guaranteed to
still exist (unless the objects are deleted elsewhere).
After some contemplation, the second method was chosen, because
it is significantly less intrusive. While touching the undo-objects,
clearly separate backend from ui-code, such that they can ultimately
be reused for mobile.
Note that if other parts of the code delete dives, crashes can still
be provoked. Notable examples are split/merge dives. These will have
to be fixed later. Nevertheless, the new code is a significant
improvement over the old state.
While touching the code, implement proper translation string based
on Qt's plural-feature (using %n).
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-19 14:44:27 +02:00
|
|
|
#include "core/gettextfromc.h"
|
2015-02-11 09:28:43 +03:00
|
|
|
|
2018-07-19 22:35:25 +02:00
|
|
|
// 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;
|
|
|
|
}
|
|
|
|
|
2018-07-21 18:28:33 +02:00
|
|
|
// This helper function calls removeDive() on a list of dives to be removed and
|
|
|
|
// returns a vector of corresponding DiveToAdd objects, which can later be readded.
|
|
|
|
// The passed in vector is cleared.
|
|
|
|
static std::vector<DiveToAdd> removeDives(std::vector<dive *> &divesToDelete)
|
|
|
|
{
|
|
|
|
std::vector<DiveToAdd> res;
|
|
|
|
res.reserve(divesToDelete.size());
|
|
|
|
|
|
|
|
for (dive *d: divesToDelete)
|
|
|
|
res.push_back(removeDive(d));
|
|
|
|
divesToDelete.clear();
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
// This helper function is the counterpart fo removeDives(): it calls addDive() on a list
|
|
|
|
// of dives to be (re)added and returns a vector of the added dives. It does this in reverse
|
|
|
|
// order, so that trips are created appropriately and indexing is correct.
|
|
|
|
// The passed in vector is cleared.
|
|
|
|
static std::vector<dive *> addDives(std::vector<DiveToAdd> &divesToAdd)
|
|
|
|
{
|
|
|
|
std::vector<dive *> res;
|
|
|
|
res.reserve(divesToAdd.size());
|
|
|
|
|
|
|
|
for (auto it = divesToAdd.rbegin(); it != divesToAdd.rend(); ++it)
|
|
|
|
res.push_back(addDive(*it));
|
|
|
|
divesToAdd.clear();
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
// This helper function renumbers dives according to an array of id/number pairs.
|
|
|
|
// The old numbers are stored in the array, thus calling this function twice has no effect.
|
|
|
|
// TODO: switch from uniq-id to indexes once all divelist-actions are controlled by "UndoCommands".
|
|
|
|
static void renumberDives(QVector<QPair<int, int>> &divesToRenumber)
|
|
|
|
{
|
|
|
|
for (auto &pair: divesToRenumber) {
|
|
|
|
dive *d = get_dive_by_uniq_id(pair.first);
|
|
|
|
if (!d)
|
|
|
|
continue;
|
|
|
|
std::swap(d->number, pair.second);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-09-23 21:22:48 +02:00
|
|
|
// This helper function moves a dive to a trip. The old trip is recorded in the
|
|
|
|
// passed-in structure. This means that calling the function twice on the same
|
|
|
|
// object is a no-op concerning the dive. If the old trip was deleted from the
|
|
|
|
// core, an owning pointer to the removed trip is returned, otherwise a null pointer.
|
|
|
|
static OwningTripPtr moveDiveToTrip(DiveToTrip &diveToTrip)
|
|
|
|
{
|
|
|
|
// Firstly, check if we move to the same trip and bail if this is a no-op.
|
|
|
|
if (diveToTrip.trip == diveToTrip.dive->divetrip)
|
|
|
|
return {};
|
|
|
|
|
|
|
|
// Remove from old trip
|
|
|
|
OwningTripPtr res;
|
|
|
|
|
|
|
|
// Remove dive from trip - if this is the last dive in the trip, remove the whole trip.
|
|
|
|
dive_trip *trip = unregister_dive_from_trip(diveToTrip.dive, false);
|
|
|
|
if (trip && trip->nrdives == 0) {
|
|
|
|
unregister_trip(trip); // Remove trip from backend
|
|
|
|
res.reset(trip);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Store old trip and get new trip we should associate this dive with
|
|
|
|
std::swap(trip, diveToTrip.trip);
|
|
|
|
add_dive_to_trip(diveToTrip.dive, trip);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
// This helper function moves a set of dives between trips using the
|
|
|
|
// moveDiveToTrip function. Before doing so, it adds the necessary trips to
|
|
|
|
// the core. Trips that are removed from the core because they are empty
|
|
|
|
// are recorded in the passed in struct. The vectors of trips and dives
|
|
|
|
// are reversed. Thus, calling the function twice on the same object is
|
|
|
|
// a no-op.
|
|
|
|
static void moveDivesBetweenTrips(DivesToTrip &dives)
|
|
|
|
{
|
|
|
|
// first bring back the trip(s)
|
|
|
|
for (OwningTripPtr &trip: dives.tripsToAdd) {
|
|
|
|
dive_trip *t = trip.release(); // Give up ownership
|
|
|
|
insert_trip(&t); // Return ownership to backend
|
|
|
|
}
|
|
|
|
dives.tripsToAdd.clear();
|
|
|
|
|
|
|
|
for (DiveToTrip &dive: dives.divesToMove) {
|
|
|
|
OwningTripPtr tripToAdd = moveDiveToTrip(dive);
|
|
|
|
// register trips that we'll have to readd
|
|
|
|
if (tripToAdd)
|
|
|
|
dives.tripsToAdd.push_back(std::move(tripToAdd));
|
|
|
|
}
|
|
|
|
|
|
|
|
// Reverse the tripsToAdd and the divesToAdd, so that on undo/redo the operations
|
|
|
|
// will be performed in reverse order.
|
|
|
|
std::reverse(dives.tripsToAdd.begin(), dives.tripsToAdd.end());
|
|
|
|
std::reverse(dives.divesToMove.begin(), dives.divesToMove.end());
|
|
|
|
}
|
|
|
|
|
2018-07-19 22:35:25 +02:00
|
|
|
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();
|
|
|
|
}
|
|
|
|
|
2018-07-21 18:28:33 +02:00
|
|
|
UndoDeleteDive::UndoDeleteDive(const QVector<struct dive*> &divesToDeleteIn) : divesToDelete(divesToDeleteIn.toStdVector())
|
2015-02-11 09:28:43 +03:00
|
|
|
{
|
Undo: fix multi-level undo of delete-dive and remove-dive-from-trip
The original undo-code was fundamentally broken. Not only did it leak
resources (copied trips were never freed), it also kept references
to trips or dives that could be changed by other commands. Thus,
anything more than a single undo could lead to crashes.
Two ways of fixing this were considered
1) Don't store pointers, but unique dive-ids and trip-ids.
Whereas such unique ids exist for dives, they would have to be
implemented for trips.
2) Don't free objects in the backend.
Instead, take ownership of deleted objects in the undo-object.
Thus, all references in previous undo-objects are guaranteed to
still exist (unless the objects are deleted elsewhere).
After some contemplation, the second method was chosen, because
it is significantly less intrusive. While touching the undo-objects,
clearly separate backend from ui-code, such that they can ultimately
be reused for mobile.
Note that if other parts of the code delete dives, crashes can still
be provoked. Notable examples are split/merge dives. These will have
to be fixed later. Nevertheless, the new code is a significant
improvement over the old state.
While touching the code, implement proper translation string based
on Qt's plural-feature (using %n).
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-19 14:44:27 +02:00
|
|
|
setText(tr("delete %n dive(s)", "", divesToDelete.size()));
|
2015-02-11 09:28:43 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
void UndoDeleteDive::undo()
|
|
|
|
{
|
2018-07-21 18:28:33 +02:00
|
|
|
divesToDelete = addDives(divesToAdd);
|
2015-10-02 14:50:12 -04:00
|
|
|
|
2015-02-11 10:57:56 +03:00
|
|
|
mark_divelist_changed(true);
|
Undo: fix multi-level undo of delete-dive and remove-dive-from-trip
The original undo-code was fundamentally broken. Not only did it leak
resources (copied trips were never freed), it also kept references
to trips or dives that could be changed by other commands. Thus,
anything more than a single undo could lead to crashes.
Two ways of fixing this were considered
1) Don't store pointers, but unique dive-ids and trip-ids.
Whereas such unique ids exist for dives, they would have to be
implemented for trips.
2) Don't free objects in the backend.
Instead, take ownership of deleted objects in the undo-object.
Thus, all references in previous undo-objects are guaranteed to
still exist (unless the objects are deleted elsewhere).
After some contemplation, the second method was chosen, because
it is significantly less intrusive. While touching the undo-objects,
clearly separate backend from ui-code, such that they can ultimately
be reused for mobile.
Note that if other parts of the code delete dives, crashes can still
be provoked. Notable examples are split/merge dives. These will have
to be fixed later. Nevertheless, the new code is a significant
improvement over the old state.
While touching the code, implement proper translation string based
on Qt's plural-feature (using %n).
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-19 14:44:27 +02:00
|
|
|
|
|
|
|
// Finally, do the UI stuff:
|
2015-02-11 10:57:56 +03:00
|
|
|
MainWindow::instance()->refreshDisplay();
|
2015-02-11 09:28:43 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
void UndoDeleteDive::redo()
|
|
|
|
{
|
2018-07-21 18:28:33 +02:00
|
|
|
divesToAdd = removeDives(divesToDelete);
|
2015-02-11 10:57:56 +03:00
|
|
|
mark_divelist_changed(true);
|
Undo: fix multi-level undo of delete-dive and remove-dive-from-trip
The original undo-code was fundamentally broken. Not only did it leak
resources (copied trips were never freed), it also kept references
to trips or dives that could be changed by other commands. Thus,
anything more than a single undo could lead to crashes.
Two ways of fixing this were considered
1) Don't store pointers, but unique dive-ids and trip-ids.
Whereas such unique ids exist for dives, they would have to be
implemented for trips.
2) Don't free objects in the backend.
Instead, take ownership of deleted objects in the undo-object.
Thus, all references in previous undo-objects are guaranteed to
still exist (unless the objects are deleted elsewhere).
After some contemplation, the second method was chosen, because
it is significantly less intrusive. While touching the undo-objects,
clearly separate backend from ui-code, such that they can ultimately
be reused for mobile.
Note that if other parts of the code delete dives, crashes can still
be provoked. Notable examples are split/merge dives. These will have
to be fixed later. Nevertheless, the new code is a significant
improvement over the old state.
While touching the code, implement proper translation string based
on Qt's plural-feature (using %n).
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-19 14:44:27 +02:00
|
|
|
|
|
|
|
// Finally, do the UI stuff:
|
2015-02-11 10:57:56 +03:00
|
|
|
MainWindow::instance()->refreshDisplay();
|
2015-02-11 09:28:43 +03:00
|
|
|
}
|
2015-02-14 20:12:05 +03:00
|
|
|
|
|
|
|
|
2018-07-22 09:23:47 +02:00
|
|
|
UndoShiftTime::UndoShiftTime(const QVector<dive *> &changedDives, int amount)
|
2015-03-17 07:48:45 +03:00
|
|
|
: diveList(changedDives), timeChanged(amount)
|
2015-02-14 20:12:05 +03:00
|
|
|
{
|
Undo: fix multi-level undo of delete-dive and remove-dive-from-trip
The original undo-code was fundamentally broken. Not only did it leak
resources (copied trips were never freed), it also kept references
to trips or dives that could be changed by other commands. Thus,
anything more than a single undo could lead to crashes.
Two ways of fixing this were considered
1) Don't store pointers, but unique dive-ids and trip-ids.
Whereas such unique ids exist for dives, they would have to be
implemented for trips.
2) Don't free objects in the backend.
Instead, take ownership of deleted objects in the undo-object.
Thus, all references in previous undo-objects are guaranteed to
still exist (unless the objects are deleted elsewhere).
After some contemplation, the second method was chosen, because
it is significantly less intrusive. While touching the undo-objects,
clearly separate backend from ui-code, such that they can ultimately
be reused for mobile.
Note that if other parts of the code delete dives, crashes can still
be provoked. Notable examples are split/merge dives. These will have
to be fixed later. Nevertheless, the new code is a significant
improvement over the old state.
While touching the code, implement proper translation string based
on Qt's plural-feature (using %n).
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-19 14:44:27 +02:00
|
|
|
setText(tr("delete %n dive(s)", "", changedDives.size()));
|
2015-02-14 20:12:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
void UndoShiftTime::undo()
|
|
|
|
{
|
2018-07-22 09:23:47 +02:00
|
|
|
for (dive *d: diveList)
|
2015-02-14 20:12:05 +03:00
|
|
|
d->when -= timeChanged;
|
2018-07-22 09:23:47 +02:00
|
|
|
|
Undo: fix multi-level undo of delete-dive and remove-dive-from-trip
The original undo-code was fundamentally broken. Not only did it leak
resources (copied trips were never freed), it also kept references
to trips or dives that could be changed by other commands. Thus,
anything more than a single undo could lead to crashes.
Two ways of fixing this were considered
1) Don't store pointers, but unique dive-ids and trip-ids.
Whereas such unique ids exist for dives, they would have to be
implemented for trips.
2) Don't free objects in the backend.
Instead, take ownership of deleted objects in the undo-object.
Thus, all references in previous undo-objects are guaranteed to
still exist (unless the objects are deleted elsewhere).
After some contemplation, the second method was chosen, because
it is significantly less intrusive. While touching the undo-objects,
clearly separate backend from ui-code, such that they can ultimately
be reused for mobile.
Note that if other parts of the code delete dives, crashes can still
be provoked. Notable examples are split/merge dives. These will have
to be fixed later. Nevertheless, the new code is a significant
improvement over the old state.
While touching the code, implement proper translation string based
on Qt's plural-feature (using %n).
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-19 14:44:27 +02:00
|
|
|
// Changing times may have unsorted the dive table
|
|
|
|
sort_table(&dive_table);
|
2015-02-14 20:12:05 +03:00
|
|
|
mark_divelist_changed(true);
|
Undo: fix multi-level undo of delete-dive and remove-dive-from-trip
The original undo-code was fundamentally broken. Not only did it leak
resources (copied trips were never freed), it also kept references
to trips or dives that could be changed by other commands. Thus,
anything more than a single undo could lead to crashes.
Two ways of fixing this were considered
1) Don't store pointers, but unique dive-ids and trip-ids.
Whereas such unique ids exist for dives, they would have to be
implemented for trips.
2) Don't free objects in the backend.
Instead, take ownership of deleted objects in the undo-object.
Thus, all references in previous undo-objects are guaranteed to
still exist (unless the objects are deleted elsewhere).
After some contemplation, the second method was chosen, because
it is significantly less intrusive. While touching the undo-objects,
clearly separate backend from ui-code, such that they can ultimately
be reused for mobile.
Note that if other parts of the code delete dives, crashes can still
be provoked. Notable examples are split/merge dives. These will have
to be fixed later. Nevertheless, the new code is a significant
improvement over the old state.
While touching the code, implement proper translation string based
on Qt's plural-feature (using %n).
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-19 14:44:27 +02:00
|
|
|
|
|
|
|
// Negate the time-shift so that the next call does the reverse
|
|
|
|
timeChanged = -timeChanged;
|
|
|
|
|
|
|
|
// Finally, do the UI stuff:
|
2015-02-14 20:12:05 +03:00
|
|
|
MainWindow::instance()->refreshDisplay();
|
|
|
|
}
|
|
|
|
|
|
|
|
void UndoShiftTime::redo()
|
|
|
|
{
|
Undo: fix multi-level undo of delete-dive and remove-dive-from-trip
The original undo-code was fundamentally broken. Not only did it leak
resources (copied trips were never freed), it also kept references
to trips or dives that could be changed by other commands. Thus,
anything more than a single undo could lead to crashes.
Two ways of fixing this were considered
1) Don't store pointers, but unique dive-ids and trip-ids.
Whereas such unique ids exist for dives, they would have to be
implemented for trips.
2) Don't free objects in the backend.
Instead, take ownership of deleted objects in the undo-object.
Thus, all references in previous undo-objects are guaranteed to
still exist (unless the objects are deleted elsewhere).
After some contemplation, the second method was chosen, because
it is significantly less intrusive. While touching the undo-objects,
clearly separate backend from ui-code, such that they can ultimately
be reused for mobile.
Note that if other parts of the code delete dives, crashes can still
be provoked. Notable examples are split/merge dives. These will have
to be fixed later. Nevertheless, the new code is a significant
improvement over the old state.
While touching the code, implement proper translation string based
on Qt's plural-feature (using %n).
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-19 14:44:27 +02:00
|
|
|
// Same as undo(), since after undo() we reversed the timeOffset
|
|
|
|
undo();
|
2015-02-14 20:12:05 +03:00
|
|
|
}
|
2015-02-28 07:42:37 +03:00
|
|
|
|
|
|
|
|
Undo: fix multi-level undo of delete-dive and remove-dive-from-trip
The original undo-code was fundamentally broken. Not only did it leak
resources (copied trips were never freed), it also kept references
to trips or dives that could be changed by other commands. Thus,
anything more than a single undo could lead to crashes.
Two ways of fixing this were considered
1) Don't store pointers, but unique dive-ids and trip-ids.
Whereas such unique ids exist for dives, they would have to be
implemented for trips.
2) Don't free objects in the backend.
Instead, take ownership of deleted objects in the undo-object.
Thus, all references in previous undo-objects are guaranteed to
still exist (unless the objects are deleted elsewhere).
After some contemplation, the second method was chosen, because
it is significantly less intrusive. While touching the undo-objects,
clearly separate backend from ui-code, such that they can ultimately
be reused for mobile.
Note that if other parts of the code delete dives, crashes can still
be provoked. Notable examples are split/merge dives. These will have
to be fixed later. Nevertheless, the new code is a significant
improvement over the old state.
While touching the code, implement proper translation string based
on Qt's plural-feature (using %n).
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-19 14:44:27 +02:00
|
|
|
UndoRenumberDives::UndoRenumberDives(const QVector<QPair<int, int>> &divesToRenumberIn) : divesToRenumber(divesToRenumberIn)
|
2015-02-28 07:42:37 +03:00
|
|
|
{
|
Undo: fix multi-level undo of delete-dive and remove-dive-from-trip
The original undo-code was fundamentally broken. Not only did it leak
resources (copied trips were never freed), it also kept references
to trips or dives that could be changed by other commands. Thus,
anything more than a single undo could lead to crashes.
Two ways of fixing this were considered
1) Don't store pointers, but unique dive-ids and trip-ids.
Whereas such unique ids exist for dives, they would have to be
implemented for trips.
2) Don't free objects in the backend.
Instead, take ownership of deleted objects in the undo-object.
Thus, all references in previous undo-objects are guaranteed to
still exist (unless the objects are deleted elsewhere).
After some contemplation, the second method was chosen, because
it is significantly less intrusive. While touching the undo-objects,
clearly separate backend from ui-code, such that they can ultimately
be reused for mobile.
Note that if other parts of the code delete dives, crashes can still
be provoked. Notable examples are split/merge dives. These will have
to be fixed later. Nevertheless, the new code is a significant
improvement over the old state.
While touching the code, implement proper translation string based
on Qt's plural-feature (using %n).
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-19 14:44:27 +02:00
|
|
|
setText(tr("renumber %n dive(s)", "", divesToRenumber.count()));
|
2015-02-28 07:42:37 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
void UndoRenumberDives::undo()
|
|
|
|
{
|
2018-07-21 18:28:33 +02:00
|
|
|
renumberDives(divesToRenumber);
|
2015-02-28 07:42:37 +03:00
|
|
|
mark_divelist_changed(true);
|
Undo: fix multi-level undo of delete-dive and remove-dive-from-trip
The original undo-code was fundamentally broken. Not only did it leak
resources (copied trips were never freed), it also kept references
to trips or dives that could be changed by other commands. Thus,
anything more than a single undo could lead to crashes.
Two ways of fixing this were considered
1) Don't store pointers, but unique dive-ids and trip-ids.
Whereas such unique ids exist for dives, they would have to be
implemented for trips.
2) Don't free objects in the backend.
Instead, take ownership of deleted objects in the undo-object.
Thus, all references in previous undo-objects are guaranteed to
still exist (unless the objects are deleted elsewhere).
After some contemplation, the second method was chosen, because
it is significantly less intrusive. While touching the undo-objects,
clearly separate backend from ui-code, such that they can ultimately
be reused for mobile.
Note that if other parts of the code delete dives, crashes can still
be provoked. Notable examples are split/merge dives. These will have
to be fixed later. Nevertheless, the new code is a significant
improvement over the old state.
While touching the code, implement proper translation string based
on Qt's plural-feature (using %n).
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-19 14:44:27 +02:00
|
|
|
|
|
|
|
// Finally, do the UI stuff:
|
2015-02-28 07:42:37 +03:00
|
|
|
MainWindow::instance()->refreshDisplay();
|
|
|
|
}
|
|
|
|
|
|
|
|
void UndoRenumberDives::redo()
|
|
|
|
{
|
Undo: fix multi-level undo of delete-dive and remove-dive-from-trip
The original undo-code was fundamentally broken. Not only did it leak
resources (copied trips were never freed), it also kept references
to trips or dives that could be changed by other commands. Thus,
anything more than a single undo could lead to crashes.
Two ways of fixing this were considered
1) Don't store pointers, but unique dive-ids and trip-ids.
Whereas such unique ids exist for dives, they would have to be
implemented for trips.
2) Don't free objects in the backend.
Instead, take ownership of deleted objects in the undo-object.
Thus, all references in previous undo-objects are guaranteed to
still exist (unless the objects are deleted elsewhere).
After some contemplation, the second method was chosen, because
it is significantly less intrusive. While touching the undo-objects,
clearly separate backend from ui-code, such that they can ultimately
be reused for mobile.
Note that if other parts of the code delete dives, crashes can still
be provoked. Notable examples are split/merge dives. These will have
to be fixed later. Nevertheless, the new code is a significant
improvement over the old state.
While touching the code, implement proper translation string based
on Qt's plural-feature (using %n).
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-19 14:44:27 +02:00
|
|
|
// Redo and undo do the same thing!
|
|
|
|
undo();
|
2015-02-28 07:42:37 +03:00
|
|
|
}
|
2015-04-10 09:39:51 +03:00
|
|
|
|
2018-09-23 21:22:48 +02:00
|
|
|
void UndoTripBase::redo()
|
2015-04-10 09:39:51 +03:00
|
|
|
{
|
2018-09-23 21:22:48 +02:00
|
|
|
moveDivesBetweenTrips(divesToMove);
|
|
|
|
|
|
|
|
mark_divelist_changed(true);
|
|
|
|
|
|
|
|
// Finally, do the UI stuff:
|
|
|
|
MainWindow::instance()->refreshDisplay();
|
2015-04-10 09:39:51 +03:00
|
|
|
}
|
|
|
|
|
2018-09-23 21:22:48 +02:00
|
|
|
void UndoTripBase::undo()
|
2015-04-10 09:39:51 +03:00
|
|
|
{
|
2018-09-23 21:22:48 +02:00
|
|
|
// Redo and undo do the same thing!
|
|
|
|
redo();
|
|
|
|
}
|
|
|
|
|
|
|
|
UndoRemoveDivesFromTrip::UndoRemoveDivesFromTrip(const QVector<dive *> &divesToRemove)
|
|
|
|
{
|
|
|
|
setText(divesToRemove.size() == 1 ? gettextFromC::tr("remove dive from trip")
|
|
|
|
: gettextFromC::tr("remove %1 dives from trip").arg(divesToRemove.size()));
|
|
|
|
divesToMove.divesToMove.reserve(divesToRemove.size());
|
|
|
|
for (dive *d: divesToRemove)
|
|
|
|
divesToMove.divesToMove.push_back( {d, nullptr} );
|
|
|
|
}
|
|
|
|
|
|
|
|
UndoRemoveAutogenTrips::UndoRemoveAutogenTrips()
|
|
|
|
{
|
|
|
|
setText(gettextFromC::tr("remove autogenerated trips"));
|
|
|
|
// TODO: don't touch core-innards directly
|
|
|
|
int i;
|
|
|
|
struct dive *dive;
|
|
|
|
for_each_dive(i, dive) {
|
|
|
|
if (dive->divetrip && dive->divetrip->autogen)
|
|
|
|
divesToMove.divesToMove.push_back( {dive, nullptr} );
|
2015-04-10 09:39:51 +03:00
|
|
|
}
|
2018-09-23 21:22:48 +02:00
|
|
|
}
|
Undo: fix multi-level undo of delete-dive and remove-dive-from-trip
The original undo-code was fundamentally broken. Not only did it leak
resources (copied trips were never freed), it also kept references
to trips or dives that could be changed by other commands. Thus,
anything more than a single undo could lead to crashes.
Two ways of fixing this were considered
1) Don't store pointers, but unique dive-ids and trip-ids.
Whereas such unique ids exist for dives, they would have to be
implemented for trips.
2) Don't free objects in the backend.
Instead, take ownership of deleted objects in the undo-object.
Thus, all references in previous undo-objects are guaranteed to
still exist (unless the objects are deleted elsewhere).
After some contemplation, the second method was chosen, because
it is significantly less intrusive. While touching the undo-objects,
clearly separate backend from ui-code, such that they can ultimately
be reused for mobile.
Note that if other parts of the code delete dives, crashes can still
be provoked. Notable examples are split/merge dives. These will have
to be fixed later. Nevertheless, the new code is a significant
improvement over the old state.
While touching the code, implement proper translation string based
on Qt's plural-feature (using %n).
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-19 14:44:27 +02:00
|
|
|
|
2018-09-23 21:22:48 +02:00
|
|
|
UndoAddDivesToTrip::UndoAddDivesToTrip(const QVector<dive *> &divesToAddIn, dive_trip *trip)
|
|
|
|
{
|
|
|
|
setText(divesToAddIn.size() == 1 ? gettextFromC::tr("add dives to trip")
|
|
|
|
: gettextFromC::tr("add %1 dives to trip").arg(divesToAddIn.size()));
|
|
|
|
for (dive *d: divesToAddIn)
|
|
|
|
divesToMove.divesToMove.push_back( {d, trip} );
|
|
|
|
}
|
Undo: fix multi-level undo of delete-dive and remove-dive-from-trip
The original undo-code was fundamentally broken. Not only did it leak
resources (copied trips were never freed), it also kept references
to trips or dives that could be changed by other commands. Thus,
anything more than a single undo could lead to crashes.
Two ways of fixing this were considered
1) Don't store pointers, but unique dive-ids and trip-ids.
Whereas such unique ids exist for dives, they would have to be
implemented for trips.
2) Don't free objects in the backend.
Instead, take ownership of deleted objects in the undo-object.
Thus, all references in previous undo-objects are guaranteed to
still exist (unless the objects are deleted elsewhere).
After some contemplation, the second method was chosen, because
it is significantly less intrusive. While touching the undo-objects,
clearly separate backend from ui-code, such that they can ultimately
be reused for mobile.
Note that if other parts of the code delete dives, crashes can still
be provoked. Notable examples are split/merge dives. These will have
to be fixed later. Nevertheless, the new code is a significant
improvement over the old state.
While touching the code, implement proper translation string based
on Qt's plural-feature (using %n).
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-19 14:44:27 +02:00
|
|
|
|
2018-09-23 21:22:48 +02:00
|
|
|
UndoCreateTrip::UndoCreateTrip(const QVector<dive *> &divesToAddIn)
|
|
|
|
{
|
|
|
|
setText(gettextFromC::tr("create trip"));
|
|
|
|
|
|
|
|
if (divesToAddIn.isEmpty())
|
|
|
|
return;
|
|
|
|
|
|
|
|
dive_trip *trip = create_trip_from_dive(divesToAddIn[0]);
|
|
|
|
divesToMove.tripsToAdd.emplace_back(trip);
|
|
|
|
for (dive *d: divesToAddIn)
|
|
|
|
divesToMove.divesToMove.push_back( {d, trip} );
|
2015-04-10 09:39:51 +03:00
|
|
|
}
|
|
|
|
|
2018-09-23 21:22:48 +02:00
|
|
|
UndoAutogroupDives::UndoAutogroupDives()
|
2015-04-10 09:39:51 +03:00
|
|
|
{
|
2018-09-23 21:22:48 +02:00
|
|
|
setText(gettextFromC::tr("autogroup dives"));
|
|
|
|
|
|
|
|
dive_trip *trip;
|
|
|
|
bool alloc;
|
|
|
|
int from, to;
|
|
|
|
for(int i = 0; (trip = get_dives_to_autogroup(i, &from, &to, &alloc)) != NULL; i = to) {
|
|
|
|
// If this is an allocated trip, take ownership
|
|
|
|
if (alloc)
|
|
|
|
divesToMove.tripsToAdd.emplace_back(trip);
|
|
|
|
for (int j = from; j < to; ++j)
|
|
|
|
divesToMove.divesToMove.push_back( { get_dive(j), trip } );
|
2015-04-10 09:39:51 +03:00
|
|
|
}
|
2018-09-23 21:22:48 +02:00
|
|
|
}
|
Undo: fix multi-level undo of delete-dive and remove-dive-from-trip
The original undo-code was fundamentally broken. Not only did it leak
resources (copied trips were never freed), it also kept references
to trips or dives that could be changed by other commands. Thus,
anything more than a single undo could lead to crashes.
Two ways of fixing this were considered
1) Don't store pointers, but unique dive-ids and trip-ids.
Whereas such unique ids exist for dives, they would have to be
implemented for trips.
2) Don't free objects in the backend.
Instead, take ownership of deleted objects in the undo-object.
Thus, all references in previous undo-objects are guaranteed to
still exist (unless the objects are deleted elsewhere).
After some contemplation, the second method was chosen, because
it is significantly less intrusive. While touching the undo-objects,
clearly separate backend from ui-code, such that they can ultimately
be reused for mobile.
Note that if other parts of the code delete dives, crashes can still
be provoked. Notable examples are split/merge dives. These will have
to be fixed later. Nevertheless, the new code is a significant
improvement over the old state.
While touching the code, implement proper translation string based
on Qt's plural-feature (using %n).
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-19 14:44:27 +02:00
|
|
|
|
2018-09-23 21:22:48 +02:00
|
|
|
UndoMergeTrips::UndoMergeTrips(dive_trip *trip1, dive_trip *trip2)
|
|
|
|
{
|
|
|
|
if (trip1 == trip2)
|
|
|
|
return;
|
|
|
|
dive_trip *newTrip = combine_trips_create(trip1, trip2);
|
|
|
|
divesToMove.tripsToAdd.emplace_back(newTrip);
|
|
|
|
for (dive *d = trip1->dives; d; d = d->next)
|
|
|
|
divesToMove.divesToMove.push_back( { d, newTrip } );
|
|
|
|
for (dive *d = trip2->dives; d; d = d->next)
|
|
|
|
divesToMove.divesToMove.push_back( { d, newTrip } );
|
2015-04-10 09:39:51 +03:00
|
|
|
}
|
2018-07-20 20:26:06 +02:00
|
|
|
|
|
|
|
UndoSplitDives::UndoSplitDives(dive *d, duration_t time)
|
|
|
|
{
|
|
|
|
setText(gettextFromC::tr("split dive"));
|
|
|
|
|
|
|
|
// Split the dive
|
|
|
|
dive *new1, *new2;
|
|
|
|
int idx = time.seconds < 0 ?
|
|
|
|
split_dive_dont_insert(d, &new1, &new2) :
|
|
|
|
split_dive_at_time_dont_insert(d, time, &new1, &new2);
|
|
|
|
|
|
|
|
// If this didn't work, reset pointers so that redo() and undo() do nothing
|
|
|
|
if (idx < 0) {
|
|
|
|
diveToSplit = nullptr;
|
|
|
|
divesToUnsplit[0] = divesToUnsplit[1];
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
diveToSplit = d;
|
|
|
|
splitDives[0].dive.reset(new1);
|
|
|
|
splitDives[0].trip = d->divetrip;
|
|
|
|
splitDives[0].idx = idx;
|
|
|
|
splitDives[1].dive.reset(new2);
|
|
|
|
splitDives[1].trip = d->divetrip;
|
|
|
|
splitDives[1].idx = idx + 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
void UndoSplitDives::redo()
|
|
|
|
{
|
|
|
|
if (!diveToSplit)
|
|
|
|
return;
|
|
|
|
divesToUnsplit[0] = addDive(splitDives[0]);
|
|
|
|
divesToUnsplit[1] = addDive(splitDives[1]);
|
|
|
|
unsplitDive = removeDive(diveToSplit);
|
|
|
|
mark_divelist_changed(true);
|
|
|
|
|
|
|
|
// Finally, do the UI stuff:
|
|
|
|
MainWindow::instance()->refreshDisplay();
|
|
|
|
MainWindow::instance()->refreshProfile();
|
|
|
|
}
|
|
|
|
|
|
|
|
void UndoSplitDives::undo()
|
|
|
|
{
|
|
|
|
if (!unsplitDive.dive)
|
|
|
|
return;
|
|
|
|
// Note: reverse order with respect to redo()
|
|
|
|
diveToSplit = addDive(unsplitDive);
|
|
|
|
splitDives[1] = removeDive(divesToUnsplit[1]);
|
|
|
|
splitDives[0] = removeDive(divesToUnsplit[0]);
|
|
|
|
mark_divelist_changed(true);
|
|
|
|
|
|
|
|
// Finally, do the UI stuff:
|
|
|
|
MainWindow::instance()->refreshDisplay();
|
|
|
|
MainWindow::instance()->refreshProfile();
|
|
|
|
}
|
2018-07-21 18:28:33 +02:00
|
|
|
|
|
|
|
UndoMergeDives::UndoMergeDives(const QVector <dive *> &dives)
|
|
|
|
{
|
|
|
|
setText(gettextFromC::tr("merge dive"));
|
|
|
|
|
|
|
|
// We start in redo mode
|
|
|
|
diveToUnmerge = nullptr;
|
|
|
|
|
|
|
|
// Just a safety check - if there's not two or more dives - do nothing
|
|
|
|
// The caller should have made sure that this doesn't happen.
|
|
|
|
if (dives.count() < 2) {
|
|
|
|
qWarning() << "Merging less than two dives";
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
dive_trip *preferred_trip;
|
|
|
|
OwningDivePtr d(merge_dives(dives[0], dives[1], dives[1]->when - dives[0]->when, false, &preferred_trip));
|
|
|
|
|
|
|
|
// Set the preferred dive trip, so that for subsequent merges the better trip can be selected
|
|
|
|
d->divetrip = preferred_trip;
|
|
|
|
for (int i = 2; i < dives.count(); ++i) {
|
|
|
|
d.reset(merge_dives(d.get(), dives[i], dives[i]->when - d->when, false, &preferred_trip));
|
|
|
|
// Set the preferred dive trip, so that for subsequent merges the better trip can be selected
|
|
|
|
d->divetrip = preferred_trip;
|
|
|
|
}
|
|
|
|
|
|
|
|
// We got our preferred trip, so now the reference can be deleted from the newly generated dive
|
|
|
|
d->divetrip = nullptr;
|
|
|
|
|
|
|
|
// The merged dive gets the number of the first dive
|
|
|
|
d->number = dives[0]->number;
|
|
|
|
|
|
|
|
// We will only renumber the remaining dives if the joined dives are consecutive.
|
|
|
|
// Otherwise all bets are off concerning what the user wanted and doing nothing seems
|
|
|
|
// like the best option.
|
|
|
|
int idx = get_divenr(dives[0]);
|
|
|
|
int num = dives.count();
|
|
|
|
if (idx < 0 || idx + num > dive_table.nr) {
|
|
|
|
// It was the callers responsibility to pass only known dives.
|
|
|
|
// Something is seriously wrong - give up.
|
|
|
|
qWarning() << "Merging unknown dives";
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
// std::equal compares two ranges. The parameters are (begin_range1, end_range1, begin_range2).
|
|
|
|
// Here, we can compare C-arrays, because QVector guarantees contiguous storage.
|
|
|
|
if (std::equal(&dives[0], &dives[0] + num, &dive_table.dives[idx]) &&
|
|
|
|
dives[0]->number && dives.last()->number && dives[0]->number < dives.last()->number) {
|
|
|
|
// We have a consecutive set of dives. Rename all following dives according to the
|
|
|
|
// number of erased dives. This considers that there might be missing numbers.
|
|
|
|
// Comment copied from core/divelist.c:
|
|
|
|
// So if you had a dive list 1 3 6 7 8, and you
|
|
|
|
// merge 1 and 3, the resulting numbered list will
|
|
|
|
// be 1 4 5 6, because we assume that there were
|
|
|
|
// some missing dives (originally dives 4 and 5),
|
|
|
|
// that now will still be missing (dives 2 and 3
|
|
|
|
// in the renumbered world).
|
|
|
|
//
|
|
|
|
// Obviously the normal case is that everything is
|
|
|
|
// consecutive, and the difference will be 1, so the
|
|
|
|
// above example is not supposed to be normal.
|
|
|
|
int diff = dives.last()->number - dives[0]->number;
|
|
|
|
divesToRenumber.reserve(dive_table.nr - idx - num);
|
|
|
|
int previousnr = dives[0]->number;
|
|
|
|
for (int i = idx + num; i < dive_table.nr; ++i) {
|
|
|
|
int newnr = dive_table.dives[i]->number - diff;
|
|
|
|
|
|
|
|
// Stop renumbering if stuff isn't in order (see also core/divelist.c)
|
|
|
|
if (newnr <= previousnr)
|
|
|
|
break;
|
|
|
|
divesToRenumber.append(QPair<int,int>(dive_table.dives[i]->id, newnr));
|
|
|
|
previousnr = newnr;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
mergedDive.dive = std::move(d);
|
|
|
|
mergedDive.idx = get_divenr(dives[0]);
|
|
|
|
mergedDive.trip = preferred_trip;
|
|
|
|
divesToMerge = dives.toStdVector();
|
|
|
|
}
|
|
|
|
|
|
|
|
void UndoMergeDives::redo()
|
|
|
|
{
|
|
|
|
renumberDives(divesToRenumber);
|
|
|
|
diveToUnmerge = addDive(mergedDive);
|
|
|
|
unmergedDives = removeDives(divesToMerge);
|
|
|
|
|
|
|
|
// Finally, do the UI stuff:
|
|
|
|
MainWindow::instance()->refreshDisplay();
|
|
|
|
MainWindow::instance()->refreshProfile();
|
|
|
|
}
|
|
|
|
|
|
|
|
void UndoMergeDives::undo()
|
|
|
|
{
|
|
|
|
divesToMerge = addDives(unmergedDives);
|
|
|
|
mergedDive = removeDive(diveToUnmerge);
|
|
|
|
renumberDives(divesToRenumber);
|
|
|
|
|
|
|
|
// Finally, do the UI stuff:
|
|
|
|
MainWindow::instance()->refreshDisplay();
|
|
|
|
MainWindow::instance()->refreshProfile();
|
|
|
|
}
|