diff options
| author |  Robert C. Helling <helling@atdotde.de> | 2019-11-28 10:37:44 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-11-28 12:23:04 -0800 |
| commit | 33e49637ec6a99c50ad56bfbfc88b4e925d01e7d (patch) | |
| tree | 6edb19775637bf5acf324f41aaaa0a794995812a /core | |
| parent | 4928c4ae0421193bbd371cb0924091a970489611 (diff) | |
| download | subsurface-33e49637ec6a99c50ad56bfbfc88b4e925d01e7d.tar.gz | |
Add current GF to infobox
As per request from users on scubaforum.com, this adds
the current gradient factor to the deco information of
the infobox. Up to now, this information was only
graphically represented in the pressure bar graph
and the heatmap. This gives a numerical value.
Signed-off-by: Robert C. Helling <helling@atdotde.de>
Diffstat (limited to 'core')
| -rw-r--r-- | core/profile.c | 10 | ||||
| -rw-r--r-- | core/profile.h | 1 |
2 files changed, 9 insertions, 2 deletions
diff --git a/core/profile.c b/core/profile.c index 1d3453a80..b79236151 100644 --- a/core/profile.c +++ b/core/profile.c @@ -1126,13 +1126,17 @@ void calculate_deco_information(struct deco_state *ds, const struct deco_state * } } entry->surface_gf = 0.0; + entry->current_gf = 0.0; for (j = 0; j < 16; j++) { double m_value = ds->buehlmann_inertgas_a[j] + entry->ambpressure / ds->buehlmann_inertgas_b[j]; double surface_m_value = ds->buehlmann_inertgas_a[j] + surface_pressure / ds->buehlmann_inertgas_b[j]; entry->ceilings[j] = deco_allowed_depth(ds->tolerated_by_tissue[j], surface_pressure, dive, 1); + double current_gf = (ds->tissue_inertgas_saturation[j] - entry->ambpressure) / (m_value - entry->ambpressure); entry->percentages[j] = ds->tissue_inertgas_saturation[j] < entry->ambpressure ? lrint(ds->tissue_inertgas_saturation[j] / entry->ambpressure * AMB_PERCENTAGE) : - lrint(AMB_PERCENTAGE + (ds->tissue_inertgas_saturation[j] - entry->ambpressure) / (m_value - entry->ambpressure) * (100.0 - AMB_PERCENTAGE)); + lrint(AMB_PERCENTAGE + current_gf * (100.0 - AMB_PERCENTAGE)); + if (current_gf > entry->current_gf) + entry->current_gf = current_gf; double surface_gf = 100.0 * (ds->tissue_inertgas_saturation[j] - surface_pressure) / (surface_m_value - surface_pressure); if (surface_gf > entry->surface_gf) entry->surface_gf = surface_gf; @@ -1552,7 +1556,9 @@ static void plot_string(struct plot_info *pi, int idx, struct membuffer *b) if (entry->rbt) put_format_loc(b, translate("gettextFromC", "RBT: %umin\n"), DIV_UP(entry->rbt, 60)); if (prefs.decoinfo) { - if (entry->surface_gf > 0) + if (entry->current_gf > 0.0) + put_format(b, translate("gettextFromC", "GF %d%%\n"), (int)(100.0 * entry->current_gf)); + if (entry->surface_gf > 0.0) put_format(b, translate("gettextFromC", "Surface GF %.0f%%\n"), entry->surface_gf); if (entry->ceiling) { depthvalue = get_depth_units(entry->ceiling, NULL, &depth_unit); diff --git a/core/profile.h b/core/profile.h index 953cfdcc8..c4f42fd24 100644 --- a/core/profile.h +++ b/core/profile.h @@ -75,6 +75,7 @@ struct plot_data { double ambpressure; double gfline; double surface_gf; + double current_gf; double density; bool icd_warning; }; |