diff options
| author |  Rick Walsh <rickmwalsh@gmail.com> | 2016-07-19 18:47:32 +1000 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2016-07-23 10:54:51 +0900 |
| commit | b78e6525eb589c6bd654f1a9f01674fea94a9985 (patch) | |
| tree | ce8dae1590e077afe84b457ed3021840256b48bc /qt-models/diveplannermodel.cpp | |
| parent | 8b35defa48514e2695d1fc8a26aee0a30d2dd1b9 (diff) | |
| download | subsurface-b78e6525eb589c6bd654f1a9f01674fea94a9985.tar.gz | |
Remove unnecessary DivePlannerPointsModel functions and variables
Commit b1ed04a means that DivePlannerPointsModel::rememberTanks() and related
functions and variables are no longer required
Signed-off-by: Rick Walsh <rickmwalsh@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-models/diveplannermodel.cpp')
| -rw-r--r-- | qt-models/diveplannermodel.cpp | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/qt-models/diveplannermodel.cpp b/qt-models/diveplannermodel.cpp index 69706c88f..03cc90e06 100644 --- a/qt-models/diveplannermodel.cpp +++ b/qt-models/diveplannermodel.cpp @@ -551,43 +551,6 @@ bool divePointsLessThan(const divedatapoint &p1, const divedatapoint &p2) return p1.time <= p2.time; } -bool DivePlannerPointsModel::addGas(struct gasmix mix) -{ - sanitize_gasmix(&mix); - - for (int i = 0; i < MAX_CYLINDERS; i++) { - cylinder_t *cyl = &displayed_dive.cylinder[i]; - if (cylinder_nodata(cyl)) { - fill_default_cylinder(cyl); - cyl->gasmix = mix; - /* The depth to change to that gas is given by the depth where its pO₂ is 1.6 bar. - * The user should be able to change this depth manually. */ - pressure_t modpO2; - if (displayed_dive.dc.divemode == PSCR) - modpO2.mbar = prefs.decopo2 + (1000 - get_o2(&mix)) * SURFACE_PRESSURE * - prefs.o2consumption / prefs.decosac / prefs.pscr_ratio; - else - modpO2.mbar = prefs.decopo2; - cyl->depth = gas_mod(&mix, modpO2, &displayed_dive, M_OR_FT(3,10)); - - - - - // FIXME -- need to get rid of stagingDIve - // the following now uses displayed_dive !!!! - - - - CylindersModel::instance()->updateDive(); - return true; - } - if (!gasmix_distance(&cyl->gasmix, &mix)) - return true; - } - qDebug("too many gases"); - return false; -} - int DivePlannerPointsModel::lastEnteredPoint() { for (int i = divepoints.count() - 1; i >= 0; i--) @@ -756,21 +719,6 @@ DivePlannerPointsModel::Mode DivePlannerPointsModel::currentMode() const return mode; } -QVector<QPair<int, int> > DivePlannerPointsModel::collectGases(struct dive *d) -{ - QVector<QPair<int, int> > l; - for (int i = 0; i < MAX_CYLINDERS; i++) { - cylinder_t *cyl = &d->cylinder[i]; - if (!cylinder_nodata(cyl)) - l.push_back(qMakePair(get_o2(&cyl->gasmix), get_he(&cyl->gasmix))); - } - return l; -} -void DivePlannerPointsModel::rememberTanks() -{ - oldGases = collectGases(&displayed_dive); -} - bool DivePlannerPointsModel::tankInUse(int cylinderid) { for (int j = 0; j < rowCount(); j++) { |