[PATCH v2 2/2] Only calculate with he when he is present in event
Anton Lundin
glance at acc.umu.se
Wed Sep 18 00:06:38 UTC 2013
Old gasswitch events only contains O2, so don't look at he part when
the event doesn't contain a He part.
Signed-off-by: Anton Lundin <glance at acc.umu.se>
---
profile.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/profile.c b/profile.c
index eb6be2c..5c947fb 100644
--- a/profile.c
+++ b/profile.c
@@ -646,7 +646,14 @@ static int get_cylinder_index(struct dive *dive, struct event *ev)
delta_o2 = get_o2(&cyl->gasmix) - target_o2;
delta_he = get_he(&cyl->gasmix) - target_he;
- distance = delta_o2 * delta_o2 + delta_he * delta_he;
+ distance = delta_o2 * delta_o2;
+
+ /* Check the event type to figure out if we should care about the he part.
+ * 11 is SAMPLE_EVENT_GASCHANGE, aka without he
+ * 25 is SAMPLE_EVENT_GASCHANGE2, aka with he
+ */
+ if (ev->type == 25)
+ distance += delta_he * delta_he;
if (distance >= score)
continue;
score = distance;
--
1.8.1.2
More information about the subsurface
mailing list