From 1f1dcecc02a5c33c81d41a8a7c6aa2b9cc6b6da5 Mon Sep 17 00:00:00 2001 From: "Robert C. Helling" Date: Tue, 3 Jun 2014 13:00:51 +0200 Subject: Planner: Show waypoints for gas changes but no double depths Signed-off-by: Robert C. Helling Signed-off-by: Dirk Hohndel --- planner.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'planner.c') diff --git a/planner.c b/planner.c index d96162087..2347e22ed 100644 --- a/planner.c +++ b/planner.c @@ -561,13 +561,15 @@ static void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive, bool dp->depth != lastdepth && nextdp->depth != dp->depth) continue; + if (dp->time - lasttime < 10 && !(gaschange && dp->next && dp->depth != dp->next->depth)) + continue; gasidx = get_gasidx(dive, &gasmix); len = strlen(buffer); if (nextdp && gasmix_distance(&gasmix, &newgasmix)) gaschange = true; if (plan_verbatim) { if (dp->depth != lastdepth) { - if (plan_display_transitions || dp->entered || !dp->next) + if (plan_display_transitions || dp->entered || !dp->next || (gaschange && dp->next && dp->depth != dp->next->depth)) len += snprintf(buffer + len, sizeof(buffer) - len, translate("gettextFromC", "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
"), decimals, depthvalue, depth_unit, FRACTION(dp->time - lasttime, 60), @@ -581,7 +583,7 @@ static void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive, bool gasname(&gasmix)); } } else { - if (dp->depth == lastdepth || plan_display_transitions || dp->entered || !dp->next) { + if (dp->depth == lastdepth || plan_display_transitions || dp->entered || !dp->next || (gaschange && dp->next && dp->depth != dp->next->depth)) { len += snprintf(buffer + len, sizeof(buffer) - len, translate("gettextFromC", "%3.0f%s"), depthvalue, depth_unit); if (plan_display_runtime) len += snprintf(buffer + len, sizeof(buffer) - len, translate("gettextFromC", " %3dmin "), (dp->time + 30) / 60); -- cgit v1.2.3-70-g09d2