mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 05:00:20 +00:00
975c123a30
The DiveCalculatedCeiling profile-item has a recalc()
function, which calls "dataModel->calculateDecompression()".
This is a questionable reversal of control-flow: The
profile-item should paint the model-data not change it.
The code was supposed to be called under two conditions:
1) The value of the calcceiling3m preferences flag changed.
This code was buggy for two reasons: Firstly, the cached
value was always initialized to false, which means that
sometimes the first call was missed. Secondly, the
settingsChanged() functions was only called when closing
the preferences window, not when changing the flag in the
profile widgets.
2) The datetime of the dive changed. The whole control-flow is
pretty absurd (due to "bit rot"):
- The replan-dive command sends a date-time changed signal.
- The main tab changes the date-time and informs the profile.
- The profile sends a signal to the item.
- The item instructs the model to recalculate the
decompression.
- The model causes the profile to be redrawn.
In any case, the whole thing is moot, because the decompression
is recalculated for *every* profile plot in create_plot_info_new().
Let's remove the code from the DiveCalculatedCeiling profile-item
and the calculateDecompression() function, which is now not
used anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
96 lines
1.8 KiB
C++
96 lines
1.8 KiB
C++
// SPDX-License-Identifier: GPL-2.0
|
|
#ifndef DIVEPLOTDATAMODEL_H
|
|
#define DIVEPLOTDATAMODEL_H
|
|
|
|
#include <QAbstractTableModel>
|
|
|
|
#include "core/display.h"
|
|
#include "core/deco.h"
|
|
#include "core/planner.h"
|
|
|
|
struct dive;
|
|
struct plot_data;
|
|
struct plot_info;
|
|
|
|
class DivePlotDataModel : public QAbstractTableModel {
|
|
Q_OBJECT
|
|
public:
|
|
enum {
|
|
DEPTH,
|
|
TIME,
|
|
PRESSURE,
|
|
TEMPERATURE,
|
|
USERENTERED,
|
|
COLOR,
|
|
SENSOR_PRESSURE,
|
|
INTERPOLATED_PRESSURE,
|
|
SAC,
|
|
CEILING,
|
|
TISSUE_1,
|
|
TISSUE_2,
|
|
TISSUE_3,
|
|
TISSUE_4,
|
|
TISSUE_5,
|
|
TISSUE_6,
|
|
TISSUE_7,
|
|
TISSUE_8,
|
|
TISSUE_9,
|
|
TISSUE_10,
|
|
TISSUE_11,
|
|
TISSUE_12,
|
|
TISSUE_13,
|
|
TISSUE_14,
|
|
TISSUE_15,
|
|
TISSUE_16,
|
|
PERCENTAGE_1,
|
|
PERCENTAGE_2,
|
|
PERCENTAGE_3,
|
|
PERCENTAGE_4,
|
|
PERCENTAGE_5,
|
|
PERCENTAGE_6,
|
|
PERCENTAGE_7,
|
|
PERCENTAGE_8,
|
|
PERCENTAGE_9,
|
|
PERCENTAGE_10,
|
|
PERCENTAGE_11,
|
|
PERCENTAGE_12,
|
|
PERCENTAGE_13,
|
|
PERCENTAGE_14,
|
|
PERCENTAGE_15,
|
|
PERCENTAGE_16,
|
|
PN2,
|
|
PHE,
|
|
PO2,
|
|
O2SETPOINT,
|
|
CCRSENSOR1,
|
|
CCRSENSOR2,
|
|
CCRSENSOR3,
|
|
SCR_OC_PO2,
|
|
HEARTBEAT,
|
|
AMBPRESSURE,
|
|
GFLINE,
|
|
INSTANT_MEANDEPTH,
|
|
COLUMNS
|
|
};
|
|
explicit DivePlotDataModel(QObject *parent = 0);
|
|
~DivePlotDataModel();
|
|
int columnCount(const QModelIndex &parent = QModelIndex()) const override;
|
|
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
|
|
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
|
|
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
|
|
void clear();
|
|
void setDive(struct dive *d, const plot_info &pInfo);
|
|
const plot_info &data() const;
|
|
unsigned int dcShown() const;
|
|
double pheMax();
|
|
double pn2Max();
|
|
double po2Max();
|
|
void emitDataChanged();
|
|
|
|
private:
|
|
struct plot_info pInfo;
|
|
unsigned int dcNr;
|
|
struct deco_state plot_deco_state;
|
|
};
|
|
|
|
#endif // DIVEPLOTDATAMODEL_H
|