/* 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
#include <config.h>
#include "output/cairo-chart.h"
+#include "math/decimal.h"
+#include "math/chart-geometry.h"
#include <assert.h>
#include <cairo/cairo.h>
#include <pango/pango.h>
#include <pango/pangocairo.h>
-#include <errno.h>
#include <float.h>
#include <math.h>
#include <stdarg.h>
#include "output/cairo.h"
#include "output/chart-item.h"
-#include "gl/error.h"
#include "gl/xalloc.h"
#include "gl/xvasprintf.h"
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);
}
#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
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;
- const double tick_interval =
- chart_rounded_tick ((smax - smin) / (double) ticks);
+ struct decimal dinterval;
+ struct decimal dlower;
+ struct decimal dupper;
- int upper = ceil (smax / tick_interval);
- int lower = floor (smin / tick_interval);
+ chart_get_scale (smax, smin, &dlower, &dinterval, &ticks);
- geom->axis[orient].max = tick_interval * upper;
- geom->axis[orient].min = tick_interval * lower;
+ dupper = dinterval;
+ decimal_int_multiply (&dupper, ticks);
+ decimal_add (&dupper, &dlower);
+ double tick_interval = decimal_to_double (&dinterval);
+
+ geom->axis[orient].max = decimal_to_double (&dupper);
+ geom->axis[orient].min = decimal_to_double (&dlower);
+
geom->axis[orient].scale = (fabs (geom->axis[orient].data_max - geom->axis[orient].data_min)
- / fabs (geom->axis[orient].max - geom->axis[orient].min));
+ / fabs (geom->axis[orient].max - geom->axis[orient].min));
+
+ struct decimal pos = dlower;
- for (s = 0 ; s < upper - lower; ++s)
+ for (s = 0 ; s < ticks; ++s)
{
- double pos = (s + lower) * tick_interval;
+ char *str = decimal_to_string (&pos);
draw_tick (cr, geom, orient, false,
- s * tick_interval * geom->axis[orient].scale, "%g", pos);
+ s * tick_interval * geom->axis[orient].scale,
+ "%s", str);
+ free (str);
+
+ decimal_add (&pos, &dinterval);
}
}
/* 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
projects / pspp / blobdiff