From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 19 Nov 2011 20:59:48 +0000 (-0800)
Subject: Merge branch 'sacplot' of git://git.hohndel.org/subsurface
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=2d26dbc9f7d6affc50de2e1013de4589034e55e0;hp=25e18211ec99ff15c26315eff87fc31816ce8f33;p=ext%2Fsubsurface.git

Merge branch 'sacplot' of git://git.hohndel.org/subsurface

* 'sacplot' of git://git.hohndel.org/subsurface:
  Correctly plot the tank end pressure if it was set manually
---

diff --git a/profile.c b/profile.c
index 9fab8b2..df1b22b 100644
--- a/profile.c
+++ b/profile.c
@@ -717,7 +717,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)
+static void plot_cylinder_pressure_text(struct graphics_context *gc, struct plot_info *pi, struct dive *dive)
 {
 	int i;
 	int mbar, cyl;
@@ -763,7 +763,10 @@ static void plot_cylinder_pressure_text(struct graphics_context *gc, struct plot
 
 	for (cyl = 0; cyl < MAX_CYLINDERS; cyl++) {
 		if (last_time[cyl]) {
-			plot_pressure_value(gc, last_pressure[cyl], last_time[cyl], CENTER, TOP);
+			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);
 		}
 	}
 }
@@ -1322,7 +1325,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);
+	plot_cylinder_pressure_text(gc, pi, dive);
 
 	/* Bounding box last */
 	gc->leftx = 0; gc->rightx = 1.0;