From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 23 Oct 2011 14:52:45 +0000 (+0300)
Subject: Handle 'gas change' events correctly
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=2b4fa480ae57766889c5a20ff1cb59427469d401;hp=-c;p=ext%2Fsubsurface.git

Handle 'gas change' events correctly

Dirk wrote the multi-cylinder support assuming that the dive computer
always gives the selected cylinder index in the sample data - that's
what his Uemis does, and it makes sense for any dive computer that
supports multiple pressure transmitters.

However, the other case is a dive computer where the pressure samples
are all from cylinder 0, and any other cylinder will have the starting
and ending pressure set by hand.  And the gas change events show when
the cylinder change happened.

So this creates a "turn gas change events into pressure sample fixups"
phase just before we actually analyze the pressures.  That way the
pressure analysis can alway sdo the right thing, regardless of how the
data was originally stores in the dive.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

2b4fa480ae57766889c5a20ff1cb59427469d401
diff --git a/profile.c b/profile.c
index bdce426..78643cd 100644
--- a/profile.c
+++ b/profile.c
@@ -860,6 +860,68 @@ static void fill_missing_tank_pressures(struct dive *dive, struct plot_info *pi,
 	}
 }
 
+static int get_cylinder_index(struct dive *dive, struct event *ev)
+{
+	int i;
+
+	/*
+	 * Try to find a cylinder that matches the O2 percentage
+	 * in the gas change event 'value' field.
+	 *
+	 * Crazy suunto gas change events. We really should do
+	 * this in libdivecomputer or something.
+	 */
+	for (i = 0; i < MAX_CYLINDERS; i++) {
+		cylinder_t *cyl = dive->cylinder+i;
+		int o2 = (cyl->gasmix.o2.permille + 5) / 10;
+		if (o2 == ev->value)
+			return i;
+	}
+
+	return 0;
+}
+
+static struct event *get_next_gaschange(struct event *event)
+{
+	while (event) {
+		if (!strcmp(event->name, "gaschange"))
+			return event;
+		event = event->next;
+	}
+	return event;
+}
+
+static int set_cylinder_index(struct plot_info *pi, int i, int cylinderindex, unsigned int end)
+{
+	while (i < pi->nr) {
+		struct plot_data *entry = pi->entry+i;
+		if (entry->sec > end)
+			break;
+		if (entry->cylinderindex != cylinderindex) {
+			entry->cylinderindex = cylinderindex;
+			entry->pressure[0] = 0;
+		}
+		i++;
+	}
+	return i;
+}
+
+static void check_gas_change_events(struct dive *dive, struct plot_info *pi)
+{
+	int i = 0, cylinderindex = 0;
+	struct event *ev = get_next_gaschange(dive->events);
+
+	if (!ev)
+		return;
+
+	do {
+		i = set_cylinder_index(pi, i, cylinderindex, ev->time.seconds);
+		cylinderindex = get_cylinder_index(dive, ev);
+		ev = get_next_gaschange(ev->next);
+	} while (ev);
+	set_cylinder_index(pi, i, cylinderindex, ~0u);
+}
+
 /*
  * Create a plot-info with smoothing and ranged min/max
  *
@@ -906,6 +968,8 @@ static struct plot_info *create_plot_info(struct dive *dive)
 			pi->maxdepth = depth;
 	}
 
+	check_gas_change_events(dive, pi);
+
 	for (cyl = 0; cyl < MAX_CYLINDERS; cyl++) /* initialize the start pressures */
 		track_pr[cyl] = pr_track_alloc(dive->cylinder[cyl].start.mbar, -1);
 	current = track_pr[dive->sample[0].cylinderindex];