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

Fixup: don't capitalise best_He

Browse source 
Signed-off-by: Rick Walsh <rickmwalsh@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Rick Walsh 2016-07-06 22:40:36 +10:00 • committed by Dirk Hohndel
parent f08b0e0e3e
commit ffca5674bf
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/dive.c
View file

@ -3660,7 +3660,7 @@ fraction_t best_o2(depth_t depth, struct dive *dive)
} }
//Calculate He in best mix. O2 is considered narcopic //Calculate He in best mix. O2 is considered narcopic
fraction_t best_He(depth_t depth, struct dive *dive) fraction_t best_he(depth_t depth, struct dive *dive)
{ {
fraction_t fhe; fraction_t fhe;
int pnarcotic, ambient; int pnarcotic, ambient;

2
core/dive.h
View file

@ -405,7 +405,7 @@ extern int explicit_first_cylinder(struct dive *dive, struct divecomputer *dc);
extern int get_depth_at_time(struct divecomputer *dc, unsigned int time); extern int get_depth_at_time(struct divecomputer *dc, unsigned int time);
extern fraction_t best_o2(depth_t depth, struct dive *dive); extern fraction_t best_o2(depth_t depth, struct dive *dive);
extern fraction_t best_He(depth_t depth, struct dive *dive); extern fraction_t best_he(depth_t depth, struct dive *dive);
static inline int get_surface_pressure_in_mbar(const struct dive *dive, bool non_null) static inline int get_surface_pressure_in_mbar(const struct dive *dive, bool non_null)
{ {

6
qt-models/cylindermodel.cpp
View file

@ -316,11 +316,11 @@ bool CylindersModel::setData(const QModelIndex &index, const QVariant &value, in
if (QString::compare(vString.toUtf8().data(), "*") == 0) { if (QString::compare(vString.toUtf8().data(), "*") == 0) {
cyl->bestmix_he = true; cyl->bestmix_he = true;
// Calculate fO2 for max depth // Calculate fO2 for max depth
cyl->gasmix.he = best_He(displayed_dive.maxdepth, &displayed_dive); cyl->gasmix.he = best_he(displayed_dive.maxdepth, &displayed_dive);
} else { } else {
cyl->bestmix_he = false; cyl->bestmix_he = false;
// Calculate fHe for input depth // Calculate fHe for input depth
cyl->gasmix.he = best_He(string_to_depth(vString.toUtf8().data()), &displayed_dive); cyl->gasmix.he = best_he(string_to_depth(vString.toUtf8().data()), &displayed_dive);
} }
changed = true; changed = true;
} }
@ -499,7 +499,7 @@ bool CylindersModel::updateBestMixes()
gasUpdated = true; gasUpdated = true;
} }
if (cyl->bestmix_he) { if (cyl->bestmix_he) {
cyl->gasmix.he = best_He(displayed_dive.maxdepth, &displayed_dive); cyl->gasmix.he = best_he(displayed_dive.maxdepth, &displayed_dive);
// fO2 + fHe must not be greater than 1 // fO2 + fHe must not be greater than 1
if (get_o2(&cyl->gasmix) + get_he(&cyl->gasmix) > 1000) if (get_o2(&cyl->gasmix) + get_he(&cyl->gasmix) > 1000)
cyl->gasmix.o2.permille = 1000 - get_he(&cyl->gasmix); cyl->gasmix.o2.permille = 1000 - get_he(&cyl->gasmix);