X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=profile.c;h=7cad699ceaae7a868d3126f1c8072cf1ebf97845;hb=296642a63236ed4dbf72ba544164961cab51fcac;hp=72a1589d917dd64551a497b04f517db713ce8673;hpb=ec97a62f34eb9049a5face8782631853090bd85e;p=ext%2Fsubsurface.git

diff --git a/profile.c b/profile.c
index 72a1589..7cad699 100644
--- a/profile.c
+++ b/profile.c
@@ -74,27 +74,36 @@ static void set_source_rgb(struct graphics_context *gc, double r, double g, doub
 static int get_maxtime(struct plot_info *pi)
 {
 	int seconds = pi->maxtime;
-	return MAX(30*60, ROUND_UP(seconds, 60*10));
+	/* min 30 minutes, rounded up to 5 minutes, with at least 2.5 minutes to spare */
+	return MAX(30*60, ROUND_UP(seconds+150, 60*5));
 }
 
 static int get_maxdepth(struct plot_info *pi)
 {
 	unsigned mm = pi->maxdepth;
-	/* Minimum 30m */
+	/* Minimum 30m, rounded up to 10m, with at least 3m to spare */
 	return MAX(30000, ROUND_UP(mm+3000, 10000));
 }
 
 typedef struct {
 	int size;
 	double r,g,b;
-	enum {CENTER,LEFT} halign;
-	enum {MIDDLE,TOP,BOTTOM} valign;
+	double hpos, vpos;
 } text_render_options_t;
 
+#define RIGHT (-1.0)
+#define CENTER (-0.5)
+#define LEFT (0.0)
+
+#define TOP (1)
+#define MIDDLE (0)
+#define BOTTOM (-1)
+
 static void plot_text(struct graphics_context *gc, const text_render_options_t *tro,
 		      double x, double y, const char *fmt, ...)
 {
 	cairo_t *cr = gc->cr;
+	cairo_font_extents_t fe;
 	cairo_text_extents_t extents;
 	double dx, dy;
 	char buffer[80];
@@ -105,27 +114,10 @@ static void plot_text(struct graphics_context *gc, const text_render_options_t *
 	va_end(args);
 
 	cairo_set_font_size(cr, tro->size);
+	cairo_font_extents(cr, &fe);
 	cairo_text_extents(cr, buffer, &extents);
-	dx = 0;
-	switch (tro->halign) {
-	case CENTER:
-		dx = -(extents.width/2 + extents.x_bearing);
-		break;
-	case LEFT:
-		dx = 0;
-		break;
-	}
-	switch (tro->valign) {
-	case TOP:
-		dy = extents.height * 1.2;
-		break;
-	case BOTTOM:
-		dy = -extents.height * 0.8;
-		break;
-	case MIDDLE:
-		dy = 0;
-		break;
-	}
+	dx = tro->hpos * extents.width + extents.x_bearing;
+	dy = tro->vpos * extents.height + fe.descent;
 
 	move_to(gc, x, y);
 	cairo_rel_move_to(cr, dx, dy);
@@ -308,7 +300,7 @@ static void plot_depth_profile(struct graphics_context *gc, struct plot_info *pi
 
 static int setup_temperature_limits(struct graphics_context *gc, struct plot_info *pi)
 {
-	int maxtime, mintemp, maxtemp;
+	int maxtime, mintemp, maxtemp, delta;
 
 	/* Get plot scaling limits */
 	maxtime = get_maxtime(pi);
@@ -316,9 +308,16 @@ static int setup_temperature_limits(struct graphics_context *gc, struct plot_inf
 	maxtemp = pi->maxtemp;
 
 	gc->leftx = 0; gc->rightx = maxtime;
-	/* Show temperatures in roughly the lower third */
-	gc->topy = maxtemp + (maxtemp - mintemp)*2;
-	gc->bottomy = mintemp - (maxtemp - mintemp)/2;
+	/* Show temperatures in roughly the lower third, but make sure the scale
+	   is at least somewhat reasonable */
+	delta = maxtemp - mintemp;
+	if (delta > 3000) { /* more than 3K in fluctuation */
+		gc->topy = maxtemp + delta*2;
+		gc->bottomy = mintemp - delta/2;
+	} else {
+		gc->topy = maxtemp + 1500 + delta*2;
+		gc->bottomy = mintemp - delta/2;
+	}
 
 	return maxtemp > mintemp;
 }
@@ -343,14 +342,13 @@ static void plot_single_temp_text(struct graphics_context *gc, int sec, int mkel
 static void plot_temperature_text(struct graphics_context *gc, struct plot_info *pi)
 {
 	int i;
-	int last = 0;
+	int last = 0, sec = 0;
 	int last_temperature = 0, last_printed_temp = 0;
 
 	if (!setup_temperature_limits(gc, pi))
 		return;
 
 	for (i = 0; i < pi->nr; i++) {
-		int sec;
 		struct plot_data *entry = pi->entry+i;
 		int mkelvin = entry->temperature;
 
@@ -365,8 +363,8 @@ static void plot_temperature_text(struct graphics_context *gc, struct plot_info
 		last_printed_temp = mkelvin;
 	}
 	/* it would be nice to print the end temperature, if it's different */
-	if (last_temperature != last_printed_temp)
-		plot_single_temp_text(gc, last, last_temperature);
+	if (abs(last_temperature - last_printed_temp) > 500)
+		plot_single_temp_text(gc, sec, last_temperature);
 }
 
 static void plot_temperature_profile(struct graphics_context *gc, struct plot_info *pi)
@@ -456,7 +454,7 @@ static double calculate_airuse(struct dive *dive)
 
 static void plot_info(struct dive *dive, struct graphics_context *gc)
 {
-	text_render_options_t tro = {10, 0.2, 1.0, 0.2, LEFT, TOP};
+	text_render_options_t tro = {10, 0.2, 1.0, 0.2, RIGHT, BOTTOM};
 	const double liters_per_cuft = 28.317;
 	const char *unit, *desc;
 	double airuse;
@@ -475,12 +473,17 @@ static void plot_info(struct dive *dive, struct graphics_context *gc)
 		airuse /= liters_per_cuft;
 		break;
 	}
-	plot_text(gc, &tro, 0.8, 0.8, "vol: %4.2f %s", airuse, unit);
+	tro.vpos = -1.0;
+	plot_text(gc, &tro, 0.98, 0.98, "vol: %4.2f %s", airuse, unit);
+
+	tro.vpos = -2.2;
 	if (dive->duration.seconds) {
 		double pressure = 1 + (dive->meandepth.mm / 10000.0);
 		double sac = airuse / pressure * 60 / dive->duration.seconds;
-		plot_text(gc, &tro, 0.8, 0.85, "SAC: %4.2f %s/min", sac, unit);
+		plot_text(gc, &tro, 0.98, 0.98, "SAC: %4.2f %s/min", sac, unit);
 	}
+
+	tro.vpos = -3.4;
 	desc = dive->cylinder[0].type.description;
 	if (desc || dive->cylinder[0].gasmix.o2.permille) {
 		int o2 = dive->cylinder[0].gasmix.o2.permille / 10;
@@ -488,7 +491,7 @@ static void plot_info(struct dive *dive, struct graphics_context *gc)
 			desc = "";
 		if (!o2)
 			o2 = 21;
-		plot_text(gc, &tro, 0.8, 0.9, "%s (%d%%)", desc, o2);
+		plot_text(gc, &tro, 0.98, 0.98, "%s (%d%%)", desc, o2);
 	}
 }