From 4d9c30d42450077ac569c9e9e4d8690a2d38ff68 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Tue, 28 Oct 2014 16:27:10 -0700 Subject: Explicit first gas only on first sample Instead of the 30 second heuristic we only assume that this is an explicit first gas if the event coincides the first sample. Signed-off-by: Dirk Hohndel --- qt-ui/profile/diveeventitem.cpp | 2 +- statistics.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qt-ui/profile/diveeventitem.cpp b/qt-ui/profile/diveeventitem.cpp index bd9735a96..cceaaa5e7 100644 --- a/qt-ui/profile/diveeventitem.cpp +++ b/qt-ui/profile/diveeventitem.cpp @@ -131,7 +131,7 @@ bool DiveEventItem::shouldBeHidden() * Don't bother showing those */ struct sample *first_sample = &get_dive_dc(&displayed_dive, dc_number)->sample[0]; - if (!strcmp(event->name, "gaschange") && (event->time.seconds < 30 || event->time.seconds == first_sample->time.seconds)) + if (!strcmp(event->name, "gaschange") && event->time.seconds == first_sample->time.seconds) return true; for (int i = 0; i < evn_used; i++) { diff --git a/statistics.c b/statistics.c index d78e4a862..4023cdc85 100644 --- a/statistics.c +++ b/statistics.c @@ -302,7 +302,7 @@ bool is_cylinder_used(struct dive *dive, int idx) for_each_dc(dive, dc) { struct event *event = get_next_event(dc->events, "gaschange"); while (event) { - if (event->time.seconds < 30 || event->time.seconds == dc->sample[0].time.seconds) + if (event->time.seconds == dc->sample[0].time.seconds) firstGasExplicit = true; if (get_cylinder_index(dive, event) == idx) return true; -- cgit v1.2.3-70-g09d2