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

Fix build after merges

Browse source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2017-03-11 08:38:24 -08:00
parent 8761247722
commit b8b858a9d2
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/planner.c
View file

@ -648,7 +648,7 @@ static void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive, bool
} else { } else {
secondlastdecostop = decostoplevels_imperial[2]; secondlastdecostop = decostoplevels_imperial[2];
} }
if (dp->entered && !nextdp->entered && dp->depth > secondlastdecostop) if (dp->entered && !nextdp->entered && dp->depth.mm > secondlastdecostop)
lastbottomdp = dp; lastbottomdp = dp;
len = strlen(buffer); len = strlen(buffer);
@ -900,7 +900,7 @@ static void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive, bool
/* Calculate minimum gas volume. */ /* Calculate minimum gas volume. */
volume_t mingasv; volume_t mingasv;
mingasv.mliter = prefs.problemsolvingtime * prefs.bottomsac * prefs.sacfactor / 100.0 mingasv.mliter = prefs.problemsolvingtime * prefs.bottomsac * prefs.sacfactor / 100.0
* depth_to_bar(lastbottomdp->depth, dive) * depth_to_bar(lastbottomdp->depth.mm, dive)
+ cyl->deco_gas_used.mliter * prefs.sacfactor / 100.0; + cyl->deco_gas_used.mliter * prefs.sacfactor / 100.0;
/* Calculate minimum gas pressure for cyclinder. */ /* Calculate minimum gas pressure for cyclinder. */
pressure_t mingasp; pressure_t mingasp;
@ -909,7 +909,7 @@ static void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive, bool
/* Translate all results into correct units */ /* Translate all results into correct units */
mingas_volume = get_volume_units(mingasv.mliter, NULL, &unit); mingas_volume = get_volume_units(mingasv.mliter, NULL, &unit);
mingas_pressure = get_pressure_units(mingasp.mbar, &pressure_unit); mingas_pressure = get_pressure_units(mingasp.mbar, &pressure_unit);
mingas_depth = get_depth_units(lastbottomdp->depth, NULL, &depth_unit); mingas_depth = get_depth_units(lastbottomdp->depth.mm, NULL, &depth_unit);
/* Print it to results */ /* Print it to results */
if (cyl->start.mbar > mingasp.mbar) snprintf(mingas, sizeof(mingas), if (cyl->start.mbar > mingasp.mbar) snprintf(mingas, sizeof(mingas),
translate("gettextFromC", "<br>&nbsp;&mdash; <span style='color: green;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s"), translate("gettextFromC", "<br>&nbsp;&mdash; <span style='color: green;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s"),