mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
528532572f
Currently editing of planned dives that have been merged with actual (logged) dives only works if the 'Planned dive' divecomputer is the first divecomputer, and this divecomputer is selected when clicking 'Edit planned dive'. In other cases the profile of the first divecomputer is overlaid with the profile of the planned dive, and the first divecomputer's profile is overwritten when saving the dive plan. Fix this problem. Triggered by @SeppoTakalo's comment (https://github.com/subsurface/subsurface/issues/1913#issuecomment-2075562119): Users don't like that planned dives show up as their own entries in the dive list, so being able to merge them with the actual dive after it has been executed is a good feature - but this wasn't working well until now. Signed-off-by: Michael Keller <github@ike.ch>
57 lines
1.3 KiB
C++
57 lines
1.3 KiB
C++
// SPDX-License-Identifier: GPL-2.0
|
|
// The profile and its toolbars.
|
|
|
|
#ifndef PROFILEWIDGET_H
|
|
#define PROFILEWIDGET_H
|
|
|
|
#include "ui_profilewidget.h"
|
|
#include "core/owning_ptrs.h"
|
|
#include "core/subsurface-qt/divelistnotifier.h"
|
|
|
|
#include <vector>
|
|
|
|
struct dive;
|
|
class ProfileWidget2;
|
|
class EmptyView;
|
|
class QStackedWidget;
|
|
|
|
extern "C" void free_dive(struct dive *);
|
|
|
|
class ProfileWidget : public QWidget {
|
|
Q_OBJECT
|
|
public:
|
|
ProfileWidget();
|
|
~ProfileWidget();
|
|
std::unique_ptr<ProfileWidget2> view;
|
|
void plotDive(struct dive *d, int dc); // Attempt to keep DC number id dc < 0
|
|
void plotCurrentDive();
|
|
void setPlanState(const struct dive *d, int dc);
|
|
void setEnabledToolbar(bool enabled);
|
|
void nextDC();
|
|
void prevDC();
|
|
dive *d;
|
|
int dc;
|
|
private
|
|
slots:
|
|
void divesChanged(const QVector<dive *> &dives, DiveField field);
|
|
void unsetProfHR();
|
|
void unsetProfTissues();
|
|
void stopAdded();
|
|
void stopRemoved(int count);
|
|
void stopMoved(int count);
|
|
private:
|
|
std::unique_ptr<EmptyView> emptyView;
|
|
std::vector<QAction *> toolbarActions;
|
|
Ui::ProfileWidget ui;
|
|
QStackedWidget *stack;
|
|
void setDive(const struct dive *d, int dcNr);
|
|
void editDive();
|
|
void exitEditMode();
|
|
void rotateDC(int dir);
|
|
OwningDivePtr editedDive;
|
|
int editedDc;
|
|
dive *originalDive;
|
|
bool placingCommand;
|
|
};
|
|
|
|
#endif // PROFILEWIDGET_H
|