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

cylindermodel: remove in_planner() use

Browse source 
in_planner() is problematic, since it is uses desktop-only
application state. Since the cylinder-model already has
an appropriate inPlanner flag, use this instead.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-10-27 23:04:24 +01:00 • committed by Robert C. Helling
parent e47b812fd0
commit b36178a00a
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/dive.c
View file

@ -3118,10 +3118,10 @@ void split_divecomputer(const struct dive *src, int num, struct dive **out1, str
}
//Calculate O2 in best mix
fraction_t best_o2(depth_t depth, const struct dive *dive)
fraction_t best_o2(depth_t depth, const struct dive *dive, bool in_planner)
{
fraction_t fo2;
int po2 = in_planner() ? prefs.bottompo2 : prefs.modpO2 * 1000;
int po2 = in_planner ? prefs.bottompo2 : prefs.modpO2 * 1000;
fo2.permille = (po2 * 100 / depth_to_mbar(depth.mm, dive)) * 10; //use integer arithmetic to round down to nearest percent
// Don't permit >100% O2

2
core/dive.h
View file

@ -95,7 +95,7 @@ struct dive_components {
extern bool has_gaschange_event(const struct dive *dive, const struct divecomputer *dc, int idx);
extern int explicit_first_cylinder(const struct dive *dive, const struct divecomputer *dc);
extern fraction_t best_o2(depth_t depth, const struct dive *dive);
extern fraction_t best_o2(depth_t depth, const struct dive *dive, bool in_planner);
extern fraction_t best_he(depth_t depth, const struct dive *dive, bool o2narcotic, fraction_t fo2);
extern int get_surface_pressure_in_mbar(const struct dive *dive, bool non_null);