X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=profile.c;h=febea80250daf8234226b60a3dce9ff7ad4ddb20;hb=454a45617230274c3fff57ad2f70fb35d7f7142b;hp=52dc82beb84622ed8548c7d9660615009fb127b4;hpb=c0a429457ab9fae5e6995777b869b111ef32be74;p=ext%2Fsubsurface.git

diff --git a/profile.c b/profile.c
index 52dc82b..febea80 100644
--- a/profile.c
+++ b/profile.c
@@ -27,7 +27,7 @@ static int round_feet_up(int feet)
 	return MAX(90, ROUND_UP(feet+5, 15));
 }
 
-static void plot_text(cairo_t *cr, double x, double y, const char *fmt, ...)
+static void plot_text(cairo_t *cr, int xpos, int ypos, double x, double y, const char *fmt, ...)
 {
 	cairo_text_extents_t extents;
 	char buffer[80];
@@ -39,8 +39,26 @@ static void plot_text(cairo_t *cr, double x, double y, const char *fmt, ...)
 
 	cairo_text_extents(cr, buffer, &extents);
 
-	x -= extents.width/2 + extents.x_bearing;
-	y += extents.height * 1.2;
+	switch (xpos) {
+	case -1:	/* Left-justify */
+		break;
+	case 0:		/* Center */
+		x -= extents.width/2 + extents.x_bearing;
+		break;
+	case 1:		/* Right-justify */
+		x -= extents.width + extents.x_bearing;
+		break;
+	}
+	switch (ypos) {
+	case -1:	/* Top-justify */
+		break;
+	case 0:		/* Center */
+		y -= extents.height/2 + extents.y_bearing;
+		break;
+	case 1:		/* Bottom-justify */
+		y += extents.height * 1.2;
+		break;
+	}
 
 	cairo_move_to(cr, x, y);
 	cairo_text_path(cr, buffer);
@@ -108,14 +126,43 @@ static int next_minmax(struct dive *dive, int index, int minmax)
 /* Scale to 0,0 -> maxx,maxy */
 #define SCALE(x,y) (x)*maxx/scalex+topx,(y)*maxy/scaley+topy
 
-static void plot_profile(struct dive *dive, cairo_t *cr,
+static void plot_depth_text(struct dive *dive, cairo_t *cr,
+	double topx, double topy, double maxx, double maxy)
+{
+	double scalex, scaley;
+	int maxtime, maxdepth;
+	int i;
+
+	/* Get plot scaling limits */
+	maxtime = round_seconds_up(dive->duration.seconds);
+	maxdepth = round_feet_up(to_feet(dive->maxdepth));
+
+	scalex = maxtime;
+	scaley = maxdepth;
+
+	cairo_set_font_size(cr, 14);
+	cairo_set_source_rgb(cr, 1, 0.2, 0.2);
+	i = 0;
+	while ((i = next_minmax(dive, i, 1)) != 0) {
+		struct sample *sample = dive->sample+i;
+		int sec = sample->time.seconds;
+		int depth = to_feet(sample->depth);
+
+		plot_text(cr, 0, 1, SCALE(sec, depth), "%d ft", depth);
+		i = next_minmax(dive, i, 0);
+		if (!i)
+			break;
+	}
+}
+
+static void plot_depth_profile(struct dive *dive, cairo_t *cr,
 	double topx, double topy, double maxx, double maxy)
 {
 	double scalex, scaley;
 	int begins, sec, depth;
 	int i, samples;
 	struct sample *sample;
-	int maxtime, maxdepth, mindepth;
+	int maxtime, maxdepth;
 
 	samples = dive->samples;
 	if (!samples)
@@ -171,24 +218,6 @@ static void plot_profile(struct dive *dive, cairo_t *cr,
 	cairo_fill_preserve(cr);
 	cairo_set_source_rgba(cr, 1, 0.2, 0.2, 0.80);
 	cairo_stroke(cr);
-
-	scalex = maxtime;
-	scaley = maxdepth;
-
-	maxdepth = mindepth = 0;
-	maxtime = 0;
-	cairo_set_font_size(cr, 14);
-	cairo_set_source_rgb(cr, 1, 0.2, 0.2);
-	i = 0;
-	while ((i = next_minmax(dive, i, 1)) != 0) {
-		sample = dive->sample+i;
-		sec = sample->time.seconds;
-		depth = to_feet(sample->depth);
-		plot_text(cr, SCALE(sec, depth), "%d ft", depth);
-		i = next_minmax(dive, i, 0);
-		if (!i)
-			break;
-	}
 }
 
 static int get_cylinder_pressure_range(struct dive *dive, double *scalex, double *scaley)
@@ -252,6 +281,50 @@ static void plot_cylinder_pressure(struct dive *dive, cairo_t *cr,
 	cairo_stroke(cr);
 }
 
+/*
+ * Return air usage (in liters).
+ */
+static double calculate_airuse(struct dive *dive)
+{
+	double airuse = 0;
+	int i;
+
+	for (i = 0; i < MAX_CYLINDERS; i++) {
+		cylinder_t *cyl = dive->cylinder + i;
+		int size = cyl->type.size.mliter;
+		double kilo_atm;
+
+		if (!size)
+			continue;
+
+		kilo_atm = (cyl->start.mbar - cyl->end.mbar) / 1013250.0;
+
+		/* Liters of air at 1 atm == milliliters at 1k atm*/
+		airuse += kilo_atm * size;
+	}
+	return airuse;
+}
+
+static void plot_info(struct dive *dive, cairo_t *cr,
+	double topx, double topy, double maxx, double maxy)
+{
+	const double liters_per_cuft = 28.317;
+	double airuse;
+
+	airuse = calculate_airuse(dive);
+	if (!airuse)
+		return;
+
+	/* I really need to start addign some unit setting thing */
+	airuse /= liters_per_cuft;
+	plot_text(cr, 1, 0, maxx*0.95, maxy*0.9, "cuft: %4.2f", airuse);
+	if (dive->duration.seconds) {
+		double pressure = 1 + (dive->meandepth.mm / 10000.0);
+		double sac = airuse / pressure * 60 / dive->duration.seconds;
+		plot_text(cr, 1, 0, maxx*0.95, maxy*0.95, "SAC: %4.2f", sac);
+	}
+}
+
 static void plot(cairo_t *cr, int w, int h, struct dive *dive)
 {
 	double topx, topy, maxx, maxy;
@@ -262,11 +335,17 @@ static void plot(cairo_t *cr, int w, int h, struct dive *dive)
 	maxx = (w - 2*topx);
 	maxy = (h - 2*topy);
 
+	/* Cylinder pressure plot */
+	plot_cylinder_pressure(dive, cr, topx, topy, maxx, maxy);
+
 	/* Depth profile */
-	plot_profile(dive, cr, topx, topy, maxx, maxy);
+	plot_depth_profile(dive, cr, topx, topy, maxx, maxy);
 
-	/* Cylinder pressure plot? */
-	plot_cylinder_pressure(dive, cr, topx, topy, maxx, maxy);
+	/* Text on top of all graphs.. */
+	plot_depth_text(dive, cr, topx, topy, maxx, maxy);
+
+	/* And info box in the lower right corner.. */
+	plot_info(dive, cr, topx, topy, maxx, maxy);
 
 	/* Bounding box last */
 	scalex = scaley = 1.0;