X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fcairo-chart.c;h=db8eb67ecf45f65625bb2df0229a8b3335d6a17e;hb=dc0e37529d185a9848b0e53d424d40239d195c8c;hp=dd0cd0563b42e5854cbc1908426681528f60770a;hpb=fce028c380d496e42823fd24774e0159ed7cc110;p=pspp diff --git a/src/output/cairo-chart.c b/src/output/cairo-chart.c index dd0cd0563b..db8eb67ecf 100644 --- a/src/output/cairo-chart.c +++ b/src/output/cairo-chart.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2004, 2009, 2010, 2011 Free Software Foundation, Inc. + Copyright (C) 2004, 2009, 2010, 2011, 2014, 2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,6 +17,7 @@ #include #include "output/cairo-chart.h" +#include "math/chart-geometry.h" #include #include @@ -46,7 +47,7 @@ xrchart_geometry_init (cairo_t *cr, struct xrchart_geometry *geom, { /* Set default chart geometry. */ geom->axis[SCALE_ORDINATE].data_max = 0.900 * length; - geom->axis[SCALE_ORDINATE].data_min = 0.120 * length; + geom->axis[SCALE_ORDINATE].data_min = 0.200 * length; geom->axis[SCALE_ABSCISSA].data_min = 0.150 * width; geom->axis[SCALE_ABSCISSA].data_max = 0.800 * width; @@ -60,9 +61,7 @@ xrchart_geometry_init (cairo_t *cr, struct xrchart_geometry *geom, geom->dataset = NULL; geom->n_datasets = 0; - geom->fill_colour.red = 255; - geom->fill_colour.green = 0; - geom->fill_colour.blue = 0; + geom->fill_colour = data_colour[0]; cairo_set_line_width (cr, 1.0); @@ -100,19 +99,42 @@ pango_layout_get_baseline (PangoLayout *layout) } #endif - - +/* + These colours come from: + http://tango.freedesktop.org/static/cvs/tango-art-tools/palettes/Tango-Palette.gpl */ const struct xrchart_colour data_colour[XRCHART_N_COLOURS] = { - { 165, 42, 42 }, /* brown */ - { 255, 0, 0 }, /* red */ - { 255, 165, 0 }, /* orange */ - { 255, 255, 0 }, /* yellow */ - { 0, 255, 0 }, /* green */ - { 0, 0, 255 }, /* blue */ - { 238, 130, 238 }, /* violet */ - { 190, 190, 190 }, /* grey */ - { 255, 192, 203 }, /* pink */ + {252, 233, 79}, /* Butter 1 */ + {138, 226, 52}, /* Chameleon 1 */ + {252, 175, 62}, /* Orange 1 */ + {114, 159, 207}, /* Sky Blue 1 */ + {173, 127, 168}, /* Plum 1 */ + {233, 185, 110}, /* Chocolate 1 */ + {239, 41, 41}, /* Scarlet Red 1 */ + {238, 238, 236}, /* Aluminium 1 */ + + {237, 212, 0}, /* Butter 2 */ + {115, 210, 22}, /* Chameleon 2 */ + {245, 121, 0}, /* Orange 2 */ + {52, 101, 164}, /* Sky Blue 2 */ + {117, 80, 123}, /* Plum 2 */ + {193, 125, 17}, /* Chocolate 2 */ + {204, 0, 0}, /* Scarlet Red 2 */ + + {136, 138, 133}, /* Aluminium 4 */ + + {196, 160, 0}, /* Butter 3 */ + {78, 154, 6}, /* Chameleon 3 */ + {206, 92, 0}, /* Orange 3 */ + {32, 74, 135}, /* Sky Blue 3 */ + {92, 53, 102}, /* Plum 3 */ + {143, 89, 2}, /* Chocolate 3 */ + {164, 0, 0}, /* Scarlet Red 3 */ + {85, 87, 83}, /* Aluminium 5 */ + + {211, 215, 207}, /* Aluminium 2 */ + {186, 189, 182}, /* Aluminium 3 */ + {46, 52, 54}, /* Aluminium 6 */ }; void @@ -156,7 +178,7 @@ xrchart_label_rotate (cairo_t *cr, int horz_justify, int vert_justify, PangoLayout *layout; double x, y; - desc = pango_font_description_from_string ("sans serif"); + desc = pango_font_description_from_string ("Sans"); if (desc == NULL) { cairo_new_path (cr); @@ -173,7 +195,7 @@ xrchart_label_rotate (cairo_t *cr, int horz_justify, int vert_justify, layout = pango_cairo_create_layout (cr); pango_layout_set_font_description (layout, desc); - pango_layout_set_text (layout, string, -1); + pango_layout_set_markup (layout, string, -1); if (horz_justify != 'l') { int width_pango; @@ -287,15 +309,13 @@ draw_tick_internal (cairo_t *cr, const struct xrchart_geometry *geom, if (orientation == SCALE_ABSCISSA) { - if ( rotated) + if ( rotated) xrchart_label_rotate (cr, 'l', 'c', geom->font_size, s, -G_PI_4); else xrchart_label (cr, 'c', 't', geom->font_size, s); } else if (orientation == SCALE_ORDINATE) { - if (fabs (position) < DBL_EPSILON) - cairo_rel_move_to (cr, 0, 10); xrchart_label (cr, 'r', 'c', geom->font_size, s); } } @@ -322,48 +342,98 @@ xrchart_write_title (cairo_t *cr, const struct xrchart_geometry *geom, cairo_restore (cr); } +static void +xrchart_text_extents (cairo_t *cr, const struct xrchart_geometry *geom, + const char *utf8, + double *width, double *height) +{ + PangoFontDescription *desc; + PangoLayout *layout; + int width_pango; + int height_pango; + desc = pango_font_description_from_string ("Sans"); + if (desc == NULL) + return; + pango_font_description_set_absolute_size (desc, geom->font_size * PANGO_SCALE); + layout = pango_cairo_create_layout (cr); + pango_layout_set_font_description (layout, desc); + pango_layout_set_markup (layout, utf8, -1); + pango_layout_get_size (layout, &width_pango, &height_pango); + *width = (double) width_pango / PANGO_SCALE; + *height = (double) height_pango / PANGO_SCALE; + g_object_unref (layout); + pango_font_description_free (desc); +} static void xrchart_write_scale (cairo_t *cr, struct xrchart_geometry *geom, - double smin, double smax, int ticks, enum tick_orientation orient) + double smin, double smax, enum tick_orientation orient) { int s; + int ticks; + + double interval; + double lower; + double upper; + double tickscale; + char *tick_format_string; + bool tickoversize = false; + + chart_get_scale (smax, smin, &lower, &interval, &ticks); - const double tick_interval = - chart_rounded_tick ((smax - smin) / (double) ticks); + tick_format_string = chart_get_ticks_format (lower, interval, ticks, &tickscale); - int upper = ceil (smax / tick_interval); - int lower = floor (smin / tick_interval); + upper = lower + interval * (ticks+1); - geom->axis[orient].max = tick_interval * upper; - geom->axis[orient].min = tick_interval * lower; + geom->axis[orient].max = upper; + geom->axis[orient].min = lower; - geom->axis[orient].scale = (fabs (geom->axis[orient].data_max - geom->axis[orient].data_min) - / fabs (geom->axis[orient].max - geom->axis[orient].min)); + struct xrchart_axis *axis = &geom->axis[orient]; + geom->axis[orient].scale = (fabs ((double) axis->data_max - axis->data_min) + / fabs (axis->max - axis->min)); - for (s = 0 ; s < upper - lower; ++s) + if (orient == SCALE_ABSCISSA) { - double pos = (s + lower) * tick_interval; - draw_tick (cr, geom, orient, false, - s * tick_interval * geom->axis[orient].scale, "%g", pos); + char *test_text; + double lower_txt_width, upper_txt_width, unused, width; + test_text = xasprintf(tick_format_string, upper*tickscale); + xrchart_text_extents (cr, geom, test_text, &upper_txt_width, &unused); + free(test_text); + test_text = xasprintf(tick_format_string, lower*tickscale); + xrchart_text_extents (cr, geom, test_text, &lower_txt_width, &unused); + free(test_text); + width = MAX(lower_txt_width, upper_txt_width); + tickoversize = width > 0.9 * + ((double)(geom->axis[SCALE_ABSCISSA].data_max - geom->axis[SCALE_ABSCISSA].data_min))/(ticks+1); } + + double pos = lower; + + for (s = 0 ; s <= ticks; ++s) + { + draw_tick (cr, geom, orient, tickoversize, + s * interval * geom->axis[orient].scale, + tick_format_string, pos*tickscale); + pos += interval; + } + free(tick_format_string); } /* Set the scale for the ordinate */ void xrchart_write_yscale (cairo_t *cr, struct xrchart_geometry *geom, - double smin, double smax, int ticks) + double smin, double smax) { - xrchart_write_scale (cr, geom, smin, smax, ticks, SCALE_ORDINATE); + xrchart_write_scale (cr, geom, smin, smax, SCALE_ORDINATE); } /* Set the scale for the abscissa */ void xrchart_write_xscale (cairo_t *cr, struct xrchart_geometry *geom, - double smin, double smax, int ticks) + double smin, double smax) { - xrchart_write_scale (cr, geom, smin, smax, ticks, SCALE_ABSCISSA); + xrchart_write_scale (cr, geom, smin, smax, SCALE_ABSCISSA); } @@ -464,7 +534,7 @@ xrchart_datum (cairo_t *cr, const struct xrchart_geometry *geom, double x_pos = (x - geom->axis[SCALE_ABSCISSA].min) * geom->axis[SCALE_ABSCISSA].scale + geom->axis[SCALE_ABSCISSA].data_min; double y_pos = (y - geom->axis[SCALE_ORDINATE].min) * geom->axis[SCALE_ORDINATE].scale + geom->axis[SCALE_ORDINATE].data_min; - xrchart_draw_marker (cr, x_pos, y_pos, XRMARKER_SQUARE, 15); + xrchart_draw_marker (cr, x_pos, y_pos, XRMARKER_CIRCLE, 10); } void @@ -533,3 +603,4 @@ xrchart_line(cairo_t *cr, const struct xrchart_geometry *geom, cairo_line_to (cr, x2, y2); cairo_stroke (cr); } +