summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2014-10-28 16:27:10 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2014-10-28 16:27:10 -0700
commit4d9c30d42450077ac569c9e9e4d8690a2d38ff68 (patch)
tree8c1d624cd62c036c5a0ba4d4219a635b4ec8ee4d
parent1899d99d1cf7d6c1807912d6156d456436a87763 (diff)
downloadsubsurface-4d9c30d42450077ac569c9e9e4d8690a2d38ff68.tar.gz
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 <dirk@hohndel.org>
-rw-r--r--qt-ui/profile/diveeventitem.cpp2
-rw-r--r--statistics.c2
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;