diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2014-06-01 15:25:19 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2014-06-01 15:40:46 -0700 |
| commit | fe773241eea51036b25815302fc676eafbcac85a (patch) | |
| tree | 9bbf7ff480508a90af7ddfb266517de38107be98 /qt-ui/models.cpp | |
| parent | 2bf46381a82fd6ae514b014b8d32954693bca346 (diff) | |
| download | subsurface-fe773241eea51036b25815302fc676eafbcac85a.tar.gz | |
Next step to using gasmix instead of o2/he
This changes the divedatapoints and functions that deal with them.
It changes plan_add_segment(), create_dp(), gasToStr(), and tankInUse() to
consume gasmix instead of o2/he.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui/models.cpp')
| -rw-r--r-- | qt-ui/models.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp index 340276059..9b92f8197 100644 --- a/qt-ui/models.cpp +++ b/qt-ui/models.cpp @@ -356,7 +356,7 @@ void CylindersModel::remove(const QModelIndex &index) } cylinder_t *cyl = ¤t->cylinder[index.row()]; if ((DivePlannerPointsModel::instance()->currentMode() != DivePlannerPointsModel::NOTHING && - DivePlannerPointsModel::instance()->tankInUse(cyl->gasmix.o2.permille, cyl->gasmix.he.permille)) || + DivePlannerPointsModel::instance()->tankInUse(cyl->gasmix)) || (DivePlannerPointsModel::instance()->currentMode() == DivePlannerPointsModel::NOTHING && (cyl->manually_added || (current_dive && cylinder_is_used(current_dive, cyl))))) { QMessageBox::warning(MainWindow::instance(), TITLE_OR_TEXT( |