X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=profile.c;h=d38046a4b7ee66a812c293352d63f81c69630c82;hb=19dd61b1268cfef1526cb4195180e19276ea81b4;hp=febea80250daf8234226b60a3dce9ff7ad4ddb20;hpb=93c21a4dbca03675bb69d6b4f12f34c3387616f6;p=ext%2Fsubsurface.git

diff --git a/profile.c b/profile.c
index febea80..d38046a 100644
--- a/profile.c
+++ b/profile.c
@@ -22,12 +22,20 @@ static int round_seconds_up(int seconds)
 	return MAX(30*60, ROUND_UP(seconds, 60*10));
 }
 
-static int round_feet_up(int feet)
+static int round_depth_up(depth_t depth)
 {
-	return MAX(90, ROUND_UP(feet+5, 15));
+	unsigned mm = depth.mm;
+	/* Minimum 30m */
+	return MAX(30000, ROUND_UP(mm+3000, 10000));
 }
 
-static void plot_text(cairo_t *cr, int xpos, int ypos, double x, double y, const char *fmt, ...)
+typedef struct {
+	double r,g,b;
+	enum {CENTER,LEFT} allign;
+} text_render_options_t;
+
+static void plot_text(cairo_t *cr, text_render_options_t *tro,
+		      double x, double y, const char *fmt, ...)
 {
 	cairo_text_extents_t extents;
 	char buffer[80];
@@ -39,26 +47,9 @@ static void plot_text(cairo_t *cr, int xpos, int ypos, double x, double y, const
 
 	cairo_text_extents(cr, buffer, &extents);
 
-	switch (xpos) {
-	case -1:	/* Left-justify */
-		break;
-	case 0:		/* Center */
+	if (tro->allign == 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;
-	}
+	y += extents.height * 1.2;
 
 	cairo_move_to(cr, x, y);
 	cairo_text_path(cr, buffer);
@@ -66,7 +57,7 @@ static void plot_text(cairo_t *cr, int xpos, int ypos, double x, double y, const
 	cairo_stroke(cr);
 
 	cairo_move_to(cr, x, y);
-	cairo_set_source_rgb(cr, 1, 0, 0);
+	cairo_set_source_rgb(cr, tro->r, tro->g, tro->b);
 	cairo_show_text(cr, buffer);
 }
 
@@ -124,10 +115,10 @@ 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
+#define SCALE(x,y) (x)*maxx/scalex,(y)*maxy/scaley
 
 static void plot_depth_text(struct dive *dive, cairo_t *cr,
-	double topx, double topy, double maxx, double maxy)
+	double maxx, double maxy)
 {
 	double scalex, scaley;
 	int maxtime, maxdepth;
@@ -135,7 +126,7 @@ static void plot_depth_text(struct dive *dive, cairo_t *cr,
 
 	/* Get plot scaling limits */
 	maxtime = round_seconds_up(dive->duration.seconds);
-	maxdepth = round_feet_up(to_feet(dive->maxdepth));
+	maxdepth = round_depth_up(dive->maxdepth);
 
 	scalex = maxtime;
 	scaley = maxdepth;
@@ -144,11 +135,25 @@ static void plot_depth_text(struct dive *dive, cairo_t *cr,
 	cairo_set_source_rgb(cr, 1, 0.2, 0.2);
 	i = 0;
 	while ((i = next_minmax(dive, i, 1)) != 0) {
+		text_render_options_t tro = {1.0, 0.2, 0.2, CENTER};
 		struct sample *sample = dive->sample+i;
 		int sec = sample->time.seconds;
-		int depth = to_feet(sample->depth);
+		depth_t depth = sample->depth;
+		const char *fmt;
+		double d;
+
+		switch (output_units.length) {
+		case METERS:
+			d = depth.mm / 1000.0;
+			fmt = "%.1f";
+			break;
+		case FEET:
+			d = to_feet(depth);
+			fmt = "%.0f";
+			break;
+		}
 
-		plot_text(cr, 0, 1, SCALE(sec, depth), "%d ft", depth);
+		plot_text(cr, &tro, SCALE(sec, depth.mm), fmt, d);
 		i = next_minmax(dive, i, 0);
 		if (!i)
 			break;
@@ -156,13 +161,13 @@ static void plot_depth_text(struct dive *dive, cairo_t *cr,
 }
 
 static void plot_depth_profile(struct dive *dive, cairo_t *cr,
-	double topx, double topy, double maxx, double maxy)
+	double maxx, double maxy)
 {
 	double scalex, scaley;
 	int begins, sec, depth;
 	int i, samples;
 	struct sample *sample;
-	int maxtime, maxdepth;
+	int maxtime, maxdepth, marker;
 
 	samples = dive->samples;
 	if (!samples)
@@ -172,7 +177,7 @@ static void plot_depth_profile(struct dive *dive, cairo_t *cr,
 
 	/* Get plot scaling limits */
 	maxtime = round_seconds_up(dive->duration.seconds);
-	maxdepth = round_feet_up(to_feet(dive->maxdepth));
+	maxdepth = round_depth_up(dive->maxdepth);
 
 	/* Time markers: every 5 min */
 	scalex = maxtime;
@@ -182,11 +187,16 @@ static void plot_depth_profile(struct dive *dive, cairo_t *cr,
 		cairo_line_to(cr, SCALE(i, 1));
 	}
 
-	/* Depth markers: every 15 ft */
+	/* Depth markers: every 30 ft or 10 m*/
 	scalex = 1.0;
 	scaley = maxdepth;
+	switch (output_units.length) {
+	case METERS: marker = 10000; break;
+	case FEET: marker = 9144; break;	/* 30 ft */
+	}
+
 	cairo_set_source_rgba(cr, 1, 1, 1, 0.5);
-	for (i = 15; i < maxdepth; i += 15) {
+	for (i = marker; i < maxdepth; i += marker) {
 		cairo_move_to(cr, SCALE(0, i));
 		cairo_line_to(cr, SCALE(1, i));
 	}
@@ -194,8 +204,8 @@ static void plot_depth_profile(struct dive *dive, cairo_t *cr,
 
 	/* Show mean depth */
 	cairo_set_source_rgba(cr, 1, 0.2, 0.2, 0.40);
-	cairo_move_to(cr, SCALE(0, to_feet(dive->meandepth)));
-	cairo_line_to(cr, SCALE(1, to_feet(dive->meandepth)));
+	cairo_move_to(cr, SCALE(0, dive->meandepth.mm));
+	cairo_line_to(cr, SCALE(1, dive->meandepth.mm));
 	cairo_stroke(cr);
 
 	scalex = maxtime;
@@ -203,15 +213,17 @@ static void plot_depth_profile(struct dive *dive, cairo_t *cr,
 	sample = dive->sample;
 	cairo_set_source_rgba(cr, 1, 0.2, 0.2, 0.80);
 	begins = sample->time.seconds;
-	cairo_move_to(cr, SCALE(sample->time.seconds, to_feet(sample->depth)));
+	cairo_move_to(cr, SCALE(sample->time.seconds, sample->depth.mm));
 	for (i = 1; i < dive->samples; i++) {
 		sample++;
 		sec = sample->time.seconds;
-		depth = to_feet(sample->depth);
-		cairo_line_to(cr, SCALE(sec, depth));
+		if (sec <= maxtime) {
+			depth = sample->depth.mm;
+			cairo_line_to(cr, SCALE(sec, depth));
+		}
 	}
 	scaley = 1.0;
-	cairo_line_to(cr, SCALE(sec, 0));
+	cairo_line_to(cr, SCALE(MIN(sec,maxtime), 0));
 	cairo_line_to(cr, SCALE(begins, 0));
 	cairo_close_path(cr);
 	cairo_set_source_rgba(cr, 1, 0.2, 0.2, 0.20);
@@ -220,30 +232,39 @@ static void plot_depth_profile(struct dive *dive, cairo_t *cr,
 	cairo_stroke(cr);
 }
 
-static int get_cylinder_pressure_range(struct dive *dive, double *scalex, double *scaley)
+/* gets both the actual start and end pressure as well as the scaling factors */
+static int get_cylinder_pressure_range(struct dive *dive, double *scalex, double *scaley,
+				       pressure_t *startp, pressure_t *endp)
 {
 	int i;
-	double min, max;
+	int min, max;
 
 	*scalex = round_seconds_up(dive->duration.seconds);
 
 	max = 0;
-	min = 5000;
+	min = 5000000;
+	if (startp)
+		startp->mbar = endp->mbar = 0;
+
 	for (i = 0; i < dive->samples; i++) {
+		int mbar;
 		struct sample *sample = dive->sample + i;
-		double bar;
 
 		/* FIXME! We only track cylinder 0 right now */
 		if (sample->cylinderindex)
 			continue;
-		if (!sample->cylinderpressure.mbar)
+		mbar = sample->cylinderpressure.mbar;
+		if (!mbar)
 			continue;
-		bar = sample->cylinderpressure.mbar;
-		if (bar < min)
-			min = bar;
-		if (bar > max)
-			max = bar;
+		if (mbar < min)
+			min = mbar;
+		if (mbar > max)
+			max = mbar;
 	}
+	if (startp)
+		startp->mbar = max;
+	if (endp)
+		endp->mbar = min;
 	if (!max)
 		return 0;
 	*scaley = max * 1.5;
@@ -251,12 +272,12 @@ static int get_cylinder_pressure_range(struct dive *dive, double *scalex, double
 }
 
 static void plot_cylinder_pressure(struct dive *dive, cairo_t *cr,
-	double topx, double topy, double maxx, double maxy)
+	double maxx, double maxy)
 {
 	int i, sec = -1;
 	double scalex, scaley;
 
-	if (!get_cylinder_pressure_range(dive, &scalex, &scaley))
+	if (!get_cylinder_pressure_range(dive, &scalex, &scaley, NULL, NULL))
 		return;
 
 	cairo_set_source_rgba(cr, 0.2, 1.0, 0.2, 0.80);
@@ -270,7 +291,8 @@ static void plot_cylinder_pressure(struct dive *dive, cairo_t *cr,
 		if (!mbar)
 			continue;
 		sec = sample->time.seconds;
-		cairo_line_to(cr, SCALE(sec, mbar));
+		if (sec <= dive->duration.seconds)
+			cairo_line_to(cr, SCALE(sec, mbar));
 	}
 	/*
 	 * We may have "surface time" events, in which case we don't go
@@ -306,9 +328,11 @@ static double calculate_airuse(struct dive *dive)
 }
 
 static void plot_info(struct dive *dive, cairo_t *cr,
-	double topx, double topy, double maxx, double maxy)
+	double maxx, double maxy)
 {
+	text_render_options_t tro = {0.2, 1.0, 0.2, LEFT};
 	const double liters_per_cuft = 28.317;
+	const char *unit;
 	double airuse;
 
 	airuse = calculate_airuse(dive);
@@ -316,12 +340,58 @@ static void plot_info(struct dive *dive, cairo_t *cr,
 		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);
+	switch (output_units.volume) {
+	case LITER:
+		unit = "l";
+		break;
+	case CUFT:
+		unit = "cuft";
+		airuse /= liters_per_cuft;
+		break;
+	}
+	plot_text(cr, &tro, maxx*0.8, maxy*0.8, "vol: %4.2f %s", airuse, unit);
 	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);
+		plot_text(cr, &tro, maxx*0.8, maxy*0.85, "SAC: %4.2f %s/min", sac, unit);
+	}
+}
+
+static void plot_cylinder_pressure_text(struct dive *dive, cairo_t *cr,
+	double maxx, double maxy)
+{
+	double scalex, scaley;
+	pressure_t startp, endp;
+
+	cairo_set_font_size(cr, 10);
+
+	if (get_cylinder_pressure_range(dive, &scalex, &scaley,
+					&startp, &endp)) {
+		int start, end;
+		const char *unit = "bar";
+
+		switch (output_units.pressure) {
+		case PASCAL:
+			start = startp.mbar * 100;
+			end = startp.mbar * 100;
+			unit = "pascal";
+			break;
+		case BAR:
+			start = (startp.mbar + 500) / 1000;
+			end = (endp.mbar + 500) / 1000;
+			unit = "bar";
+			break;
+		case PSI:
+			start = to_PSI(startp);
+			end = to_PSI(endp);
+			unit = "psi";
+			break;
+		}
+
+		text_render_options_t tro = {0.2, 1.0, 0.2, LEFT};
+		plot_text(cr, &tro, SCALE(0, startp.mbar), "%d %s", start, unit);
+		plot_text(cr, &tro, SCALE(dive->duration.seconds, endp.mbar),
+			  "%d %s", end, unit);
 	}
 }
 
@@ -334,18 +404,20 @@ static void plot(cairo_t *cr, int w, int h, struct dive *dive)
 	topy = h / 20.0;
 	maxx = (w - 2*topx);
 	maxy = (h - 2*topy);
+	cairo_translate(cr, topx, topy);
 
 	/* Cylinder pressure plot */
-	plot_cylinder_pressure(dive, cr, topx, topy, maxx, maxy);
+	plot_cylinder_pressure(dive, cr, maxx, maxy);
 
 	/* Depth profile */
-	plot_depth_profile(dive, cr, topx, topy, maxx, maxy);
+	plot_depth_profile(dive, cr, maxx, maxy);
 
 	/* Text on top of all graphs.. */
-	plot_depth_text(dive, cr, topx, topy, maxx, maxy);
+	plot_depth_text(dive, cr, maxx, maxy);
+	plot_cylinder_pressure_text(dive, cr, maxx, maxy);
 
 	/* And info box in the lower right corner.. */
-	plot_info(dive, cr, topx, topy, maxx, maxy);
+	plot_info(dive, cr, maxx, maxy);
 
 	/* Bounding box last */
 	scalex = scaley = 1.0;