diff options
| author |  Robert C. Helling <helling@atdotde.de> | 2014-11-17 17:39:40 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2014-11-17 18:02:42 +0000 |
| commit | d5d7fdc9af98756cd8b241502f6493c518d6fa0f (patch) | |
| tree | d5d6695cbeea4ae2a311f57803c19a59c72442fc /qt-ui/diveplanner.cpp | |
| parent | 992e58eaf255973bcaeda1572c9bb86d16ed4adf (diff) | |
| download | subsurface-d5d7fdc9af98756cd8b241502f6493c518d6fa0f.tar.gz | |
For CCR dives, show plot for diluent and O2 cylinder pressures
Also fixes a bug in the diluent pressure interpolation
Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui/diveplanner.cpp')
| -rw-r--r-- | qt-ui/diveplanner.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp index b8d251c2c..84dec0c9a 100644 --- a/qt-ui/diveplanner.cpp +++ b/qt-ui/diveplanner.cpp @@ -36,7 +36,7 @@ QString gasToStr(struct gasmix gas) { uint o2 = (get_o2(&gas) + 5) / 10, he = (get_he(&gas) + 5) / 10; - QString result = gasmix_is_air(&gas) ? QObject::tr("AIR") : he == 0 ? QString("EAN%1").arg(o2, 2, 10, QChar('0')) : QString("%1/%2").arg(o2).arg(he); + QString result = gasmix_is_air(&gas) ? QObject::tr("AIR") : he == 0 ? (o2 == 100 ? QObject::tr("OXYGEN") : QString("EAN%1").arg(o2, 2, 10, QChar('0'))) : QString("%1/%2").arg(o2).arg(he); return result; } |