diff options
| author |  Rick Walsh <rickmwalsh@gmail.com> | 2016-07-06 22:40:28 +1000 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2016-07-09 12:07:25 -0700 |
| commit | b1ed04a7f462d88b28b1abab881a0e1a8acc212a (patch) | |
| tree | 3281beb6fb2789d790330e14a07266ec8df4c5c9 /qt-models/cylindermodel.cpp | |
| parent | 066f79223cf49cda5f762b3b9413774b8417cb9f (diff) | |
| download | subsurface-b1ed04a7f462d88b28b1abab881a0e1a8acc212a.tar.gz | |
Have divedatapoint store cylinder id instead of gasmix
Determining the correct cylinder index from a known gas mix can be
complicated, but it is trivial to look up the gasmix from the cylinder_t
structure.
It makes sense to remember which cylinder is being used. This simplifies
handling changing a cylinder's gas mix, either directly by the user, or
indirectly in the planner. It also permits tracking of multiple cylinders of
the same mix, e.g. independent twins / sidemount.
Signed-off-by: Rick Walsh <rickmwalsh@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-models/cylindermodel.cpp')
| -rw-r--r-- | qt-models/cylindermodel.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/qt-models/cylindermodel.cpp b/qt-models/cylindermodel.cpp index 20b72077d..6ea27f167 100644 --- a/qt-models/cylindermodel.cpp +++ b/qt-models/cylindermodel.cpp @@ -296,8 +296,6 @@ bool CylindersModel::setData(const QModelIndex &index, const QVariant &value, in } break; } - if (addDiveMode) - DivePlannerPointsModel::instance()->tanksUpdated(); dataChanged(index, index); return true; } @@ -391,8 +389,8 @@ void CylindersModel::remove(const QModelIndex &index) } if (same_gas == -1 && ((DivePlannerPointsModel::instance()->currentMode() != DivePlannerPointsModel::NOTHING && - DivePlannerPointsModel::instance()->tankInUse(cyl->gasmix)) || - (DivePlannerPointsModel::instance()->currentMode() == DivePlannerPointsModel::NOTHING && + DivePlannerPointsModel::instance()->tankInUse(index.row())) || + (DivePlannerPointsModel::instance()->currentMode() == DivePlannerPointsModel::NOTHING && is_cylinder_used(&displayed_dive, index.row())))) { emit warningMessage(TITLE_OR_TEXT( tr("Cylinder cannot be removed"), |