From e58f54cac1d050c090bfa5427991ae440bc78495 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Tue, 11 Feb 2014 13:08:29 -0800 Subject: Fix ATM-vs-bar confusion SAC should be calculated in relationship to surface pressure, not "1 bar". I also realize that we have a few other cases where we do the same mistake: the partial pressure calculations do things like po2 = o2 / 1000.0 * depth_to_mbar(sample->depth.mm, dive); which is wrong as well - the partial pressure is also relative to standard atmospheric pressures. Signed-off-by: Linus Torvalds Signed-off-by: Dirk Hohndel --- qt-ui/maintab.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'qt-ui') diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp index bdaddb827..85cf1b192 100644 --- a/qt-ui/maintab.cpp +++ b/qt-ui/maintab.cpp @@ -475,7 +475,7 @@ void MainTab::updateDiveInfo(int dive) 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); + sac.mliter = gases[0].mliter / (depth_to_atm(mean[0], d) * duration[0] / 60.0); SACs = get_volume_string(sac, true).append(tr("/min")); } else { SACs = QString(tr("unknown")); @@ -483,7 +483,7 @@ void MainTab::updateDiveInfo(int dive) 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); + sac.mliter = gases[i].mliter / (depth_to_atm(mean[i], d) * duration[i] / 60); SACs.append("\n" + get_volume_string(sac, true).append(tr("/min"))); } else { SACs.append("\n"); -- cgit v1.2.3-70-g09d2