X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=profile.c;h=60b9ab9d9df85dd8cb99db3b33193a5bc9f07ae7;hb=19a1693f580223a9b4e8bd35c3980f20e69c2f13;hp=ca383a53dc865e024a27334ecdeff89a38603f6f;hpb=c487ea055d5512c7f6cc1e72e527a1ad912cbcd1;p=ext%2Fsubsurface.git

diff --git a/profile.c b/profile.c
index ca383a5..60b9ab9 100644
--- a/profile.c
+++ b/profile.c
@@ -25,6 +25,7 @@ struct plot_info {
 	int endpressure; /* start pressure better be max pressure */
 	int mintemp, maxtemp;
 	struct plot_data {
+		unsigned int same_cylinder:1;
 		int sec;
 		int pressure, temperature;
 		/* Depth info */
@@ -160,6 +161,7 @@ static void plot_text(struct graphics_context *gc, const text_render_options_t *
 static void plot_one_event(struct graphics_context *gc, struct plot_info *pi, struct event *event, const text_render_options_t *tro)
 {
 	int i, depth = 0;
+	int x,y;
 
 	for (i = 0; i < pi->nr; i++) {
 		struct plot_data *data = pi->entry + i;
@@ -167,7 +169,23 @@ static void plot_one_event(struct graphics_context *gc, struct plot_info *pi, st
 			break;
 		depth = data->val;
 	}
-	plot_text(gc, tro, event->time.seconds, depth, "%s", event->name);
+	/* draw a little tirangular marker and attach tooltip */
+	x = SCALEX(gc, event->time.seconds);
+	y = SCALEY(gc, depth);
+	set_source_rgba(gc, 1.0, 1.0, 0.1, 0.8);
+	cairo_move_to(gc->cr, x-15, y+6);
+	cairo_line_to(gc->cr, x-3  , y+6);
+	cairo_line_to(gc->cr, x-9, y-6);
+	cairo_line_to(gc->cr, x-15, y+6);
+	cairo_stroke_preserve(gc->cr);
+	cairo_fill(gc->cr);
+	set_source_rgba(gc, 0.0, 0.0, 0.0, 0.8);
+	cairo_move_to(gc->cr, x-9, y-3);
+	cairo_line_to(gc->cr, x-9, y+1);
+	cairo_move_to(gc->cr, x-9, y+4);
+	cairo_line_to(gc->cr, x-9, y+4);
+	cairo_stroke(gc->cr);
+	attach_tooltip(x-15, y-6, 12, 12, event->name);
 }
 
 static void plot_events(struct graphics_context *gc, struct plot_info *pi, struct dive *dive)
@@ -479,8 +497,7 @@ static void plot_cylinder_pressure(struct graphics_context *gc, struct plot_info
 
 	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++) {
+	for (i = 0; i < pi->nr; i++) {
 		int mbar;
 		struct plot_data *entry = pi->entry + i;
 
@@ -488,7 +505,10 @@ static void plot_cylinder_pressure(struct graphics_context *gc, struct plot_info
 		if (!mbar)
 			continue;
 		have_pressure = TRUE;
-		line_to(gc, entry->sec, mbar);
+		if (entry->same_cylinder)
+			line_to(gc, entry->sec, mbar);
+		else
+			move_to(gc, entry->sec, mbar);
 	}
 	/* if we have valid samples, we don't want to draw a line to the minpressure
 	 * but just end wherever the dive ended (think valve shutdowns during dive)
@@ -674,6 +694,7 @@ static struct plot_info *analyze_plot_info(struct plot_info *pi)
  */
 static struct plot_info *create_plot_info(struct dive *dive)
 {
+	int cylinderindex = -1;
 	int lastdepth, lastindex;
 	int i, nr = dive->samples + 4, sec;
 	size_t alloc_size = plot_info_size(nr);
@@ -694,7 +715,12 @@ static struct plot_info *create_plot_info(struct dive *dive)
 
 		sec = entry->sec = sample->time.seconds;
 		depth = entry->val = sample->depth.mm;
+
+		entry->same_cylinder = sample->cylinderindex == cylinderindex;
+		cylinderindex = sample->cylinderindex;
 		entry->pressure = sample->cylinderpressure.mbar;
+		if (!entry->same_cylinder && !entry->pressure)
+			entry->pressure = dive->cylinder[cylinderindex].start.mbar;
 		entry->temperature = sample->temperature.mkelvin;
 
 		if (depth || lastdepth)
@@ -710,6 +736,10 @@ static struct plot_info *create_plot_info(struct dive *dive)
 	i = dive->samples + 2;
 	pi->entry[i].sec = sec + 20;
 	pi->entry[i+1].sec = sec + 40;
+	if (cylinderindex >= 0) {
+		pi->entry[i].pressure = dive->cylinder[cylinderindex].end.mbar;
+		pi->entry[i].same_cylinder = 1;
+	}
 
 	pi->nr = lastindex+1;
 	pi->maxtime = pi->entry[lastindex].sec;
@@ -722,14 +752,11 @@ static struct plot_info *create_plot_info(struct dive *dive)
 	return analyze_plot_info(pi);
 }
 
-void plot(struct graphics_context *gc, int w, int h, struct dive *dive)
+void plot(struct graphics_context *gc, cairo_rectangle_int_t *drawing_area, struct dive *dive)
 {
-	double topx, topy;
 	struct plot_info *pi = create_plot_info(dive);
 
-	topx = w / 20.0;
-	topy = h / 20.0;
-	cairo_translate(gc->cr, topx, topy);
+	cairo_translate(gc->cr, drawing_area->x, drawing_area->y);
 	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);
@@ -741,8 +768,8 @@ void plot(struct graphics_context *gc, int w, int h, struct dive *dive)
 	 *
 	 * Snif. What a pity.
 	 */
-	gc->maxx = (w - 2*topx);
-	gc->maxy = (h - 2*topy);
+	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);