X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fplot-hist.c;h=85fb3700e6985b41b7878eddeb37b046035a001b;hb=9a53bbba50470f8752b8343e597fcc5a81cb1da3;hp=6b2e7f9f177bfe74523dc67448a39e75c882d47d;hpb=05e356b2a3087e819ef3b5388e29c822f41502e1;p=pspp diff --git a/src/plot-hist.c b/src/plot-hist.c index 6b2e7f9f17..85fb3700e6 100644 --- a/src/plot-hist.c +++ b/src/plot-hist.c @@ -14,8 +14,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. */ /* If you add/modify any public symbols in this file, don't forget to change the stubs in dummy-chart.c */ @@ -65,43 +65,46 @@ static void hist_draw_bar(struct chart *ch, const gsl_histogram *hist, int bar); static void hist_draw_bar(struct chart *ch, const gsl_histogram *hist, int bar) { - double upper; - double lower; - double height; - if ( !ch ) - return ; - const size_t bins = gsl_histogram_bins(hist); - const double x_pos = (ch->data_right - ch->data_left) * bar / (double) bins ; - const double width = (ch->data_right - ch->data_left) / (double) bins ; + return ; - assert ( 0 == gsl_histogram_get_range(hist, bar, &lower, &upper)); + { + double upper; + double lower; + double height; - assert( upper >= lower); + const size_t bins = gsl_histogram_bins(hist); + const double x_pos = (ch->data_right - ch->data_left) * bar / (double) bins ; + const double width = (ch->data_right - ch->data_left) / (double) bins ; - height = gsl_histogram_get(hist, bar) * - (ch->data_top - ch->data_bottom) / gsl_histogram_max_val(hist); - pl_savestate_r(ch->lp); - pl_move_r(ch->lp,ch->data_left, ch->data_bottom); - pl_fillcolorname_r(ch->lp, ch->fill_colour); - pl_filltype_r(ch->lp,1); + assert ( 0 == gsl_histogram_get_range(hist, bar, &lower, &upper)); + assert( upper >= lower); - pl_fboxrel_r(ch->lp, - x_pos, 0, - x_pos + width, height); + height = gsl_histogram_get(hist, bar) * + (ch->data_top - ch->data_bottom) / gsl_histogram_max_val(hist); - pl_restorestate_r(ch->lp); + pl_savestate_r(ch->lp); + pl_move_r(ch->lp,ch->data_left, ch->data_bottom); + pl_fillcolorname_r(ch->lp, ch->fill_colour); + pl_filltype_r(ch->lp,1); - { - char buf[5]; - snprintf(buf,5,"%g",(upper + lower) / 2.0); - draw_tick(ch, TICK_ABSCISSA, - x_pos + width / 2.0, buf); - } + pl_fboxrel_r(ch->lp, + x_pos, 0, + x_pos + width, height); + + pl_restorestate_r(ch->lp); + + { + char buf[5]; + snprintf(buf,5,"%g",(upper + lower) / 2.0); + draw_tick(ch, TICK_ABSCISSA, + x_pos + width / 2.0, buf); + } + } }