From cb1b6a3d302070febf09d8963585ac445d3277f4 Mon Sep 17 00:00:00 2001 From: Rick Walsh Date: Tue, 23 Jun 2015 23:20:30 +1000 Subject: Define gaschange_before and gaschange_after a few lines earlier This is required so they work in the test for /* do we want to skip this leg as it is devoid of anything useful? */ We were already trying to use gaschange_after (and previously gaschange), but it was duplicating an existing condition (now removed). Signed-off-by: Rick Walsh Signed-off-by: Dirk Hohndel --- planner.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/planner.c b/planner.c index fc4275b4b..7ed2cf71c 100644 --- a/planner.c +++ b/planner.c @@ -581,21 +581,20 @@ static void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive, bool nextdp = nextdp->next; if (nextdp) newgasmix = nextdp->gasmix; + gaschange_after = (nextdp && (gasmix_distance(&gasmix, &newgasmix) || dp->setpoint != nextdp->setpoint)); + gaschange_before = (gasmix_distance(&lastprintgasmix, &gasmix) || lastprintsetpoint != dp->setpoint); /* do we want to skip this leg as it is devoid of anything useful? */ if (!dp->entered && - gasmix_distance(&gasmix, &newgasmix) == 0 && nextdp && - dp->setpoint == nextdp->setpoint && dp->depth != lastdepth && - nextdp->depth != dp->depth - && !gaschange_after) + nextdp->depth != dp->depth && + !gaschange_before && + !gaschange_after) continue; if (dp->time - lasttime < 10 && !(gaschange_after && dp->next && dp->depth != dp->next->depth)) continue; len = strlen(buffer); - gaschange_after = (nextdp && (gasmix_distance(&gasmix, &newgasmix) || dp->setpoint != nextdp->setpoint)); - gaschange_before = (gasmix_distance(&lastprintgasmix, &gasmix) || lastprintsetpoint != dp->setpoint); if (plan_verbatim) { if (dp->depth != lastprintdepth) { if (plan_display_transitions || dp->entered || !dp->next || (gaschange_after && dp->next && dp->depth != nextdp->depth)) { -- cgit v1.2.3-70-g09d2