X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=profile.c;h=3f3dd42bc108f1c0b7e048a1521388e92e1a7c2d;hb=8a8ad3f9978c47d9ba10085236e6e6722949b5e2;hp=1d4cabc084a377cd6ede725244fdfedcc1ac6fc1;hpb=e276b0602bf9b5953f237e67663ee0d3d8d1163b;p=ext%2Fsubsurface.git

diff --git a/profile.c b/profile.c
index 1d4cabc..3f3dd42 100644
--- a/profile.c
+++ b/profile.c
@@ -65,12 +65,15 @@ static void line_to(struct graphics_context *gc, double x, double y)
 
 static void set_source_rgba(struct graphics_context *gc, double r, double g, double b, double a)
 {
+	/*
+	 * For printers, we still honor 'a', but ignore colors
+	 * for now. Black is white and white is black
+	 */
 	if (gc->printer) {
-		/* Black is white and white is black */
 		double sum = r+g+b;
-		if (sum > 2)
+		if (sum > 0.8)
 			r = g = b = 0;
-		else if (sum < 1)
+		else
 			r = g = b = 1;
 	}
 	cairo_set_source_rgba(gc->cr, r, g, b, a);
@@ -212,7 +215,7 @@ static void plot_smoothed_profile(struct graphics_context *gc, struct plot_info
 	int i;
 	struct plot_data *entry = pi->entry;
 
-	cairo_set_source_rgba(gc->cr, 1, 0.2, 0.2, 0.20);
+	set_source_rgba(gc, 1, 0.2, 0.2, 0.20);
 	move_to(gc, entry->sec, entry->smoothed);
 	for (i = 1; i < pi->nr; i++) {
 		entry++;
@@ -227,7 +230,7 @@ static void plot_minmax_profile_minute(struct graphics_context *gc, struct plot_
 	int i;
 	struct plot_data *entry = pi->entry;
 
-	cairo_set_source_rgba(gc->cr, 1, 0.2, 1, a);
+	set_source_rgba(gc, 1, 0.2, 1, a);
 	move_to(gc, entry->sec, entry->min[index]->val);
 	for (i = 1; i < pi->nr; i++) {
 		entry++;
@@ -254,9 +257,7 @@ static void plot_depth_profile(struct graphics_context *gc, struct plot_info *pi
 {
 	int i;
 	cairo_t *cr = gc->cr;
-	int ends, sec, depth;
-	int *secs;
-	int *depths;
+	int sec, depth;
 	struct plot_data *entry;
 	int maxtime, maxdepth, marker;
 
@@ -304,49 +305,41 @@ static void plot_depth_profile(struct graphics_context *gc, struct plot_info *pi
 		plot_minmax_profile(gc, pi);
 	}
 
-	entry = pi->entry;
-	set_source_rgba(gc, 1, 0.2, 0.2, 0.80);
-	secs = (int *) malloc(sizeof(int) * pi->nr);
-	depths = (int *) malloc(sizeof(int) * pi->nr);
-	secs[0] = entry->sec;
-	depths[0] = entry->val;
-	for (i = 1; i < pi->nr; i++) {
-		entry++;
-		sec = entry->sec;
-		if (sec <= maxtime || entry->val > 0) {
-			/* we want to draw the segments in different colors
-			 * representing the vertical velocity, so we need to
-			 * chop this into short segments */
-			rgb_t color = rgb[entry->velocity];
-			depth = entry->val;
-			set_source_rgb(gc, color.r, color.g, color.b);
-			move_to(gc, secs[i-1], depths[i-1]);
-			line_to(gc, sec, depth);
-			cairo_stroke(cr);
-			ends = i;
-		}
-		secs[i] = sec;
-		depths[i] = depth;
-	}
-	move_to(gc, secs[ends], depths[ends]);
-	gc->topy = 0; gc->bottomy = 1.0;
-	line_to(gc, secs[ends], 0);
-	line_to(gc, secs[0], 0);
-	cairo_close_path(cr);
 	set_source_rgba(gc, 1, 0.2, 0.2, 0.80);
-	cairo_stroke(cr);
-	/* now do it again for the neat fill */
+
+	/* Do the depth profile for the neat fill */
 	gc->topy = 0; gc->bottomy = maxdepth;
 	set_source_rgba(gc, 1, 0.2, 0.2, 0.20);
-	move_to(gc, secs[0], depths[0]);
-	for (i = 1; i <= ends; i++) {
-		line_to(gc, secs[i],depths[i]);
-	}
-	gc->topy = 0; gc->bottomy = 1.0;
-	line_to(gc, secs[ends], 0);
-	line_to(gc, secs[0], 0);
+
+	entry = pi->entry;
+	move_to(gc, 0, 0);
+	for (i = 0; i < pi->nr; i++, entry++)
+		line_to(gc, entry->sec, entry->val);
 	cairo_close_path(gc->cr);
+	if (gc->printer) {
+		set_source_rgba(gc, 1, 1, 1, 0.2);
+		cairo_fill_preserve(cr);
+		set_source_rgb(gc, 1, 1, 1);
+		cairo_stroke(cr);
+		return;
+	}
 	cairo_fill(gc->cr);
+
+	/* Now do it again for the velocity colors */
+	entry = pi->entry;
+	for (i = 1; i < pi->nr; i++) {
+		entry++;
+		sec = entry->sec;
+		/* we want to draw the segments in different colors
+		 * representing the vertical velocity, so we need to
+		 * chop this into short segments */
+		rgb_t color = rgb[entry->velocity];
+		depth = entry->val;
+		set_source_rgb(gc, color.r, color.g, color.b);
+		move_to(gc, entry[-1].sec, entry[-1].val);
+		line_to(gc, sec, depth);
+		cairo_stroke(cr);
+	}
 }
 
 static int setup_temperature_limits(struct graphics_context *gc, struct plot_info *pi)
@@ -382,12 +375,12 @@ static void plot_single_temp_text(struct graphics_context *gc, int sec, int mkel
 
 	if (output_units.temperature == FAHRENHEIT) {
 		deg = to_F(temperature);
-		unit = "F";
+		unit = UTF8_DEGREE "F";
 	} else {
 		deg = to_C(temperature);
-		unit = "C";
+		unit = UTF8_DEGREE "C";
 	}
-	plot_text(gc, &tro, sec, temperature.mkelvin, "%d %s", deg, unit);
+	plot_text(gc, &tro, sec, temperature.mkelvin, "%d%s", deg, unit);
 }
 
 static void plot_temperature_text(struct graphics_context *gc, struct plot_info *pi)
@@ -463,7 +456,7 @@ static void plot_cylinder_pressure(struct graphics_context *gc, struct plot_info
 	if (!get_cylinder_pressure_range(gc, pi))
 		return;
 
-	cairo_set_source_rgba(gc->cr, 0.2, 1.0, 0.2, 0.80);
+	set_source_rgba(gc, 0.2, 1.0, 0.2, 0.80);
 
 	move_to(gc, 0, pi->maxpressure);
 	for (i = 1; i < pi->nr; i++) {
@@ -627,7 +620,7 @@ static struct plot_info *analyze_plot_info(struct plot_info *pi)
                         /* if our samples are short and we aren't too FAST*/
 			if (entry[0].sec - entry[-1].sec < 30 && entry->velocity < FAST) { 
 				int past = -2;
-				while (pi->entry <= entry-past && entry[0].sec - entry[past].sec < 30)
+				while (i+past > 0 && entry[0].sec - entry[past].sec < 30)
 					past--;
 				entry->velocity = velocity((entry[0].val - entry[past].val) / 
 							(entry[0].sec - entry[past].sec));
@@ -750,4 +743,5 @@ void plot(struct graphics_context *gc, int w, int h, struct dive *dive)
 	cairo_close_path(gc->cr);
 	cairo_stroke(gc->cr);
 
+	free(pi);
 }