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();
}