X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=profile.c;h=bc78ac3b4e42097be5d720fbfbe62f58a46faa8e;hb=6231b64d3de47dde9420d35ea7e6d620a3a2b966;hp=ca383a53dc865e024a27334ecdeff89a38603f6f;hpb=c487ea055d5512c7f6cc1e72e527a1ad912cbcd1;p=ext%2Fsubsurface.git diff --git a/profile.c b/profile.c index ca383a5..bc78ac3 100644 --- a/profile.c +++ b/profile.c @@ -160,6 +160,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 +168,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) @@ -722,14 +739,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 +755,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);