/* PSPP - a program for statistical analysis.
- Copyright (C) 2004, 2009, 2010, 2011, 2014 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
#include <config.h>
#include "output/cairo-chart.h"
+#include "math/chart-geometry.h"
#include <assert.h>
#include <cairo/cairo.h>
{
/* 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;
}
#endif
-/*
- These colours come from:
+/*
+ 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] =
{
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);
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;
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);
}
}
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;
- const double tick_interval =
- chart_rounded_tick ((smax - smin) / (double) ticks);
+ chart_get_scale (smax, smin, &lower, &interval, &ticks);
- int upper = ceil (smax / tick_interval);
- int lower = floor (smin / tick_interval);
+ tick_format_string = chart_get_ticks_format (lower, interval, ticks, &tickscale);
- geom->axis[orient].max = tick_interval * upper;
- geom->axis[orient].min = tick_interval * lower;
+ upper = lower + interval * (ticks+1);
- geom->axis[orient].scale = (fabs (geom->axis[orient].data_max - geom->axis[orient].data_min)
- / fabs (geom->axis[orient].max - geom->axis[orient].min));
+ geom->axis[orient].max = upper;
+ geom->axis[orient].min = lower;
- for (s = 0 ; s < upper - lower; ++s)
+ struct xrchart_axis *axis = &geom->axis[orient];
+ geom->axis[orient].scale = (fabs ((double) axis->data_max - axis->data_min)
+ / fabs (axis->max - axis->min));
+
+ if (orient == SCALE_ABSCISSA)
{
- double pos = (s + lower) * tick_interval;
- draw_tick (cr, geom, orient, false,
- s * tick_interval * geom->axis[orient].scale, "%.*g",
- DBL_DIG + 1, 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);
}
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
cairo_line_to (cr, x2, y2);
cairo_stroke (cr);
}
+
projects / pspp / blobdiff