X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Foutput%2Fcharts%2Fnp-plot-cairo.c;h=aa7d6773481a24b40f00cfec396ad669d34675e7;hb=ab6a6170a426bbae24d65f7aedaa0c38913ca44c;hp=8c96b73fadaf517c93a388e8c26f087bf4a7b0ab;hpb=50d8ca1f180c3ce67532eb186a8a5c372f2f08e9;p=pspp diff --git a/src/output/charts/np-plot-cairo.c b/src/output/charts/np-plot-cairo.c index 8c96b73fad..aa7d677348 100644 --- a/src/output/charts/np-plot-cairo.c +++ b/src/output/charts/np-plot-cairo.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009 Free Software Foundation, Inc. + Copyright (C) 2009, 2011 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 @@ -16,12 +16,12 @@ #include -#include +#include "output/charts/np-plot.h" -#include -#include -#include -#include +#include "data/case.h" +#include "data/casereader.h" +#include "math/np.h" +#include "output/cairo-chart.h" #include "gettext.h" #define _(msgid) gettext (msgid) @@ -37,10 +37,13 @@ np_plot_chart_draw (const struct chart_item *chart_item, cairo_t *cr, xrchart_write_title (cr, geom, _("Normal Q-Q Plot of %s"), chart_item->title); xrchart_write_xlabel (cr, geom, _("Observed Value")); xrchart_write_ylabel (cr, geom, _("Expected Normal")); - xrchart_write_xscale (cr, geom, + if (! xrchart_write_xscale (cr, geom, npp->x_lower - npp->slack, - npp->x_upper + npp->slack, 5); - xrchart_write_yscale (cr, geom, npp->y_first, npp->y_last, 5); + npp->x_upper + npp->slack)) + return; + + if (! xrchart_write_yscale (cr, geom, npp->y_first, npp->y_last)) + return; data = casereader_clone (npp->data); for (; (c = casereader_read (data)) != NULL; case_unref (c)) @@ -64,8 +67,10 @@ dnp_plot_chart_draw (const struct chart_item *chart_item, cairo_t *cr, xrchart_write_title (cr, geom, _("Detrended Normal Q-Q Plot of %s"), chart_item->title); xrchart_write_xlabel (cr, geom, _("Observed Value")); xrchart_write_ylabel (cr, geom, _("Dev from Normal")); - xrchart_write_xscale (cr, geom, dnpp->y_min, dnpp->y_max, 5); - xrchart_write_yscale (cr, geom, dnpp->dns_min, dnpp->dns_max, 5); + if (! xrchart_write_xscale (cr, geom, dnpp->y_min, dnpp->y_max)) + return; + if (! xrchart_write_yscale (cr, geom, dnpp->dns_min, dnpp->dns_max)) + return; data = casereader_clone (dnpp->data); for (; (c = casereader_read (data)) != NULL; case_unref (c))