mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
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>
This commit is contained in:
parent
ae6b0468b1
commit
d6abb739d9
8 changed files with 61 additions and 60 deletions
|
@ -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()
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue