diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-02-03 07:31:03 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-02-03 07:31:03 -0800 |
| commit | 08c42813e5d3af8ca702be4333daf46cc14c1d39 (patch) | |
| tree | e75edfe480b20bd743887e1d868024624a2d5163 /qt-models | |
| parent | 414d7f2632273420aea8e6cb5291a40ea2111d13 (diff) | |
| download | subsurface-08c42813e5d3af8ca702be4333daf46cc14c1d39.tar.gz | |
Revert "In statistics, ignore gas use of planned dives"
This reverts commit 1d8662006cbb5edae941315e30ede381c23a817b.
Mistakenly pushed to master
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-models')
| -rw-r--r-- | qt-models/cylindermodel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qt-models/cylindermodel.cpp b/qt-models/cylindermodel.cpp index d5220a56e..fe63cf6f2 100644 --- a/qt-models/cylindermodel.cpp +++ b/qt-models/cylindermodel.cpp @@ -451,7 +451,7 @@ void CylindersModel::updateDive() for (int i = 0; i < MAX_CYLINDERS; i++) { if (!cylinder_none(&displayed_dive.cylinder[i]) && (prefs.display_unused_tanks || - is_cylinder_used(&displayed_dive, i, false) || + is_cylinder_used(&displayed_dive, i) || displayed_dive.cylinder[i].manually_added)) rows = i + 1; } @@ -468,7 +468,7 @@ void CylindersModel::copyFromDive(dive *d) rows = 0; for (int i = 0; i < MAX_CYLINDERS; i++) { if (!cylinder_none(&d->cylinder[i]) && - (is_cylinder_used(d, i, false) || prefs.display_unused_tanks)) { + (is_cylinder_used(d, i) || prefs.display_unused_tanks)) { rows = i + 1; } } @@ -517,7 +517,7 @@ void CylindersModel::remove(const QModelIndex &index) ((DivePlannerPointsModel::instance()->currentMode() != DivePlannerPointsModel::NOTHING && DivePlannerPointsModel::instance()->tankInUse(index.row())) || (DivePlannerPointsModel::instance()->currentMode() == DivePlannerPointsModel::NOTHING && - is_cylinder_used(&displayed_dive, index.row(), false)))) { + is_cylinder_used(&displayed_dive, index.row())))) { emit warningMessage(TITLE_OR_TEXT( tr("Cylinder cannot be removed"), tr("This gas is in use. Only cylinders that are not used in the dive can be removed."))); |