diff options
| -rw-r--r-- | core/gas.c | 2 | ||||
| -rw-r--r-- | core/statistics.c | 2 | ||||
| -rw-r--r-- | profile-widget/diveprofileitem.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/core/gas.c b/core/gas.c index 040f938f6..757f912b0 100644 --- a/core/gas.c +++ b/core/gas.c @@ -16,7 +16,7 @@ bool isobaric_counterdiffusion(struct gasmix oldgasmix, struct gasmix newgasmix, { if (!prefs.show_icd) return false; - results->dN2 = get_he(oldgasmix) + get_o2(oldgasmix) - get_he(newgasmix) - get_o2(newgasmix); + results->dN2 = get_n2(newgasmix) - get_n2(oldgasmix); results->dHe = get_he(newgasmix) - get_he(oldgasmix); return get_he(oldgasmix) > 0 && results->dN2 > 0 && results->dHe < 0 && get_he(oldgasmix) && results->dN2 > 0 && 5 * results->dN2 > -results->dHe; } diff --git a/core/statistics.c b/core/statistics.c index eeb45e1ae..8ebd4a4e0 100644 --- a/core/statistics.c +++ b/core/statistics.c @@ -397,7 +397,7 @@ static void get_gas_parts(struct gasmix mix, volume_t vol, int o2_in_topup, volu return; } - air.mliter = lrint(((double)vol.mliter * (1000 - get_he(mix) - get_o2(mix))) / (1000 - o2_in_topup)); + air.mliter = lrint(((double)vol.mliter * get_n2(mix)) / (1000 - o2_in_topup)); he->mliter = lrint(((double)vol.mliter * get_he(mix)) / 1000.0); o2->mliter += vol.mliter - he->mliter - air.mliter; } diff --git a/profile-widget/diveprofileitem.cpp b/profile-widget/diveprofileitem.cpp index efb2fceb7..a63b35863 100644 --- a/profile-widget/diveprofileitem.cpp +++ b/profile-widget/diveprofileitem.cpp @@ -415,7 +415,7 @@ void DivePercentageItem::paint(QPainter *painter, const QStyleOptionGraphicsItem const struct event *ev = NULL; int sec = dataModel->index(i, DivePlotDataModel::TIME).data().toInt(); gasmix = get_gasmix(&displayed_dive, displayed_dc, sec, &ev, gasmix); - int inert = 1000 - get_o2(gasmix); + int inert = get_n2(gasmix) + get_he(gasmix); mypen.setBrush(QBrush(ColorScale(value, inert))); painter->setPen(mypen); painter->drawLine(poly[i - 1], poly[i]); |