X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=acre.c;h=cec8a2f2532a528ffdc32e6b1a9c0c227d1df68d;hb=3c7d4a2c642dea29982dadd700542549ac09be14;hp=1b238fdb33babc5471f818e886b9b708ca9790f0;hpb=3651b8c6038a7414e088d4263f67bf6efd87d2bd;p=acre diff --git a/acre.c b/acre.c index 1b238fd..cec8a2f 100644 --- a/acre.c +++ b/acre.c @@ -25,6 +25,7 @@ #include "xmalloc.h" #include +#include #include typedef struct _acre_data_point_2d { @@ -89,6 +90,11 @@ acre_create (void) acre->data_size = 0; acre->num_data = 0; + acre->chart.x = 0; + acre->chart.y = 0; + acre->chart.width = 0; + acre->chart.height = 0; + return acre; } @@ -157,6 +163,8 @@ acre_add_data (acre_t *acre, acre_data_t *data) #define ACRE_TITLE_FONT_SIZE 32 #define ACRE_PAD (ACRE_FONT_SIZE) #define ACRE_TICK_SIZE 6 +#define ACRE_X_TICK_VALUE_PAD 2 +#define ACRE_Y_TICK_VALUE_PAD 4 static PangoLayout * _create_layout (acre_t *acre, const char *text) @@ -171,6 +179,42 @@ _create_layout (acre_t *acre, const char *text) return layout; } +#define PRINTF_FORMAT(fmt_index, va_index) __attribute__ ((__format__(__printf__, fmt_index, va_index))) + +static PangoLayout * +_create_layout_vprintf (acre_t *acre, const char *fmt, va_list ap) +{ + PangoLayout *layout; + char *text; + + vasprintf (&text, fmt, ap); + + layout = _create_layout (acre, text); + + free (text); + + return layout; +} + +static PangoLayout * +_create_layout_printf (acre_t *acre, const char *fmt, ...) + PRINTF_FORMAT (2, 3); + +static PangoLayout * +_create_layout_printf (acre_t *acre, const char *fmt, ...) +{ + va_list ap; + PangoLayout *layout; + + va_start (ap, fmt); + + layout = _create_layout_vprintf (acre, fmt, ap); + + va_end (ap); + + return layout; +} + static void _destroy_layout (PangoLayout *layout) { @@ -191,6 +235,8 @@ _draw_title_and_labels (acre_t *acre) cairo_t *cr = acre->cr; PangoFontDescription *title_font; PangoLayout *title_layout, *x_axis_layout, *y_axis_layout; + PangoLayout *min_y, *max_y; + int min_y_width, max_y_width, y_axis_value_width; int title_width, title_height; int x_axis_width, x_axis_height; int y_axis_width, y_axis_height; @@ -214,14 +260,22 @@ _draw_title_and_labels (acre_t *acre) x_axis_layout = _create_layout (acre, acre->x_axis.label); y_axis_layout = _create_layout (acre, acre->y_axis.label); + min_y = _create_layout_printf (acre, "%g", + round (acre->y_axis.min)); + max_y = _create_layout_printf (acre, "%g", + round (acre->y_axis.max)); + + pango_layout_get_pixel_size (min_y, &min_y_width, NULL); + pango_layout_get_pixel_size (max_y, &max_y_width, NULL); + y_axis_value_width = MAX (min_y_width, max_y_width); + + _destroy_layout (min_y); + _destroy_layout (max_y); + /* Iterate with the layout of the title and axis labels until they * are stable, (this requires iteration since we don't know what * to set their widths to in advance due to the wrapping of the * other elements). */ - acre->chart.x = 0; - acre->chart.y = 0; - acre->chart.width = acre->width; - acre->chart.height = acre->height; while (1) { pango_layout_set_width (title_layout, acre->chart.width * PANGO_SCALE); pango_layout_set_width (x_axis_layout, acre->chart.width * PANGO_SCALE); @@ -232,11 +286,13 @@ _draw_title_and_labels (acre_t *acre) pango_layout_get_pixel_size (y_axis_layout, &y_axis_width, &y_axis_height); new_chart.x = ACRE_PAD + y_axis_height + - ACRE_PAD + ACRE_FONT_SIZE; + ACRE_PAD + y_axis_value_width + ACRE_Y_TICK_VALUE_PAD; new_chart.width = acre->width - acre->chart.x - ACRE_PAD; new_chart.y = ACRE_PAD + title_height + ACRE_PAD; - new_chart.height = acre->height - acre->chart.y - (ACRE_FONT_SIZE + ACRE_PAD + x_axis_height + ACRE_PAD); + new_chart.height = acre->height - acre->chart.y - + (ACRE_X_TICK_VALUE_PAD + ACRE_FONT_SIZE + + ACRE_PAD + x_axis_height + ACRE_PAD); if (new_chart.x == acre->chart.x && new_chart.y == acre->chart.y && @@ -358,6 +414,11 @@ _compute_axis_ranges (acre_t *acre) double x_adjust, y_adjust; cairo_t *cr = acre->cr; + acre->x_axis.min = acre->data[0]->points[0].x; + acre->x_axis.max = acre->data[0]->points[0].x; + acre->y_axis.min = acre->data[0]->points[0].y; + acre->y_axis.min = acre->data[0]->points[0].y; + /* First, simply find the extrema of the data. */ for (d = 0; d < acre->num_data; d++) { data = acre->data[d]; @@ -477,15 +538,12 @@ _draw_frame_and_ticks (acre_t *acre) cairo_save (cr); { PangoLayout *layout; - char *label; int width, height; - asprintf (&label, "%g", x); - layout = _create_layout (acre, label); - free (label); + layout = _create_layout_printf (acre, "%g", x); cairo_move_to (cr, x, acre->y_axis.min); cairo_identity_matrix (cr); pango_layout_get_pixel_size (layout, &width, &height); - cairo_rel_move_to (cr, -width / 2, 2); + cairo_rel_move_to (cr, -width / 2, ACRE_X_TICK_VALUE_PAD); _show_layout (cr, layout); } cairo_restore (cr); @@ -515,15 +573,13 @@ _draw_frame_and_ticks (acre_t *acre) cairo_save (cr); { PangoLayout *layout; - char *label; int width, height; - asprintf (&label, "%g", y); - layout = _create_layout (acre, label); - free (label); + layout = _create_layout_printf (acre, "%g", y); cairo_move_to (cr, acre->x_axis.min, y); cairo_identity_matrix (cr); pango_layout_get_pixel_size (layout, &width, &height); - cairo_rel_move_to (cr, -width-2, -height/2); + cairo_rel_move_to (cr, -width - ACRE_Y_TICK_VALUE_PAD, + -height/2); _show_layout (cr, layout); } cairo_restore (cr); @@ -553,17 +609,25 @@ void acre_draw (acre_t *acre, cairo_t *cr, int width, int height) { acre->cr = cr; + acre->width = width; acre->height = height; + acre->chart.width = width; + acre->chart.height = height; + cairo_save (cr); cairo_set_source_rgb (cr, 1, 1, 1); - cairo_paint (cr); + /* We compute the axis ranges before doing label layout so that we + * can account for the width of the y-axis value labels. */ + _compute_axis_ranges (acre); _draw_title_and_labels (acre); + /* And we recompute the axis ranges now that the title and axis + * label space is all measured and accounted for. */ _compute_axis_ranges (acre); _draw_data (acre);