mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

planner: remove dc_number access from models

Browse source 
Instead of accessing the global dc_number from the
DivePlannerPointsModel and the CylinderModel, pass them
in the respective initialization functions.

The dc_number global might not make sense on mobile.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2022-05-21 22:08:46 +02:00 • committed by bstoeger
parent d057af43b4
commit 832398180c
7 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

9
qt-models/cylindermodel.cpp
View file

@ -241,7 +241,8 @@ QVariant CylindersModel::data(const QModelIndex &index, int role) const
case SIZE_INT:
return static_cast<int>(cyl->type.size.mliter);
case SENSORS: {
const struct divecomputer *currentdc = get_dive_dc(current_dive, dc_number);
std::vector<int16_t> sensors;
const struct divecomputer *currentdc = get_dive_dc(d, dcNr);
for (int i = 0; i < currentdc->samples; ++i) {
auto &sample = currentdc->sample[i];
for (int s = 0; s < MAX_SENSORS; ++s) {
@ -475,7 +476,7 @@ bool CylindersModel::setData(const QModelIndex &index, const QVariant &value, in
bool ok = false;
int s = vString.toInt(&ok);
if (ok) {
Command::editSensors(index.row(), s, dc_number);
Command::editSensors(index.row(), s, dcNr);
// We don't use the edit cylinder command and editing sensors is not relevant for planner
return true;
}
@ -521,10 +522,11 @@ void CylindersModel::clear()
{
beginResetModel();
d = nullptr;
dcNr = -1;
endResetModel();
}
void CylindersModel::updateDive(dive *dIn)
void CylindersModel::updateDive(dive *dIn, int dcNrIn)
{
#ifdef DEBUG_CYL
if (d)
@ -532,6 +534,7 @@ void CylindersModel::updateDive(dive *dIn)
#endif
beginResetModel();
d = dIn;
dcNr = dcNrIn;
numRows = calcNumRows();
endResetModel();
}

3
qt-models/cylindermodel.h
View file

@ -44,7 +44,7 @@ public:
void add();
void clear();
void updateDive(dive *d);
void updateDive(dive *d, int dcNr);
void updateDecoDepths(pressure_t olddecopo2);
void updateTrashIcon();
void moveAtFirst(int cylid);
@ -65,6 +65,7 @@ slots:
private:
dive *d;
int dcNr;
bool inPlanner;
bool hideUnused;
int numRows; // Does not include unused cylinders at the end

9
qt-models/diveplannermodel.cpp
View file

@ -105,9 +105,10 @@ void DivePlannerPointsModel::setupStartTime()
}
}
void DivePlannerPointsModel::loadFromDive(dive *dIn)
void DivePlannerPointsModel::loadFromDive(dive *dIn, int dcNrIn)
{
d = dIn;
dcNr = dcNrIn;
int depthsum = 0;
int samplecount = 0;
@ -115,7 +116,7 @@ void DivePlannerPointsModel::loadFromDive(dive *dIn)
struct divecomputer *dc = &(d->dc);
const struct event *evd = NULL;
enum divemode_t current_divemode = UNDEF_COMP_TYPE;
cylinders.updateDive(d);
cylinders.updateDive(d, dcNr);
duration_t lasttime = { 0 };
duration_t lastrecordedtime = {};
duration_t newtime = {};
@ -197,7 +198,7 @@ void DivePlannerPointsModel::setupCylinders()
reset_cylinders(d, true);
if (d->cylinders.nr > 0) {
cylinders.updateDive(d);
cylinders.updateDive(d, dcNr);
return; // We have at least one cylinder
}
}
@ -215,7 +216,7 @@ void DivePlannerPointsModel::setupCylinders()
add_cylinder(&d->cylinders, 0, cyl);
}
reset_cylinders(d, false);
cylinders.updateDive(d);
cylinders.updateDive(d, dcNr);
}
// Update the dive's maximum depth. Returns true if max. depth changed

3
qt-models/diveplannermodel.h
View file

@ -60,7 +60,7 @@ public:
struct diveplan &getDiveplan();
struct deco_state final_deco_state;
void loadFromDive(dive *d);
void loadFromDive(dive *d, int dcNr);
void addStop(int millimeters, int seconds);
public
slots:
@ -132,6 +132,7 @@ private:
void computeVariationsFreeDeco(struct diveplan *diveplan, struct deco_state *ds);
int analyzeVariations(struct decostop *min, struct decostop *mid, struct decostop *max, const char *unit);
struct dive *d;
int dcNr;
CylindersModel cylinders;
Mode mode;
QVector<divedatapoint> divepoints;