mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 13:10:19 +00:00
b19adecb9f
Planned dives were still added by directly calling core code. This could confuse the undo-machinery, leading to crashes. Instead, use the proper undo-command. The problem is that as opposed to the other AddDive-commands, planned dives may belong to a trip. Thus, the interface to the AddDive command was changed to respect the divetrip field. Make sure that the other callers reset that field (actually, it should never be set). Add a comment describing the perhaps surprising interface (the passed-in dive, usually displayed dive, is reset). Moreover, a dive cloned in the planner is not assigned a new number. Thus, add an argument to the AddDive-command, which expresses whether a new number should be generated for the to-be-added dive. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
38 lines
1.5 KiB
C++
38 lines
1.5 KiB
C++
// SPDX-License-Identifier: GPL-2.0
|
|
#ifndef COMMAND_H
|
|
#define COMMAND_H
|
|
|
|
#include "core/dive.h"
|
|
#include <QVector>
|
|
#include <QAction>
|
|
|
|
// We put everything in a namespace, so that we can shorten names without polluting the global namespace
|
|
namespace Command {
|
|
|
|
// 1) General commands
|
|
|
|
void clear(); // Reset the undo stack. Delete all commands.
|
|
QAction *undoAction(QObject *parent); // Create an undo action.
|
|
QAction *redoAction(QObject *parent); // Create an redo action.
|
|
|
|
// 2) Dive-list related commands
|
|
|
|
void addDive(dive *d, bool autogroup, bool newNumber); // If d->dive_trip is null and autogroup is true, dives within the auto-group
|
|
// distance are added to a trip. dive d is consumed (the structure is reset)!
|
|
// If newNumber is true, the dive is assigned a new number, depending on the
|
|
// insertion position.
|
|
void deleteDive(const QVector<struct dive*> &divesToDelete);
|
|
void shiftTime(const QVector<dive *> &changedDives, int amount);
|
|
void renumberDives(const QVector<QPair<dive *, int>> &divesToRenumber);
|
|
void removeDivesFromTrip(const QVector<dive *> &divesToRemove);
|
|
void removeAutogenTrips();
|
|
void addDivesToTrip(const QVector<dive *> &divesToAddIn, dive_trip *trip);
|
|
void createTrip(const QVector<dive *> &divesToAddIn);
|
|
void autogroupDives();
|
|
void mergeTrips(dive_trip *trip1, dive_trip *trip2);
|
|
void splitDives(dive *d, duration_t time);
|
|
void mergeDives(const QVector <dive *> &dives);
|
|
|
|
} // namespace Command
|
|
|
|
#endif // COMMAND_H
|