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

cylinders: remove CylindersModel::changed

Browse source 
Nobody is testing that flag anymore.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-02-27 18:46:13 +01:00
parent 0732bb2302
commit d02489f888
2 changed files with 3 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
qt-models/cylindermodel.cpp
View file

@ -11,7 +11,6 @@
#include "core/subsurface-string.h" #include "core/subsurface-string.h"
CylindersModel::CylindersModel(QObject *parent) : CleanerTableModel(parent), CylindersModel::CylindersModel(QObject *parent) : CleanerTableModel(parent),
changed(false),
d(nullptr) d(nullptr)
{ {
// enum {REMOVE, TYPE, SIZE, WORKINGPRESS, START, END, O2, HE, DEPTH, MOD, MND, USE, IS_USED}; // enum {REMOVE, TYPE, SIZE, WORKINGPRESS, START, END, O2, HE, DEPTH, MOD, MND, USE, IS_USED};
@ -329,7 +328,6 @@ bool CylindersModel::setData(const QModelIndex &index, const QVariant &value, in
if (!same_string(qPrintable(type), cyl->type.description)) { if (!same_string(qPrintable(type), cyl->type.description)) {
free((void *)cyl->type.description); free((void *)cyl->type.description);
cyl->type.description = strdup(qPrintable(type)); cyl->type.description = strdup(qPrintable(type));
changed = true;
} }
} }
break; break;
@ -342,7 +340,6 @@ bool CylindersModel::setData(const QModelIndex &index, const QVariant &value, in
mark_divelist_changed(true); mark_divelist_changed(true);
if (!matches.isEmpty()) if (!matches.isEmpty())
tanks->setData(tanks->index(matches.first().row(), TankInfoModel::ML), cyl->type.size.mliter); tanks->setData(tanks->index(matches.first().row(), TankInfoModel::ML), cyl->type.size.mliter);
changed = true;
} }
break; break;
case WORKINGPRESS: case WORKINGPRESS:
@ -352,21 +349,16 @@ bool CylindersModel::setData(const QModelIndex &index, const QVariant &value, in
cyl->type.workingpressure = string_to_pressure(qPrintable(vString)); cyl->type.workingpressure = string_to_pressure(qPrintable(vString));
if (!matches.isEmpty()) if (!matches.isEmpty())
tanks->setData(tanks->index(matches.first().row(), TankInfoModel::BAR), cyl->type.workingpressure.mbar / 1000.0); tanks->setData(tanks->index(matches.first().row(), TankInfoModel::BAR), cyl->type.workingpressure.mbar / 1000.0);
changed = true;
} }
break; break;
case START: case START:
if (CHANGED()) { if (CHANGED())
cyl->start = string_to_pressure(qPrintable(vString)); cyl->start = string_to_pressure(qPrintable(vString));
changed = true;
}
break; break;
case END: case END:
if (CHANGED()) { if (CHANGED())
//&& (!cyl->start.mbar || string_to_pressure(qPrintable(vString)).mbar <= cyl->start.mbar)) { //&& (!cyl->start.mbar || string_to_pressure(qPrintable(vString)).mbar <= cyl->start.mbar)) {
cyl->end = string_to_pressure(qPrintable(vString)); cyl->end = string_to_pressure(qPrintable(vString));
changed = true;
}
break; break;
case O2: case O2:
if (CHANGED()) { if (CHANGED()) {
@ -382,7 +374,6 @@ bool CylindersModel::setData(const QModelIndex &index, const QVariant &value, in
modpO2.mbar = prefs.decopo2; modpO2.mbar = prefs.decopo2;
cyl->depth = gas_mod(cyl->gasmix, modpO2, d, M_OR_FT(3, 10)); cyl->depth = gas_mod(cyl->gasmix, modpO2, d, M_OR_FT(3, 10));
cyl->bestmix_o2 = false; cyl->bestmix_o2 = false;
changed = true;
} }
break; break;
case HE: case HE:
@ -392,14 +383,11 @@ bool CylindersModel::setData(const QModelIndex &index, const QVariant &value, in
if (get_o2(cyl->gasmix) + get_he(cyl->gasmix) > 1000) if (get_o2(cyl->gasmix) + get_he(cyl->gasmix) > 1000)
cyl->gasmix.o2.permille = 1000 - get_he(cyl->gasmix); cyl->gasmix.o2.permille = 1000 - get_he(cyl->gasmix);
cyl->bestmix_he = false; cyl->bestmix_he = false;
changed = true;
} }
break; break;
case DEPTH: case DEPTH:
if (CHANGED()) { if (CHANGED())
cyl->depth = string_to_depth(qPrintable(vString)); cyl->depth = string_to_depth(qPrintable(vString));
changed = true;
}
break; break;
case MOD: case MOD:
if (CHANGED()) { if (CHANGED()) {
@ -415,7 +403,6 @@ bool CylindersModel::setData(const QModelIndex &index, const QVariant &value, in
pressure_t modpO2; pressure_t modpO2;
modpO2.mbar = prefs.decopo2; modpO2.mbar = prefs.decopo2;
cyl->depth = gas_mod(cyl->gasmix, modpO2, d, M_OR_FT(3, 10)); cyl->depth = gas_mod(cyl->gasmix, modpO2, d, M_OR_FT(3, 10));
changed = true;
} }
break; break;
case MND: case MND:
@ -429,7 +416,6 @@ bool CylindersModel::setData(const QModelIndex &index, const QVariant &value, in
// Calculate fHe for input depth // Calculate fHe for input depth
cyl->gasmix.he = best_he(string_to_depth(qPrintable(vString)), d, prefs.o2narcotic, cyl->gasmix.o2); cyl->gasmix.he = best_he(string_to_depth(qPrintable(vString)), d, prefs.o2narcotic, cyl->gasmix.o2);
} }
changed = true;
} }
break; break;
case USE: case USE:
@ -438,7 +424,6 @@ bool CylindersModel::setData(const QModelIndex &index, const QVariant &value, in
if (use > NUM_GAS_USE - 1 || use < 0) if (use > NUM_GAS_USE - 1 || use < 0)
use = 0; use = 0;
cyl->cylinder_use = (enum cylinderuse)use; cyl->cylinder_use = (enum cylinderuse)use;
changed = true;
} }
break; break;
} }
@ -459,7 +444,6 @@ void CylindersModel::add()
cylinder_t cyl = create_new_cylinder(d); cylinder_t cyl = create_new_cylinder(d);
beginInsertRows(QModelIndex(), row, row); beginInsertRows(QModelIndex(), row, row);
add_to_cylinder_table(&d->cylinders, row, cyl); add_to_cylinder_table(&d->cylinders, row, cyl);
changed = true;
endInsertRows(); endInsertRows();
emit dataChanged(createIndex(row, 0), createIndex(row, COLUMNS - 1)); emit dataChanged(createIndex(row, 0), createIndex(row, COLUMNS - 1));
} }
@ -502,7 +486,6 @@ void CylindersModel::remove(QModelIndex index)
cyl->cylinder_use = NOT_USED; cyl->cylinder_use = NOT_USED;
else if (cyl->cylinder_use == NOT_USED) else if (cyl->cylinder_use == NOT_USED)
cyl->cylinder_use = OC_GAS; cyl->cylinder_use = OC_GAS;
changed = true;
dataChanged(index, index); dataChanged(index, index);
return; return;
} }
@ -515,13 +498,11 @@ void CylindersModel::remove(QModelIndex index)
beginRemoveRows(QModelIndex(), index.row(), index.row()); beginRemoveRows(QModelIndex(), index.row(), index.row());
remove_cylinder(d, index.row()); remove_cylinder(d, index.row());
changed = true;
endRemoveRows(); endRemoveRows();
std::vector<int> mapping = get_cylinder_map_for_remove(d->cylinders.nr + 1, index.row()); std::vector<int> mapping = get_cylinder_map_for_remove(d->cylinders.nr + 1, index.row());
cylinder_renumber(d, &mapping[0]); cylinder_renumber(d, &mapping[0]);
DivePlannerPointsModel::instance()->cylinderRenumber(&mapping[0]); DivePlannerPointsModel::instance()->cylinderRenumber(&mapping[0]);
changed = true;
} }
void CylindersModel::cylinderAdded(struct dive *changed, int pos) void CylindersModel::cylinderAdded(struct dive *changed, int pos)
@ -576,7 +557,6 @@ void CylindersModel::moveAtFirst(int cylid)
cylinder_renumber(d, &mapping[0]); cylinder_renumber(d, &mapping[0]);
if (in_planner()) if (in_planner())
DivePlannerPointsModel::instance()->cylinderRenumber(&mapping[0]); DivePlannerPointsModel::instance()->cylinderRenumber(&mapping[0]);
changed = true;
endMoveRows(); endMoveRows();
} }

1
qt-models/cylindermodel.h
View file

@ -45,7 +45,6 @@ public:
void updateDecoDepths(pressure_t olddecopo2); void updateDecoDepths(pressure_t olddecopo2);
void updateTrashIcon(); void updateTrashIcon();
void moveAtFirst(int cylid); void moveAtFirst(int cylid);
bool changed;
QVariant headerData(int section, Qt::Orientation orientation, int role) const override; QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
bool updateBestMixes(); bool updateBestMixes();
bool cylinderUsed(int i) const; bool cylinderUsed(int i) const;