diff options
| author |  Robert C. Helling <helling@atdotde.de> | 2014-09-15 14:55:20 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2014-09-18 06:20:25 -0700 |
| commit | d6abb739d927285b55964f0644ee059be5f7db0b (patch) | |
| tree | a9f68411ee735e2f03d8227eeb768e7cafdacbab /qt-ui | |
| parent | ae6b0468b16200dcc01f8e1cfd43260b63e830dc (diff) | |
| download | subsurface-d6abb739d927285b55964f0644ee059be5f7db0b.tar.gz | |
Helper function for partial pressure calculation
This patch introduces a new structure holding partial pressures (doubles in bar) for
all three gases and a helper function to compute them from gasmix (which holds fractions)
and ambient pressure. Currentlty this works for OC and CCR, to be extended later to PSCR.
Currently the dive_comp_type argument is unused.
Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui')
| -rw-r--r-- | qt-ui/profile/diveplotdatamodel.cpp | 16 | ||||
| -rw-r--r-- | qt-ui/profile/diveprofileitem.cpp | 2 | ||||
| -rw-r--r-- | qt-ui/profile/divetooltipitem.cpp | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/qt-ui/profile/diveplotdatamodel.cpp b/qt-ui/profile/diveplotdatamodel.cpp index 4172d0bae..993c09045 100644 --- a/qt-ui/profile/diveplotdatamodel.cpp +++ b/qt-ui/profile/diveplotdatamodel.cpp @@ -47,11 +47,11 @@ QVariant DivePlotDataModel::data(const QModelIndex &index, int role) const case SAC: return item.sac; case PN2: - return item.pn2; + return item.pressures.n2; case PHE: - return item.phe; + return item.pressures.he; case PO2: - return item.po2; + return item.pressures.o2; case HEARTBEAT: return item.heartbeat; } @@ -156,15 +156,15 @@ unsigned int DivePlotDataModel::dcShown() const { \ double ret = -1; \ for (int i = 0, count = rowCount(); i < count; i++) { \ - if (pInfo.entry[i].GAS > ret) \ - ret = pInfo.entry[i].GAS; \ + if (pInfo.entry[i].pressures.GAS > ret) \ + ret = pInfo.entry[i].pressures.GAS; \ } \ return ret; \ } -MAX_PPGAS_FUNC(phe, pheMax); -MAX_PPGAS_FUNC(pn2, pn2Max); -MAX_PPGAS_FUNC(po2, po2Max); +MAX_PPGAS_FUNC(he, pheMax); +MAX_PPGAS_FUNC(n2, pn2Max); +MAX_PPGAS_FUNC(o2, po2Max); void DivePlotDataModel::emitDataChanged() { diff --git a/qt-ui/profile/diveprofileitem.cpp b/qt-ui/profile/diveprofileitem.cpp index c5321d770..9ff30ff32 100644 --- a/qt-ui/profile/diveprofileitem.cpp +++ b/qt-ui/profile/diveprofileitem.cpp @@ -5,8 +5,8 @@ #include "divetextitem.h" #include "profilewidget2.h" #include "animationfunctions.h" -#include "profile.h" #include "dive.h" +#include "profile.h" #include "preferences.h" #include "helpers.h" #include "diveplanner.h" diff --git a/qt-ui/profile/divetooltipitem.cpp b/qt-ui/profile/divetooltipitem.cpp index 40c556cc6..9ee44e4b6 100644 --- a/qt-ui/profile/divetooltipitem.cpp +++ b/qt-ui/profile/divetooltipitem.cpp @@ -1,8 +1,8 @@ #include "divetooltipitem.h" #include "divecartesianaxis.h" #include "profilewidget2.h" -#include "profile.h" #include "dive.h" +#include "profile.h" #include "membuffer.h" #include <QPropertyAnimation> #include <QGraphicsSceneMouseEvent> |