diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-11-19 22:50:02 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-11-19 23:07:04 -0800 |
| commit | 0ca12c36011804eb4b2c3034269bab51ad04a500 (patch) | |
| tree | c65fa118622154f60572ed54674bebb16ff41b07 /qt-ui/maintab.cpp | |
| parent | 36cb50fb37f8cede4f334b268406ebd55c12ece6 (diff) | |
| download | subsurface-0ca12c36011804eb4b2c3034269bab51ad04a500.tar.gz | |
Collect per tank SAC rate
This is a bit painful, but we basically walk the samples and pick the
valid tank from the events. And then we do a simple discrete integration
to figure out the mean depth per tank and duration per tank. And then we
assemble all that into per tank statistics.
Strangely the value calculated here seems slightly higher than one would
expect from the overall SAC rate. This inconsistency should be
investigated a bit further, but my guess it it's based on the assumption
that the DC provided mean depth is possibly more accurate than what we can
calculate from the profile.
Fixes #284
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui/maintab.cpp')
| -rw-r--r-- | qt-ui/maintab.cpp | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp index 3398c6290..a56b2fc5d 100644 --- a/qt-ui/maintab.cpp +++ b/qt-ui/maintab.cpp @@ -353,8 +353,25 @@ void MainTab::updateDiveInfo(int dive) volume_t gases[MAX_CYLINDERS] = { 0 }; get_gas_used(d, gases); QString volumes = get_volume_string(gases[0], TRUE); - for(int i=1; i < MAX_CYLINDERS && gases[i].mliter != 0; i++) + int mean[MAX_CYLINDERS], duration[MAX_CYLINDERS]; + per_cylinder_mean_depth(d, select_dc(&d->dc), mean, duration); + volume_t sac; + QString SACs; + if (mean[0] && duration[0]) { + sac.mliter = gases[0].mliter * 1000.0 / (depth_to_mbar(mean[0], d) * duration[0] / 60.0); + SACs = get_volume_string(sac, TRUE).append(tr("/min")); + } else { + SACs = QString(tr("unknown")); + } + for(int i=1; i < MAX_CYLINDERS && gases[i].mliter != 0; i++) { volumes.append("\n" + get_volume_string(gases[i], TRUE)); + if (duration[i]) { + sac.mliter = gases[i].mliter * 1000.0 / (depth_to_mbar(mean[i], d) * duration[i] / 60); + SACs.append("\n" + get_volume_string(sac, TRUE).append(tr("/min"))); + } else { + SACs.append("\n"); + } + } ui.gasUsedText->setText(volumes); ui.oxygenHeliumText->setText(get_gaslist(d)); ui.dateText->setText(get_short_dive_date_string(d->when)); @@ -363,8 +380,8 @@ void MainTab::updateDiveInfo(int dive) ui.surfaceIntervalText->setText(get_time_string(d->when - (prevd->when + prevd->duration.seconds), 4)); else ui.surfaceIntervalText->clear(); - if ((sacVal.mliter = d->sac) > 0) - ui.sacText->setText(get_volume_string(sacVal, TRUE).append(tr("/min"))); + if (mean[0]) + ui.sacText->setText(SACs); else ui.sacText->clear(); if (d->surface_pressure.mbar) |