mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use get_n2 helper function

Browse source 
Now, that we have this helper function that should have been
introduced long ago, we can make some more expressions
more idiomatic.

Signed-off-by: Robert C. Helling <helling@atdotde.de>
This commit is contained in:
Robert C. Helling 2020-10-04 12:18:43 +02:00 • committed by bstoeger
parent 61f8b8c002
commit 4b4a117f96
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/gas.c
View file

@ -16,7 +16,7 @@ bool isobaric_counterdiffusion(struct gasmix oldgasmix, struct gasmix newgasmix,
{ {
if (!prefs.show_icd) if (!prefs.show_icd)
return false; 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); 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; return get_he(oldgasmix) > 0 && results->dN2 > 0 && results->dHe < 0 && get_he(oldgasmix) && results->dN2 > 0 && 5 * results->dN2 > -results->dHe;
} }

2
core/statistics.c
View file

@ -397,7 +397,7 @@ static void get_gas_parts(struct gasmix mix, volume_t vol, int o2_in_topup, volu
return; 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); he->mliter = lrint(((double)vol.mliter * get_he(mix)) / 1000.0);
o2->mliter += vol.mliter - he->mliter - air.mliter; o2->mliter += vol.mliter - he->mliter - air.mliter;
} }

2
profile-widget/diveprofileitem.cpp
View file

@ -415,7 +415,7 @@ void DivePercentageItem::paint(QPainter *painter, const QStyleOptionGraphicsItem
const struct event *ev = NULL; const struct event *ev = NULL;
int sec = dataModel->index(i, DivePlotDataModel::TIME).data().toInt(); int sec = dataModel->index(i, DivePlotDataModel::TIME).data().toInt();
gasmix = get_gasmix(&displayed_dive, displayed_dc, sec, &ev, gasmix); 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))); mypen.setBrush(QBrush(ColorScale(value, inert)));
painter->setPen(mypen); painter->setPen(mypen);
painter->drawLine(poly[i - 1], poly[i]); painter->drawLine(poly[i - 1], poly[i]);