/* PSPP - a program for statistical analysis.
- Copyright (C) 2009 Free Software Foundation, Inc.
+ Copyright (C) 2009, 2011, 2014 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
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
+#include "math/chart-geometry.h"
+#include "output/charts/plot-hist.h"
-#include <output/charts/plot-hist.h>
-
+#include <float.h>
#include <gsl/gsl_randist.h>
-#include <data/val-type.h>
-#include <output/cairo-chart.h>
+#include "data/val-type.h"
+#include "output/cairo-chart.h"
#include "gl/xvasprintf.h"
+#include "gl/minmax.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
histogram_write_legend (cairo_t *cr, const struct xrchart_geometry *geom,
double n, double mean, double stddev)
{
- double y = geom->data_bottom;
+ double y = geom->axis[SCALE_ORDINATE].data_min;
cairo_save (cr);
if (n != SYSMIS)
{
- char *buf = xasprintf ("N = %.2f", n);
+ char *buf = xasprintf (_("N = %.2f"), n);
cairo_move_to (cr, geom->legend_left, y);
xrchart_label (cr, 'l', 'b', geom->font_size, buf);
y += geom->font_size * 1.5;
if (mean != SYSMIS)
{
- char *buf = xasprintf ("Mean = %.1f", mean);
+ char *buf = xasprintf (_("Mean = %.1f"), mean);
cairo_move_to (cr,geom->legend_left, y);
xrchart_label (cr, 'l', 'b', geom->font_size, buf);
y += geom->font_size * 1.5;
if (stddev != SYSMIS)
{
- char *buf = xasprintf ("Std. Dev = %.2f", stddev);
+ char *buf = xasprintf (_("Std. Dev = %.2f"), stddev);
cairo_move_to (cr, geom->legend_left, y);
xrchart_label (cr, 'l', 'b', geom->font_size, buf);
free (buf);
static void
hist_draw_bar (cairo_t *cr, const struct xrchart_geometry *geom,
- const gsl_histogram *h, int bar)
+ const gsl_histogram *h, int bar, const char *tick_format_string,
+ const double tickscale, const bool tickoversize)
{
double upper;
double lower;
double height;
const size_t bins = gsl_histogram_bins (h);
- const double x_pos = (geom->data_right - geom->data_left) * bar / (double) bins ;
- const double width = (geom->data_right - geom->data_left) / (double) bins ;
+
+ const double x_pos =
+ (geom->axis[SCALE_ABSCISSA].data_max - geom->axis[SCALE_ABSCISSA].data_min) *
+ bar / (double) bins ;
+
+ const double width =
+ (geom->axis[SCALE_ABSCISSA].data_max - geom->axis[SCALE_ABSCISSA].data_min) / (double) bins ;
assert ( 0 == gsl_histogram_get_range (h, bar, &lower, &upper));
assert ( upper >= lower);
- height = gsl_histogram_get (h, bar) *
- (geom->data_top - geom->data_bottom) / gsl_histogram_max_val (h);
+ height = geom->axis[SCALE_ORDINATE].scale * gsl_histogram_get (h, bar);
- cairo_rectangle (cr, geom->data_left + x_pos, geom->data_bottom,
+ cairo_rectangle (cr,
+ geom->axis[SCALE_ABSCISSA].data_min + x_pos,
+ geom->axis[SCALE_ORDINATE].data_min,
width, height);
cairo_save (cr);
cairo_set_source_rgb (cr,
cairo_restore (cr);
cairo_stroke (cr);
- draw_tick (cr, geom, TICK_ABSCISSA,
- x_pos + width / 2.0, "%g", (upper + lower) / 2.0);
+ draw_tick (cr, geom, SCALE_ABSCISSA, tickoversize,
+ x_pos + width / 2.0, tick_format_string, (upper+lower)/2.0*tickscale);
+
}
void
struct histogram_chart *h = to_histogram_chart (chart_item);
int i;
int bins;
+ char *tick_format_string;
+ char *test_text;
+ double width, left_width, right_width, unused;
+ double tickscale;
+ bool tickoversize;
xrchart_write_title (cr, geom, _("HISTOGRAM"));
return;
}
- bins = gsl_histogram_bins (h->gsl_hist);
-
- xrchart_write_yscale (cr, geom, 0, gsl_histogram_max_val (h->gsl_hist), 5);
+ xrchart_write_yscale (cr, geom, 0, gsl_histogram_max_val (h->gsl_hist));
+ /* Draw the ticks and compute if the rendered tick text is wider than the bin */
+ bins = gsl_histogram_bins (h->gsl_hist);
+ tick_format_string = chart_get_ticks_format (gsl_histogram_max (h->gsl_hist),
+ gsl_histogram_min (h->gsl_hist),
+ bins,
+ &tickscale);
+ test_text = xasprintf(tick_format_string, gsl_histogram_max (h->gsl_hist)*tickscale);
+ xrchart_text_extents (cr, geom, test_text, &right_width, &unused);
+ free(test_text);
+ test_text = xasprintf(tick_format_string, gsl_histogram_min (h->gsl_hist)*tickscale);
+ xrchart_text_extents (cr, geom, test_text, &left_width, &unused);
+ free(test_text);
+ width = MAX(left_width, right_width);
+ tickoversize = width > 0.9 *
+ ((double)(geom->axis[SCALE_ABSCISSA].data_max - geom->axis[SCALE_ABSCISSA].data_min))/bins;
for (i = 0; i < bins; i++)
- hist_draw_bar (cr, geom, h->gsl_hist, i);
+ {
+ hist_draw_bar (cr, geom, h->gsl_hist, i, tick_format_string, tickscale, tickoversize);
+ }
+ free(tick_format_string);
histogram_write_legend (cr, geom, h->n, h->mean, h->stddev);
range = not_used - x_min;
gsl_histogram_get_range (h->gsl_hist, bins - 1, ¬_used, &x_max);
- abscissa_scale = (geom->data_right - geom->data_left) / (x_max - x_min);
- ordinate_scale = (geom->data_top - geom->data_bottom) /
+ abscissa_scale = (geom->axis[SCALE_ABSCISSA].data_max - geom->axis[SCALE_ABSCISSA].data_min) / (x_max - x_min);
+ ordinate_scale = (geom->axis[SCALE_ORDINATE].data_max - geom->axis[SCALE_ORDINATE].data_min) /
gsl_histogram_max_val (h->gsl_hist);
- cairo_move_to (cr, geom->data_left, geom->data_bottom);
- for (d = geom->data_left;
- d <= geom->data_right;
- d += (geom->data_right - geom->data_left) / 100.0)
+ cairo_move_to (cr, geom->axis[SCALE_ABSCISSA].data_min, geom->axis[SCALE_ORDINATE].data_min);
+ for (d = geom->axis[SCALE_ABSCISSA].data_min;
+ d <= geom->axis[SCALE_ABSCISSA].data_max;
+ d += (geom->axis[SCALE_ABSCISSA].data_max - geom->axis[SCALE_ABSCISSA].data_min) / 100.0)
{
- const double x = (d - geom->data_left) / abscissa_scale + x_min;
+ const double x = (d - geom->axis[SCALE_ABSCISSA].data_min) / abscissa_scale + x_min;
const double y = h->n * range *
gsl_ran_gaussian_pdf (x - h->mean, h->stddev);
- cairo_line_to (cr, d, geom->data_bottom + y * ordinate_scale);
+ cairo_line_to (cr, d, geom->axis[SCALE_ORDINATE].data_min + y * ordinate_scale);
}
cairo_stroke (cr);
projects / pspp / blobdiff