From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 20 Nov 2011 18:27:19 +0000 (-0800)
Subject: Revert "Correctly plot the tank end pressure if it was set manually"
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=bb421a416dd894979e2335efea8db06b681f0dc8;hp=e8230c9d13afc84e88207ab6fde3190f0bd25fd0;p=ext%2Fsubsurface.git

Revert "Correctly plot the tank end pressure if it was set manually"

This reverts commit abdee5b1b8a97c641bca9bc2ebac9555c3e2ea54.

There's no point in doing random hacks.  Instead, do the intermediate
pressure calculations with proper rounding instead of always truncating
to mbar.  With the math done correctly we have enough precision that the
end result of the pressure interpolation doesn't have the kind of errors
that caused Dirk to try to fix things up later.

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

diff --git a/profile.c b/profile.c
index 47e12ba..5485ffd 100644
--- a/profile.c
+++ b/profile.c
@@ -714,7 +714,7 @@ static void plot_pressure_value(struct graphics_context *gc, int mbar, int sec,
 	plot_text(gc, &tro, sec, mbar, "%d %s", pressure, unit);
 }
 
-static void plot_cylinder_pressure_text(struct graphics_context *gc, struct plot_info *pi, struct dive *dive)
+static void plot_cylinder_pressure_text(struct graphics_context *gc, struct plot_info *pi)
 {
 	int i;
 	int mbar, cyl;
@@ -760,10 +760,7 @@ static void plot_cylinder_pressure_text(struct graphics_context *gc, struct plot
 
 	for (cyl = 0; cyl < MAX_CYLINDERS; cyl++) {
 		if (last_time[cyl]) {
-			if (dive->cylinder[cyl].end.mbar)
-				plot_pressure_value(gc, dive->cylinder[cyl].end.mbar, last_time[cyl], CENTER, TOP);
-			else
-				plot_pressure_value(gc, last_pressure[cyl], last_time[cyl], CENTER, TOP);
+			plot_pressure_value(gc, last_pressure[cyl], last_time[cyl], CENTER, TOP);
 		}
 	}
 }
@@ -1327,7 +1324,7 @@ void plot(struct graphics_context *gc, cairo_rectangle_int_t *drawing_area, stru
 	/* Text on top of all graphs.. */
 	plot_temperature_text(gc, pi);
 	plot_depth_text(gc, pi);
-	plot_cylinder_pressure_text(gc, pi, dive);
+	plot_cylinder_pressure_text(gc, pi);
 
 	/* Bounding box last */
 	gc->leftx = 0; gc->rightx = 1.0;