X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=graph.c;h=aba095ba746c5606600ce94dbe4b8ef7d5fa2b79;hb=21ba904bc046827309a340db62bc4e399ce412ac;hp=18d47dec1559510adb886796d5f8081e6327a2f8;hpb=87d5f276b14f42b09062d499ebb3f524e3aa86f3;p=fio.git diff --git a/graph.c b/graph.c index 18d47dec..aba095ba 100644 --- a/graph.c +++ b/graph.c @@ -24,18 +24,22 @@ #include #include #include +#include #include #include #include "tickmarks.h" +#include "graph.h" struct xyvalue { double x, y; + int gx, gy; }; struct graph_value { struct graph_value *next; + char *tooltip; void *value; }; @@ -46,6 +50,7 @@ struct graph_label { struct graph_label *next; double r, g, b; int value_count; + unsigned int tooltip_count; struct graph *parent; }; @@ -54,22 +59,54 @@ struct graph { char *xtitle; char *ytitle; unsigned int xdim, ydim; + double xoffset, yoffset; struct graph_label *labels; struct graph_label *tail; int per_label_limit; + const char *font; + graph_axis_unit_change_callback x_axis_unit_change_callback; + graph_axis_unit_change_callback y_axis_unit_change_callback; + double left_extra; + double right_extra; + double top_extra; + double bottom_extra; }; -struct graph *graph_new(unsigned int xdim, unsigned int ydim) +void graph_set_size(struct graph *g, unsigned int xdim, unsigned int ydim) +{ + g->xdim = xdim; + g->ydim = ydim; +} + +void graph_set_position(struct graph *g, double xoffset, double yoffset) +{ + g->xoffset = xoffset; + g->yoffset = yoffset; +} + +struct graph *graph_new(unsigned int xdim, unsigned int ydim, const char *font) { struct graph *g; g = calloc(1, sizeof(*g)); - g->xdim = xdim; - g->ydim = ydim; + graph_set_size(g, xdim, ydim); g->per_label_limit = -1; + g->font = font; + if (!g->font) + g->font = "Sans"; return g; } +void graph_x_axis_unit_change_notify(struct graph *g, graph_axis_unit_change_callback f) +{ + g->x_axis_unit_change_callback = f; +} + +void graph_y_axis_unit_change_notify(struct graph *g, graph_axis_unit_change_callback f) +{ + g->y_axis_unit_change_callback = f; +} + static int count_labels(struct graph_label *labels) { int count = 0; @@ -182,33 +219,70 @@ static void draw_bars(struct graph *bg, cairo_t *cr, struct graph_label *lb, } } -static void draw_centered_text(cairo_t *cr, double x, double y, - double fontsize, const char *text) +static void draw_aligned_text(struct graph *g, cairo_t *cr, double x, double y, + double fontsize, const char *text, int alignment) { +#define CENTERED 0 +#define LEFT_JUSTIFIED 1 +#define RIGHT_JUSTIFIED 2 + + double factor, direction; cairo_text_extents_t extents; - cairo_select_font_face (cr, "Sans", - CAIRO_FONT_SLANT_NORMAL, - CAIRO_FONT_WEIGHT_NORMAL); + switch(alignment) { + case CENTERED: + direction = -1.0; + factor = 0.5; + break; + case RIGHT_JUSTIFIED: + direction = -1.0; + factor = 1.0; + break; + case LEFT_JUSTIFIED: + default: + direction = 1.0; + factor = 1.0; + break; + } + cairo_select_font_face (cr, g->font, CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL); cairo_set_font_size(cr, fontsize); cairo_text_extents(cr, text, &extents); - x = x - (extents.width / 2 + extents.x_bearing); + x = x + direction * (factor * extents.width + extents.x_bearing); y = y - (extents.height / 2 + extents.y_bearing); cairo_move_to(cr, x, y); cairo_show_text(cr, text); } -static void draw_vertical_centered_text(cairo_t *cr, double x, double y, - double fontsize, const char *text) +static inline void draw_centered_text(struct graph *g, cairo_t *cr, double x, double y, + double fontsize, const char *text) +{ + draw_aligned_text(g, cr, x, y, fontsize, text, CENTERED); +} + +static inline void draw_right_justified_text(struct graph *g, cairo_t *cr, + double x, double y, + double fontsize, const char *text) +{ + draw_aligned_text(g, cr, x, y, fontsize, text, RIGHT_JUSTIFIED); +} + +static inline void draw_left_justified_text(struct graph *g, cairo_t *cr, + double x, double y, + double fontsize, const char *text) +{ + draw_aligned_text(g, cr, x, y, fontsize, text, LEFT_JUSTIFIED); +} + +static void draw_vertical_centered_text(struct graph *g, cairo_t *cr, double x, + double y, double fontsize, + const char *text) { double sx, sy; cairo_text_extents_t extents; - cairo_select_font_face (cr, "Sans", - CAIRO_FONT_SLANT_NORMAL, - CAIRO_FONT_WEIGHT_NORMAL); + cairo_select_font_face(cr, g->font, CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL); cairo_set_font_size(cr, fontsize); cairo_text_extents(cr, text, &extents); @@ -230,19 +304,12 @@ static void graph_draw_common(struct graph *g, cairo_t *cr, double *x1, double *y1, double *x2, double *y2) { cairo_set_source_rgb(cr, 0, 0, 0); - cairo_set_line_width (cr, 1.0); + cairo_set_line_width (cr, 0.8); - cairo_move_to(cr, 0, 0); - cairo_line_to(cr, 0, g->ydim); - cairo_line_to(cr, g->xdim, g->ydim); - cairo_line_to(cr, g->xdim, 0); - cairo_line_to(cr, 0, 0); - - /* for now just set margins at 10% of width. This is not very good. */ - *x1 = g->xdim / 10.0; - *x2 = 9.0 * *x1; - *y1 = g->ydim / 10.0; - *y2 = 9.0 * *y1; + *x1 = 0.15 * g->xdim; + *x2 = 0.95 * g->xdim; + *y1 = 0.10 * g->ydim; + *y2 = 0.90 * g->ydim; cairo_move_to(cr, *x1, *y1); cairo_line_to(cr, *x1, *y2); @@ -251,9 +318,9 @@ static void graph_draw_common(struct graph *g, cairo_t *cr, cairo_line_to(cr, *x1, *y1); cairo_stroke(cr); - draw_centered_text(cr, g->xdim / 2, g->ydim / 20, 20.0, g->title); - draw_centered_text(cr, g->xdim / 2, g->ydim * 0.97, 14.0, g->xtitle); - draw_vertical_centered_text(cr, g->xdim * 0.02, g->ydim / 2, 14.0, g->ytitle); + draw_centered_text(g, cr, g->xdim / 2, g->ydim / 20, 20.0, g->title); + draw_centered_text(g, cr, g->xdim / 2, g->ydim * 0.97, 14.0, g->xtitle); + draw_vertical_centered_text(g, cr, g->xdim * 0.02, g->ydim / 2, 14.0, g->ytitle); cairo_stroke(cr); } @@ -263,10 +330,13 @@ static void graph_draw_x_ticks(struct graph *g, cairo_t *cr, { struct tickmark *tm; double tx; - int i; + int i, power_of_ten; static double dash[] = { 1.0, 2.0 }; - nticks = calc_tickmarks(minx, maxx, nticks, &tm); + nticks = calc_tickmarks(minx, maxx, nticks, &tm, &power_of_ten, + g->x_axis_unit_change_callback == NULL); + if (g->x_axis_unit_change_callback) + g->x_axis_unit_change_callback(g, power_of_ten); for (i = 0; i < nticks; i++) { tx = (((tm[i].value) - minx) / (maxx - minx)) * (x2 - x1) + x1; @@ -274,7 +344,7 @@ static void graph_draw_x_ticks(struct graph *g, cairo_t *cr, continue; /* Draw tick mark */ - cairo_set_line_width(cr, 1.0); + cairo_set_line_width(cr, 0.8); cairo_move_to(cr, tx, y2); cairo_line_to(cr, tx, y2 + (y2 - y1) * 0.03); cairo_stroke(cr); @@ -289,7 +359,7 @@ static void graph_draw_x_ticks(struct graph *g, cairo_t *cr, cairo_restore(cr); /* draw tickmark label */ - draw_centered_text(cr, tx, y2 * 1.04, 12.0, tm[i].string); + draw_centered_text(g, cr, tx, y2 * 1.04, 12.0, tm[i].string); cairo_stroke(cr); } @@ -301,10 +371,13 @@ static void graph_draw_y_ticks(struct graph *g, cairo_t *cr, { struct tickmark *tm; double ty; - int i; + int i, power_of_ten; static double dash[] = { 2.0, 2.0 }; - nticks = calc_tickmarks(miny, maxy, nticks, &tm); + nticks = calc_tickmarks(miny, maxy, nticks, &tm, &power_of_ten, + g->y_axis_unit_change_callback == NULL); + if (g->y_axis_unit_change_callback) + g->y_axis_unit_change_callback(g, power_of_ten); for (i = 0; i < nticks; i++) { ty = y2 - (((tm[i].value) - miny) / (maxy - miny)) * (y2 - y1); @@ -325,7 +398,7 @@ static void graph_draw_y_ticks(struct graph *g, cairo_t *cr, cairo_restore(cr); /* draw tickmark label */ - draw_centered_text(cr, x1 - (x2 - x1) * 0.04, ty, 12.0, tm[i].string); + draw_right_justified_text(g, cr, x1 - (x2 - x1) * 0.025, ty, 12.0, tm[i].string); cairo_stroke(cr); } } @@ -339,6 +412,7 @@ void bar_graph_draw(struct graph *bg, cairo_t *cr) struct graph_label *lb; cairo_save(cr); + cairo_translate(cr, bg->xoffset, bg->yoffset); graph_draw_common(bg, cr, &x1, &y1, &x2, &y2); nlabels = count_labels(bg->labels); @@ -348,7 +422,7 @@ void bar_graph_draw(struct graph *bg, cairo_t *cr) maxdata = find_max_data(bg->labels); if (fabs(maxdata - mindata) < 1e-20) { - draw_centered_text(cr, + draw_centered_text(bg, cr, x1 + (x2 - x1) / 2.0, y1 + (y2 - y1) / 2.0, 20.0, "No good data"); return; @@ -364,7 +438,7 @@ void bar_graph_draw(struct graph *bg, cairo_t *cr) label_offset = bg->xdim * 0.1 + space_per_label * (double) i + space_per_label * 0.1; draw_bars(bg, cr, lb, label_offset, bar_width, mindata, maxdata); // draw_centered_text(cr, label_offset + (bar_width / 2.0 + bar_width * 0.1), bg->ydim * 0.93, - draw_centered_text(cr, x1 + space_per_label * (i + 0.5), bg->ydim * 0.93, + draw_centered_text(bg, cr, x1 + space_per_label * (i + 0.5), bg->ydim * 0.93, 12.0, lb->label); i++; } @@ -391,10 +465,15 @@ static double find_xy_value(struct graph *g, xy_value_extractor getvalue, double double tmp, answer = 0.0; struct graph_label *i; struct graph_value *j; + int first = 1; for (i = g->labels; i; i = i->next) for (j = i->values; j; j = j->next) { tmp = getvalue(j); + if (first) { + first = 0; + answer = tmp; + } answer = cmp(tmp, answer); } return answer; @@ -403,13 +482,14 @@ static double find_xy_value(struct graph *g, xy_value_extractor getvalue, double void line_graph_draw(struct graph *g, cairo_t *cr) { double x1, y1, x2, y2; - double minx, miny, maxx, maxy; - double tx, ty; + double minx, miny, maxx, maxy, gminx, gminy, gmaxx, gmaxy; + double tx, ty, top_extra, bottom_extra, left_extra, right_extra; struct graph_label *i; struct graph_value *j; - int first = 1; + int good_data = 1, first = 1; cairo_save(cr); + cairo_translate(cr, g->xoffset, g->yoffset); graph_draw_common(g, cr, &x1, &y1, &x2, &y2); minx = find_xy_value(g, getx, mindouble); @@ -418,32 +498,64 @@ void line_graph_draw(struct graph *g, cairo_t *cr) maxy = find_xy_value(g, gety, maxdouble); if (fabs(maxx - minx) < 1e-20 || fabs(maxy - miny) < 1e-20) { - draw_centered_text(cr, - x1 + (x2 - x1) / 2.0, - y1 + (y2 - y1) / 2.0, 20.0, "No good Data"); - return; + good_data = 0; + minx = 0.0; + miny = 0.0; + maxx = 10.0; + maxy = 100.0; } - graph_draw_x_ticks(g, cr, x1, y1, x2, y2, minx, maxx, 10); - graph_draw_y_ticks(g, cr, x1, y1, x2, y2, miny, maxy, 10); + top_extra = 0.0; + bottom_extra = 0.0; + left_extra = 0.0; + right_extra = 0.0; + + if (g->top_extra > 0.001) + top_extra = fabs(maxy - miny) * g->top_extra; + if (g->bottom_extra > 0.001) + bottom_extra = fabs(maxy - miny) * g->bottom_extra; + if (g->left_extra > 0.001) + left_extra = fabs(maxx - minx) * g->left_extra; + if (g->right_extra > 0.001) + right_extra = fabs(maxx - minx) * g->right_extra; + + gminx = minx - left_extra; + gmaxx = maxx + right_extra; + gminy = miny - bottom_extra; + gmaxy = maxy + top_extra; + + graph_draw_x_ticks(g, cr, x1, y1, x2, y2, gminx, gmaxx, 10); + graph_draw_y_ticks(g, cr, x1, y1, x2, y2, gminy, gmaxy, 10); + + if (!good_data) + goto skip_data; - cairo_set_line_width(cr, 2.5); + cairo_set_line_width(cr, 1.5); for (i = g->labels; i; i = i->next) { first = 1; + if (i->r < 0) /* invisible data */ + continue; cairo_set_source_rgb(cr, i->r, i->g, i->b); for (j = i->values; j; j = j->next) { - tx = ((getx(j) - minx) / (maxx - minx)) * (x2 - x1) + x1; - ty = y2 - ((gety(j) - miny) / (maxy - miny)) * (y2 - y1); + struct xyvalue *xy = j->value; + + tx = ((getx(j) - gminx) / (gmaxx - gminx)) * (x2 - x1) + x1; + ty = y2 - ((gety(j) - gminy) / (gmaxy - gminy)) * (y2 - y1); if (first) { cairo_move_to(cr, tx, ty); first = 0; } else { cairo_line_to(cr, tx, ty); } + xy->gx = tx; + xy->gy = ty; } cairo_stroke(cr); } + +skip_data: cairo_restore(cr); + } static void gfree(void *f) @@ -502,12 +614,17 @@ void graph_add_label(struct graph *bg, const char *label) bg->tail = i; } -static void graph_label_add_value(struct graph_label *i, void *value) +static void graph_label_add_value(struct graph_label *i, void *value, + const char *tooltip) { struct graph_value *x; x = malloc(sizeof(*x)); x->value = value; + if (tooltip) + x->tooltip = strdup(tooltip); + else + x->tooltip = NULL; x->next = NULL; if (!i->tail) { i->values = x; @@ -516,14 +633,33 @@ static void graph_label_add_value(struct graph_label *i, void *value) } i->tail = x; i->value_count++; + if (x->tooltip) + i->tooltip_count++; if (i->parent->per_label_limit != -1 && i->value_count > i->parent->per_label_limit) { - x = i->values; - i->values = i->values->next; - free(x->value); - free(x); - i->value_count--; + int to_drop = 1; + + /* + * If the limit was dynamically reduced, making us more + * than 1 entry ahead after adding this one, drop two + * entries. This will make us (eventually) reach the + * specified limit. + */ + if (i->value_count - i->parent->per_label_limit >= 2) + to_drop = 2; + + while (to_drop--) { + x = i->values; + i->values = i->values->next; + if (x->tooltip) { + free(x->tooltip); + i->tooltip_count--; + } + free(x->value); + free(x); + i->value_count--; + } } } @@ -538,12 +674,12 @@ int graph_add_data(struct graph *bg, const char *label, const double value) i = graph_find_label(bg, label); if (!i) return -1; - graph_label_add_value(i, d); + graph_label_add_value(i, d, NULL); return 0; } int graph_add_xy_data(struct graph *bg, const char *label, - const double x, const double y) + const double x, const double y, const char *tooltip) { struct graph_label *i; struct xyvalue *xy; @@ -555,7 +691,8 @@ int graph_add_xy_data(struct graph *bg, const char *label, i = graph_find_label(bg, label); if (!i) return -1; - graph_label_add_value(i, xy); + + graph_label_add_value(i, xy, tooltip); return 0; } @@ -587,16 +724,22 @@ void graph_set_color(struct graph *gr, const char *label, struct graph_label *i; double r, g, b; - r = fabs(red); - g = fabs(green); - b = fabs(blue); - - if (r > 1.0) - r = 1.0; - if (g > 1.0) - g = 1.0; - if (b > 1.0) - b =1.0; + if (red < 0.0) { /* invisible color */ + r = -1.0; + g = -1.0; + b = -1.0; + } else { + r = fabs(red); + g = fabs(green); + b = fabs(blue); + + if (r > 1.0) + r = 1.0; + if (g > 1.0) + g = 1.0; + if (b > 1.0) + b =1.0; + } for (i = gr->labels; i; i = i->next) if (strcmp(i->label, label) == 0) { @@ -624,3 +767,57 @@ void line_graph_set_data_count_limit(struct graph *g, int per_label_limit) g->per_label_limit = per_label_limit; } +void graph_add_extra_space(struct graph *g, double left_percent, double right_percent, + double top_percent, double bottom_percent) +{ + g->left_extra = left_percent; + g->right_extra = right_percent; + g->top_extra = top_percent; + g->bottom_extra = bottom_percent; +} + +int graph_has_tooltips(struct graph *g) +{ + struct graph_label *i; + + for (i = g->labels; i; i = i->next) + if (i->tooltip_count) + return 1; + + return 0; +} + +int graph_contains_xy(struct graph *g, int x, int y) +{ + int first_x = g->xoffset; + int last_x = g->xoffset + g->xdim; + int first_y = g->yoffset; + int last_y = g->yoffset + g->ydim; + + return (x >= first_x && x <= last_x) && (y >= first_y && y <= last_y); +} + +static int xy_match(struct xyvalue *xy, int x, int y) +{ + int xdiff = abs(xy->gx - x); + int ydiff = abs(xy->gy - y); + + return xdiff <= 20 && ydiff <= 10; +} + +const char *graph_find_tooltip(struct graph *g, int x, int y) +{ + struct graph_label *i; + struct graph_value *j; + + for (i = g->labels; i; i = i->next) { + for (j = i->values; j; j = j->next) { + struct xyvalue *xy = j->value; + + if (xy_match(xy, x - g->xoffset, y)) + return j->tooltip; + } + } + + return NULL; +}