X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=profile.c;h=fdbbcdf165fe1746b3dbc85aeb7afe35a788ee09;hb=3a6652634b2152352f6f5a2b9ee3d549140ae337;hp=6d6e1ff98ff345eeca162a9ba983a93998287167;hpb=0a13d287e5484a653bc53513a41af1942668e87f;p=ext%2Fsubsurface.git

diff --git a/profile.c b/profile.c
index 6d6e1ff..fdbbcdf 100644
--- a/profile.c
+++ b/profile.c
@@ -10,21 +10,6 @@
 
 int selected_dive = 0;
 
-/*
- * Cairo scaling really is horribly horribly mis-designed.
- *
- * Which is sad, because I really like Cairo otherwise. But
- * the fact that the line width is scaled with the same scale
- * as the coordinate system is a f*&%ing disaster. So we
- * can't use it, and instead have this butt-ugly wrapper thing..
- */
-struct graphics_context {
-	cairo_t *cr;
-	double maxx, maxy;
-	double leftx, rightx;
-	double topy, bottomy;
-};
-
 /* Plot info with smoothing and one-, two- and three-minute minimums and maximums */
 struct plot_info {
 	int nr;
@@ -55,6 +40,24 @@ static void line_to(struct graphics_context *gc, double x, double y)
 	cairo_line_to(gc->cr, SCALE(gc, x, y));
 }
 
+static void set_source_rgba(struct graphics_context *gc, double r, double g, double b, double a)
+{
+	if (gc->printer) {
+		/* Black is white and white is black */
+		double sum = r+g+b;
+		if (sum > 2)
+			r = g = b = 0;
+		else if (sum < 1)
+			r = g = b = 1;
+	}
+	cairo_set_source_rgba(gc->cr, r, g, b, a);
+}
+
+static void set_source_rgb(struct graphics_context *gc, double r, double g, double b)
+{
+	set_source_rgba(gc, r, g, b, 1);
+}
+
 #define ROUND_UP(x,y) ((((x)+(y)-1)/(y))*(y))
 
 /*
@@ -122,13 +125,13 @@ static void plot_text(struct graphics_context *gc, const text_render_options_t *
 	cairo_rel_move_to(cr, dx, dy);
 
 	cairo_text_path(cr, buffer);
-	cairo_set_source_rgb(cr, 0, 0, 0);
+	set_source_rgb(gc, 0, 0, 0);
 	cairo_stroke(cr);
 
 	move_to(gc, x, y);
 	cairo_rel_move_to(cr, dx, dy);
 
-	cairo_set_source_rgb(cr, tro->r, tro->g, tro->b);
+	set_source_rgb(gc, tro->r, tro->g, tro->b);
 	cairo_show_text(cr, buffer);
 }
 
@@ -222,6 +225,8 @@ static void plot_minmax_profile_minute(struct graphics_context *gc, struct plot_
 
 static void plot_minmax_profile(struct graphics_context *gc, struct plot_info *pi)
 {
+	if (gc->printer)
+		return;
 	plot_minmax_profile_minute(gc, pi, 2, 0.1);
 	plot_minmax_profile_minute(gc, pi, 1, 0.1);
 	plot_minmax_profile_minute(gc, pi, 0, 0.1);
@@ -255,7 +260,7 @@ static void plot_depth_profile(struct dive *dive, struct graphics_context *gc, s
 	case FEET: marker = 9144; break;	/* 30 ft */
 	}
 
