/* PSPP - a program for statistical analysis.
- Copyright (C) 2014 Free Software Foundation, Inc.
+ Copyright (C) 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 "gettext.h"
#define _(msgid) gettext (msgid)
+static const struct xrchart_colour black = {0,0,0};
void
xrchart_draw_scatterplot (const struct chart_item *chart_item, cairo_t *cr,
xrchart_write_xscale (cr, geom, spc->x_min, spc->x_max);
xrchart_write_yscale (cr, geom, spc->y_min, spc->y_max);
xrchart_write_title (cr, geom, _("Scatterplot %s"), chart_item->title);
- xrchart_write_xlabel (cr, geom, var_to_string(spc->xvar));
- xrchart_write_ylabel (cr, geom, var_to_string(spc->yvar));
+ xrchart_write_xlabel (cr, geom, spc->xlabel);
+ xrchart_write_ylabel (cr, geom, spc->ylabel);
cairo_save (cr);
data = casereader_clone (spc->data);
{
if (spc->byvar)
{
- const union value *val = case_data (c,spc->byvar);
+ const union value *val = case_data_idx (c,SP_IDX_BY);
for(i=0;i<n_catvals && !value_equal (&catvals[i],val,byvar_width);i++);
if (i == n_catvals) /* No entry found */
{
i--;
}
}
+ colour = &data_colour[i % XRCHART_N_COLOURS];
}
- colour = &data_colour[i % XRCHART_N_COLOURS];
+ else
+ colour = &black;
+
cairo_set_source_rgb (cr,
colour->red / 255.0,
colour->green / 255.0,
colour->blue / 255.0);
xrchart_datum (cr, geom, 0,
- case_data (c, spc->xvar)->f,
- case_data (c, spc->yvar)->f);
+ case_data_idx (c, SP_IDX_X)->f,
+ case_data_idx (c, SP_IDX_Y)->f);
}
casereader_destroy (data);
cairo_restore (cr);