Signed-off-by: Rick Walsh <[email protected]>
---
core/dive.c | 2 +-
core/dive.h | 2 +-
qt-models/cylindermodel.cpp | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/core/dive.c b/core/dive.c
index 8c74bc2..04cad24 100644
--- a/core/dive.c
+++ b/core/dive.c
@@ -3660,7 +3660,7 @@ fraction_t best_o2(depth_t depth, struct dive *dive)
}
//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;
int pnarcotic, ambient;
diff --git a/core/dive.h b/core/dive.h
index a0ae0a5..eaca666 100644
--- a/core/dive.h
+++ b/core/dive.h
@@ -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 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)
{
diff --git a/qt-models/cylindermodel.cpp b/qt-models/cylindermodel.cpp
index 3a8c433..9d85cb6 100644
--- a/qt-models/cylindermodel.cpp
+++ b/qt-models/cylindermodel.cpp
@@ -316,11 +316,11 @@ bool CylindersModel::setData(const QModelIndex &index,
const QVariant &value, in
if (QString::compare(vString.toUtf8().data(), "*") ==
0) {
cyl->bestmix_he = true;
// 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 {
cyl->bestmix_he = false;
// 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;
}
@@ -499,7 +499,7 @@ bool CylindersModel::updateBestMixes()
gasUpdated = true;
}
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
if (get_o2(&cyl->gasmix) + get_he(&cyl->gasmix) > 1000)
cyl->gasmix.o2.permille = 1000 -
get_he(&cyl->gasmix);
--
2.7.4
_______________________________________________
subsurface mailing list
[email protected]
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
