X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=profile.c;h=822e30c0e11e5c217e84235578cfde08b6445fdb;hb=565736a471e9ba66cbc68ce76c90d5e0c2fa57cf;hp=c7d945f14060d5f1e48052c89c01b1fe27ba1154;hpb=b65f8230daca1bca34496f6281ecc0dbe70b0724;p=ext%2Fsubsurface.git

diff --git a/profile.c b/profile.c
index c7d945f..822e30c 100644
--- a/profile.c
+++ b/profile.c
@@ -168,9 +168,10 @@ static void dump_pi (struct plot_info *pi)
 		pi->maxpressure, pi->mintemp, pi->maxtemp);
 	for (i = 0; i < pi->nr; i++)
 		printf("    entry[%d]:{same_cylinder:%d cylinderindex:%d sec:%d pressure:{%d,%d}\n"
-			"                temperature:%d depth:%d smoothed:%d}\n",
+			"                time:%d:%02d temperature:%d depth:%d smoothed:%d}\n",
 			i, pi->entry[i].same_cylinder, pi->entry[i].cylinderindex, pi->entry[i].sec,
 			pi->entry[i].pressure[0], pi->entry[i].pressure[1],
+			pi->entry[i].sec / 60, pi->entry[i].sec % 60,
 			pi->entry[i].temperature, pi->entry[i].depth, pi->entry[i].smoothed);
 	printf("   }\n");
 }
@@ -528,15 +529,8 @@ static void plot_depth_profile(struct graphics_context *gc, struct plot_info *pi
 	for (i = 0; i < pi->nr; i++, entry++)
 		line_to(gc, entry->sec, entry->depth);
 	cairo_close_path(gc->cr);
-/*
-	if (gc->printer) {
-		set_source_rgba(gc, DEPTH_FILL_PRINTER);
-		cairo_fill_preserve(cr);
-		set_source_rgba(gc, DEPTH_STROKE_PRINTER);
-		cairo_stroke(cr);
-		return;
-	}
-*/	cairo_fill(gc->cr);
+
+	cairo_fill(gc->cr);
 
 	/* Now do it again for the velocity colors */
 	entry = pi->entry;
@@ -1389,13 +1383,13 @@ void plot(struct graphics_context *gc, cairo_rectangle_int_t *drawing_area, stru
 	gc->maxx = (drawing_area->width - 2*drawing_area->x);
 	gc->maxy = (drawing_area->height - 2*drawing_area->y);
 
-	/* Temperature profile */
-	plot_temperature_profile(gc, pi);
-
 	/* Depth profile */
 	plot_depth_profile(gc, pi);
 	plot_events(gc, pi, dive);
 
+	/* Temperature profile */
+	plot_temperature_profile(gc, pi);
+
 	/* Cylinder pressure plot */
 	plot_cylinder_pressure(gc, pi, dive);