From: Ben Pfaff Date: Sun, 14 Jun 2015 21:24:20 +0000 (-0700) Subject: plot-hist-cairo: Clip normal curve. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5865b44f23925431d48a9a732e389d1337a5b201;p=pspp plot-hist-cairo: Clip normal curve. Otherwise a tall normal curve can go way above the intended data rectangle to spill out even beyond the page boundary, as shown in the PDF examples in bug #45192. --- diff --git a/src/output/charts/plot-hist-cairo.c b/src/output/charts/plot-hist-cairo.c index a85471962f..d196b15723 100644 --- a/src/output/charts/plot-hist-cairo.c +++ b/src/output/charts/plot-hist-cairo.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009, 2011, 2014 Free Software Foundation, Inc. + Copyright (C) 2009, 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 @@ -149,6 +149,13 @@ xrchart_draw_histogram (const struct chart_item *chart_item, cairo_t *cr, /* Therefore the pdf has to be scaled accordingly such that the integrals are equal */ ordinate_scale = binwidth * gsl_histogram_sum(h->gsl_hist); + /* Clip normal curve to the rectangle formed by the axes. */ + cairo_save (cr); + cairo_rectangle (cr, geom->axis[SCALE_ABSCISSA].data_min, geom->axis[SCALE_ORDINATE].data_min, + geom->axis[SCALE_ABSCISSA].data_max - geom->axis[SCALE_ABSCISSA].data_min, + geom->axis[SCALE_ORDINATE].data_max - geom->axis[SCALE_ORDINATE].data_min); + cairo_clip (cr); + cairo_move_to (cr, geom->axis[SCALE_ABSCISSA].data_min, geom->axis[SCALE_ORDINATE].data_min); for (x = geom->axis[SCALE_ABSCISSA].min; x <= geom->axis[SCALE_ABSCISSA].max; @@ -161,5 +168,7 @@ xrchart_draw_histogram (const struct chart_item *chart_item, cairo_t *cr, cairo_line_to (cr, x_pos, y_pos); } cairo_stroke (cr); + + cairo_restore (cr); } }