diff options
| author |  Robert C. Helling <helling@atdotde.de> | 2015-02-15 12:28:46 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-02-17 08:51:05 -0800 |
| commit | b60a3d71d3f7df8ab8f71d837a902a1fc6427766 (patch) | |
| tree | cf00e9154c773a331a75a177bd5860147661e313 | |
| parent | 55898c07ff329ce80252ea7a6e916db3b2f012bc (diff) | |
| download | subsurface-b60a3d71d3f7df8ab8f71d837a902a1fc6427766.tar.gz | |
Use unused cylinders in planner if they are displayed
This makes prefs.display_unused_tanks also relevant for the planner.
Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | qt-ui/diveplanner.cpp | 4 | ||||
| -rw-r--r-- | qt-ui/models.cpp | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp index 84555bcd6..7831cc6d9 100644 --- a/qt-ui/diveplanner.cpp +++ b/qt-ui/diveplanner.cpp @@ -129,9 +129,9 @@ void DivePlannerPointsModel::loadFromDive(dive *d) void DivePlannerPointsModel::setupCylinders() { if (mode == PLAN && current_dive) { - // take the used cylinders from the selected dive as starting point + // take the displayed cylinders from the selected dive as starting point CylindersModel::instance()->copyFromDive(current_dive); - copy_cylinders(current_dive, &displayed_dive, false); + copy_cylinders(current_dive, &displayed_dive, !prefs.display_unused_tanks); reset_cylinders(&displayed_dive, true); return; } diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp index f0c15d486..fec7d02ed 100644 --- a/qt-ui/models.cpp +++ b/qt-ui/models.cpp @@ -367,7 +367,8 @@ void CylindersModel::copyFromDive(dive *d) return; rows = 0; for (int i = 0; i < MAX_CYLINDERS; i++) { - if (!cylinder_none(&d->cylinder[i]) && is_cylinder_used(d, i)) { + if (!cylinder_none(&d->cylinder[i]) && + (is_cylinder_used(d, i) || prefs.display_unused_tanks)) { rows = i + 1; } } |