-	cairo_set_source_rgba(cr, 1, 1, 1, 0.5);
+	set_source_rgba(gc, 1, 1, 1, 0.5);
 	for (i = marker; i < maxdepth; i += marker) {
 		move_to(gc, 0, i);
 		line_to(gc, 1, i);
@@ -263,7 +268,7 @@ static void plot_depth_profile(struct dive *dive, struct graphics_context *gc, s
 	cairo_stroke(cr);
 
 	/* Show mean depth */
-	cairo_set_source_rgba(cr, 1, 0.2, 0.2, 0.40);
+	set_source_rgba(gc, 1, 0.2, 0.2, 0.40);
 	move_to(gc, 0, dive->meandepth.mm);
 	line_to(gc, 1, dive->meandepth.mm);
 	cairo_stroke(cr);
@@ -274,7 +279,7 @@ static void plot_depth_profile(struct dive *dive, struct graphics_context *gc, s
 	plot_minmax_profile(gc, pi);
 
 	entry = pi->entry;
-	cairo_set_source_rgba(cr, 1, 0.2, 0.2, 0.80);
+	set_source_rgba(gc, 1, 0.2, 0.2, 0.80);
 	begins = entry->sec;
 	move_to(gc, entry->sec, entry->val);
 	for (i = 1; i < pi->nr; i++) {
@@ -289,9 +294,9 @@ static void plot_depth_profile(struct dive *dive, struct graphics_context *gc, s
 	line_to(gc, MIN(sec,maxtime), 0);
 	line_to(gc, begins, 0);
 	cairo_close_path(cr);
-	cairo_set_source_rgba(cr, 1, 0.2, 0.2, 0.20);
+	set_source_rgba(gc, 1, 0.2, 0.2, 0.20);
 	cairo_fill_preserve(cr);
-	cairo_set_source_rgba(cr, 1, 0.2, 0.2, 0.80);
+	set_source_rgba(gc, 1, 0.2, 0.2, 0.80);
 	cairo_stroke(cr);
 }
 
@@ -323,35 +328,50 @@ static int setup_temperature_limits(struct dive *dive, struct graphics_context *
 	return maxtemp > mintemp;
 }
 
-static void plot_temperature_text(struct dive *dive, struct graphics_context *gc)
+static void plot_single_temp_text(struct graphics_context *gc, int sec, temperature_t temperature)
 {
-	int i;
+	int deg;
+	const char *unit;
 	static const text_render_options_t tro = {12, 0.2, 0.2, 1.0, LEFT, TOP};
 
+	if (output_units.temperature == FAHRENHEIT) {
+		deg = to_F(temperature);
+		unit = "F";
+	} else {
+		deg = to_C(temperature);
+		unit = "C";
+	}
+	plot_text(gc, &tro, sec, temperature.mkelvin, "%d %s", deg, unit);
+}
+
+static void plot_temperature_text(struct dive *dive, struct graphics_context *gc)
+{
+	int i;
 	int last = 0;
+	temperature_t last_temperature, last_printed_temp;
 
 	if (!setup_temperature_limits(dive, gc))
 		return;
 
 	for (i = 0; i < dive->samples; i++) {
-		const char *unit;
 		struct sample *sample = dive->sample+i;
+		if (sample->time.seconds > dive->duration.seconds)
+			break; /* let's not plot surface temp events */
 		int mkelvin = sample->temperature.mkelvin;
-		int sec, deg;
+		int sec;
 		if (!mkelvin)
 			continue;
+		last_temperature = sample->temperature;
 		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);
+		plot_single_temp_text(gc,sec,sample->temperature);
+		last_printed_temp = last_temperature ;
+	}
+	/* it would be nice to print the end temperature, if it's different */
+	if (last_temperature.mkelvin != last_printed_temp.mkelvin) {
+		plot_single_temp_text(gc,dive->duration.seconds,last_temperature);
 	}
 }
 
@@ -364,9 +384,11 @@ static void plot_temperature_profile(struct dive *dive, struct graphics_context
 	if (!setup_temperature_limits(dive, gc))
 		return;
 
-	cairo_set_source_rgba(cr, 0.2, 0.2, 1.0, 0.8);
+	set_source_rgba(gc, 0.2, 0.2, 1.0, 0.8);
 	for (i = 0; i < dive->samples; i++) {
 		struct sample *sample = dive->sample+i;
+		if (sample->time.seconds > dive->duration.seconds)
+			break; /* let's not plot surface temp events */
 		int mkelvin = sample->temperature.mkelvin;
 		if (!mkelvin) {
 			if (!last)
@@ -645,7 +667,7 @@ static struct plot_info *depth_plot_info(struct dive *dive)
 	return analyze_plot_info(pi);
 }
 
-static void plot(struct graphics_context *gc, int w, int h, struct dive *dive)
+void plot(struct graphics_context *gc, int w, int h, struct dive *dive)
 {
 	double topx, topy;
 	struct plot_info *pi = depth_plot_info(dive);
@@ -687,7 +709,7 @@ static void plot(struct graphics_context *gc, int w, int h, struct dive *dive)
 	plot_info(dive, gc);
 
 	/* Bounding box last */
-	cairo_set_source_rgb(gc->cr, 1, 1, 1);
+	set_source_rgb(gc, 1, 1, 1);
 	move_to(gc, 0, 0);
 	line_to(gc, 0, 1);
 	line_to(gc, 1, 1);
@@ -700,14 +722,14 @@ static void plot(struct graphics_context *gc, int w, int h, struct dive *dive)
 static gboolean expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer data)
 {
 	struct dive *dive = current_dive;
-	struct graphics_context gc;
+	struct graphics_context gc = { .printer = 0 };
 	int w,h;
 
 	w = widget->allocation.width;
 	h = widget->allocation.height;
 
 	gc.cr = gdk_cairo_create(widget->window);
-	cairo_set_source_rgb(gc.cr, 0, 0, 0);
+	set_source_rgb(&gc, 0, 0, 0);
 	cairo_paint(gc.cr);
 
 	if (dive)