From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 9 Nov 2011 16:06:17 +0000 (-0800)
Subject: Fix up the statistics page use of pressure data
X-Git-Url: http://git.tdb.fi/?p=ext%2Fsubsurface.git;a=commitdiff_plain;h=66c04f4f47f1f8fc55b3cc81df67acac1aa72b8f

Fix up the statistics page use of pressure data

The statistics page calculates air use separately, and also needs to be
fixed up for the split of the pressures into sample-vs-start/end.

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

diff --git a/statistics.c b/statistics.c
index ee3a5b2..4c63794 100644
--- a/statistics.c
+++ b/statistics.c
@@ -165,11 +165,14 @@ void show_dive_stats(struct dive *dive)
 	/* for the O2/He readings just create a list of them */
 	for (idx = 0; idx < MAX_CYLINDERS; idx++) {
 		cylinder_t *cyl = &dive->cylinder[idx];
+		unsigned int start, end;
+
+		start = cyl->start.mbar ? : cyl->sample_start.mbar;
+		end = cyl->end.mbar ? : cyl->sample_end.mbar;
 		/* we assume that every valid cylinder has either a working pressure
 		 * or a size; but for good measure let's also accept cylinders with
 		 * a starting or ending pressure*/
-		if (cyl->type.workingpressure.mbar || cyl->type.size.mliter ||
-			cyl->start.mbar || cyl->end.mbar) {
+		if (cyl->type.workingpressure.mbar || cyl->type.size.mliter || start || end) {
 			/* 0% O2 strangely means air, so 21% - I don't like that at all */
 			int o2 = cyl->gasmix.o2.permille ? : 209;
 			if (offset > 0) {
@@ -182,9 +185,8 @@ void show_dive_stats(struct dive *dive)
 		}
 		/* and if we have size, start and end pressure, we can
 		 * calculate the total gas used */
-		if (cyl->type.size.mliter && cyl->start.mbar &&	cyl->end.mbar)
-			gas_used += cyl->type.size.mliter / 1000.0 *
-				(cyl->start.mbar - cyl->end.mbar);
+		if (cyl->type.size.mliter && start && end)
+			gas_used += cyl->type.size.mliter / 1000.0 * (start - end);
 	}
 	set_label(info_stat_w.o2he, buf);
 	if (gas_used) {