X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=profile.c;h=6d6e1ff98ff345eeca162a9ba983a93998287167;hb=c7b9387d4bf624230ca2e317e7ac8cf5b4b81f0c;hp=abd7afe12a4136d960347e3f8b45e62354c52d77;hpb=86e48bfe10d271f86c896e64350c35d59c94c331;p=ext%2Fsubsurface.git

diff --git a/profile.c b/profile.c
index abd7afe..6d6e1ff 100644
--- a/profile.c
+++ b/profile.c
@@ -21,7 +21,8 @@ int selected_dive = 0;
 struct graphics_context {
 	cairo_t *cr;
 	double maxx, maxy;
-	double scalex, scaley;
+	double leftx, rightx;
+	double topy, bottomy;
 };
 
 /* Plot info with smoothing and one-, two- and three-minute minimums and maximums */
@@ -40,7 +41,9 @@ struct plot_info {
 #define plot_info_size(nr) (sizeof(struct plot_info) + (nr)*sizeof(struct plot_data))
 
 /* Scale to 0,0 -> maxx,maxy */
-#define SCALE(gc,x,y) (x)*gc->maxx/gc->scalex,(y)*gc->maxy/gc->scaley
+#define SCALEX(gc,x)  (((x)-gc->leftx)/(gc->rightx-gc->leftx)*gc->maxx)
+#define SCALEY(gc,y)  (((y)-gc->topy)/(gc->bottomy-gc->topy)*gc->maxy)
+#define SCALE(gc,x,y) SCALEX(gc,x),SCALEY(gc,y)
 
 static void move_to(struct graphics_context *gc, double x, double y)
 {
@@ -177,8 +180,8 @@ static void plot_depth_text(struct dive *dive, struct graphics_context *gc, stru
 	maxtime = round_seconds_up(dive->duration.seconds);
 	maxdepth = round_depth_up(dive->maxdepth);
 
-	gc->scalex = maxtime;
-	gc->scaley = maxdepth;
+	gc->leftx = 0; gc->rightx = maxtime;
+	gc->topy = 0; gc->bottomy = maxdepth;
 
 	plot_text_samples(gc, pi);
 }
@@ -232,23 +235,21 @@ static void plot_depth_profile(struct dive *dive, struct graphics_context *gc, s
 	struct plot_data *entry;
 	int maxtime, maxdepth, marker;
 
-	cairo_set_line_width(gc->cr, 2);
-
 	/* Get plot scaling limits */
 	maxtime = round_seconds_up(dive->duration.seconds);
 	maxdepth = round_depth_up(dive->maxdepth);
 
 	/* Time markers: every 5 min */
-	gc->scalex = maxtime;
-	gc->scaley = 1.0;
+	gc->leftx = 0; gc->rightx = maxtime;
+	gc->topy = 0; gc->bottomy = 1.0;
 	for (i = 5*60; i < maxtime; i += 5*60) {
 		move_to(gc, i, 0);
 		line_to(gc, i, 1);
 	}
 
 	/* Depth markers: every 30 ft or 10 m*/
-	gc->scalex = 1.0;
-	gc->scaley = maxdepth;
+	gc->leftx = 0; gc->rightx = 1.0;
+	gc->topy = 0; gc->bottomy = maxdepth;
 	switch (output_units.length) {
 	case METERS: marker = 10000; break;
 	case FEET: marker = 9144; break;	/* 30 ft */
@@ -267,7 +268,7 @@ static void plot_depth_profile(struct dive *dive, struct graphics_context *gc, s
 	line_to(gc, 1, dive->meandepth.mm);
 	cairo_stroke(cr);
 
-	gc->scalex = maxtime;
+	gc->leftx = 0; gc->rightx = maxtime;
 
 	plot_smoothed_profile(gc, pi);
 	plot_minmax_profile(gc, pi);
@@ -284,7 +285,7 @@ static void plot_depth_profile(struct dive *dive, struct graphics_context *gc, s
 			line_to(gc, sec, depth);
 		}
 	}
-	gc->scaley = 1.0;
+	gc->topy = 0; gc->bottomy = 1.0;
 	line_to(gc, MIN(sec,maxtime), 0);
 	line_to(gc, begins, 0);
 	cairo_close_path(cr);
@@ -294,6 +295,93 @@ static void plot_depth_profile(struct dive *dive, struct graphics_context *gc, s
 	cairo_stroke(cr);
 }
 
+static int setup_temperature_limits(struct dive *dive, struct graphics_context *gc)
+{
+	int i;
+	int maxtime, mintemp, maxtemp;
+
+	/* Get plot scaling limits */
+	maxtime = round_seconds_up(dive->duration.seconds);
+	mintemp = INT_MAX;
+	maxtemp = 0;
+	for (i = 0; i < dive->samples; i++) {
+		struct sample *sample = dive->sample+i;
+		int mkelvin = sample->temperature.mkelvin;
+		if (!mkelvin)
+			continue;
+		if (mkelvin > maxtemp)
+			maxtemp = mkelvin;
+		if (mkelvin < mintemp)
+			mintemp = mkelvin;
+	}
+
+	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;
+
+	return maxtemp > mintemp;
+}
+
+static void plot_temperature_text(struct dive *dive, struct graphics_context *gc)
+{
+	int i;
+	static const text_render_options_t tro = {12, 0.2, 0.2, 1.0, LEFT, TOP};
+
+	int last = 0;
+
+	if (!setup_temperature_limits(dive, gc))
+		return;
+
+	for (i = 0; i < dive->samples; i++) {
+		const char *unit;
+		struct sample *sample = dive->sample+i;
+		int mkelvin = sample->temperature.mkelvin;
+		int sec, deg;
+		if (!mkelvin)
+			continue;
+		sec = sample->time.seconds;
+		if (sec < last)
+			continue;
+		last = sec + 300;
+		if (output_units.temperature == FAHRENHEIT) {
+			deg = to_F(sample->temperature);
+			unit = "F";
+		} else {
+			deg = to_C(sample->temperature);
+			unit = "C";
+		}
+		plot_text(gc, &tro, sec, mkelvin, "%d %s", deg, unit);
+	}
+}
+
+static void plot_temperature_profile(struct dive *dive, struct graphics_context *gc)
+{
+	int i;
+	cairo_t *cr = gc->cr;
+	int last = 0;
+
+	if (!setup_temperature_limits(dive, gc))
+		return;
+
+	cairo_set_source_rgba(cr, 0.2, 0.2, 1.0, 0.8);
+	for (i = 0; i < dive->samples; i++) {
+		struct sample *sample = dive->sample+i;
+		int mkelvin = sample->temperature.mkelvin;
+		if (!mkelvin) {
+			if (!last)
+				continue;
+			mkelvin = last;
+		}
+		if (last)
+			line_to(gc, sample->time.seconds, mkelvin);
+		else
+			move_to(gc, sample->time.seconds, mkelvin);
+		last = mkelvin;
+	}
+	cairo_stroke(cr);
+}
+
 /* gets both the actual start and end pressure as well as the scaling factors */
 static int get_cylinder_pressure_range(struct dive *dive, struct graphics_context *gc,
 	pressure_t *startp, pressure_t *endp)
@@ -301,7 +389,7 @@ static int get_cylinder_pressure_range(struct dive *dive, struct graphics_contex
 	int i;
 	int min, max;
 
-	gc->scalex = round_seconds_up(dive->duration.seconds);
+	gc->leftx = 0; gc->rightx = round_seconds_up(dive->duration.seconds);
 
 	max = 0;
 	min = 5000000;
@@ -329,7 +417,7 @@ static int get_cylinder_pressure_range(struct dive *dive, struct graphics_contex
 		endp->mbar = min;
 	if (!max)
 		return 0;
-	gc->scaley = max * 1.5;
+	gc->topy = 0; gc->bottomy = max * 1.5;
 	return 1;
 }
 
@@ -391,7 +479,7 @@ 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};
 	const double liters_per_cuft = 28.317;
-	const char *unit;
+	const char *unit, *desc;
 	double airuse;
 
 	airuse = calculate_airuse(dive);
@@ -414,6 +502,15 @@ static void plot_info(struct dive *dive, struct graphics_context *gc)
 		double sac = airuse / pressure * 60 / dive->duration.seconds;
 		plot_text(gc, &tro, 0.8, 0.85, "SAC: %4.2f %s/min", sac, unit);
 	}
+	desc = dive->cylinder[0].type.description;
+	if (desc || dive->cylinder[0].gasmix.o2.permille) {
+		int o2 = dive->cylinder[0].gasmix.o2.permille / 10;
+		if (!desc)
+			desc = "";
+		if (!o2)
+			o2 = 21;
+		plot_text(gc, &tro, 0.8, 0.9, "%s (%d%%)", desc, o2);
+	}
 }
 
 static void plot_cylinder_pressure_text(struct dive *dive, struct graphics_context *gc)
@@ -556,6 +653,9 @@ static void plot(struct graphics_context *gc, int w, int h, struct dive *dive)
 	topx = w / 20.0;
 	topy = h / 20.0;
 	cairo_translate(gc->cr, topx, topy);
+	cairo_set_line_width(gc->cr, 2);
+	cairo_set_line_cap(gc->cr, CAIRO_LINE_CAP_ROUND);
+	cairo_set_line_join(gc->cr, CAIRO_LINE_JOIN_ROUND);
 
 	/*
 	 * We can use "cairo_translate()" because that doesn't
@@ -567,6 +667,9 @@ static void plot(struct graphics_context *gc, int w, int h, struct dive *dive)
 	gc->maxx = (w - 2*topx);
 	gc->maxy = (h - 2*topy);
 
+	/* Temperature profile */
+	plot_temperature_profile(dive, gc);
+
 	/* Cylinder pressure plot */
 	plot_cylinder_pressure(dive, gc);
 
@@ -574,11 +677,13 @@ static void plot(struct graphics_context *gc, int w, int h, struct dive *dive)
 	plot_depth_profile(dive, gc, pi);
 
 	/* Text on top of all graphs.. */
+	plot_temperature_text(dive, gc);
 	plot_depth_text(dive, gc, pi);
 	plot_cylinder_pressure_text(dive, gc);
 
 	/* And info box in the lower right corner.. */
-	gc->scalex = gc->scaley = 1.0;
+	gc->leftx = 0; gc->rightx = 1.0;
+	gc->topy = 0; gc->bottomy = 1.0;
 	plot_info(dive, gc);
 
 	/* Bounding box last */
@@ -618,7 +723,7 @@ GtkWidget *dive_profile_widget(void)
 	GtkWidget *da;
 
 	da = gtk_drawing_area_new();
-	gtk_widget_set_size_request(da, 450, 350);
+	gtk_widget_set_size_request(da, 350, 250);
 	g_signal_connect(da, "expose_event", G_CALLBACK(expose_event), NULL);
 
 	return da;