diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-02-03 07:31:03 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-02-03 07:31:03 -0800 |
| commit | 08c42813e5d3af8ca702be4333daf46cc14c1d39 (patch) | |
| tree | e75edfe480b20bd743887e1d868024624a2d5163 /core/statistics.c | |
| parent | 414d7f2632273420aea8e6cb5291a40ea2111d13 (diff) | |
| download | subsurface-08c42813e5d3af8ca702be4333daf46cc14c1d39.tar.gz | |
Revert "In statistics, ignore gas use of planned dives"
This reverts commit 1d8662006cbb5edae941315e30ede381c23a817b.
Mistakenly pushed to master
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'core/statistics.c')
| -rw-r--r-- | core/statistics.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/core/statistics.c b/core/statistics.c index 6a0ff9f94..62a4d737f 100644 --- a/core/statistics.c +++ b/core/statistics.c @@ -326,18 +326,16 @@ void get_selected_dives_text(char *buffer, size_t size) #define SOME_GAS 5000 // 5bar drop in cylinder pressure makes cylinder used -bool is_cylinder_used(struct dive *dive, int idx, bool ignore_plannned) +bool is_cylinder_used(struct dive *dive, int idx) { struct divecomputer *dc; bool firstGasExplicit = false; if (cylinder_none(&dive->cylinder[idx])) return false; - if ((dive->cylinder[idx].start.mbar - dive->cylinder[idx].end.mbar) > SOME_GAS && !ignore_plannned) + if ((dive->cylinder[idx].start.mbar - dive->cylinder[idx].end.mbar) > SOME_GAS) return true; for_each_dc(dive, dc) { - if (ignore_plannned && !strcmp(dc->model, "planned dive")) - continue; struct event *event = get_next_event(dc->events, "gaschange"); while (event) { if (dc->sample && (event->time.seconds == 0 || @@ -362,7 +360,7 @@ void get_gas_used(struct dive *dive, volume_t gases[MAX_CYLINDERS]) cylinder_t *cyl = &dive->cylinder[idx]; pressure_t start, end; - if (!is_cylinder_used(dive, idx, true)) + if (!is_cylinder_used(dive, idx)) continue; start = cyl->start.mbar ? cyl->start : cyl->sample_start; |