X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fcharts%2Fpiechart.c;h=aac8bfbf8d03429517987e4c52e4d03f7f4d85cf;hb=81579d9e9f994fb2908f50af41c3eb033d216e58;hp=c4dc0e67a8b36a0d390e9247e8ec3fc5c886e74c;hpb=c41f14854e73ad44824b54933ae96eb52f781fc2;p=pspp-builds.git diff --git a/src/output/charts/piechart.c b/src/output/charts/piechart.c index c4dc0e67..aac8bfbf 100644 --- a/src/output/charts/piechart.c +++ b/src/output/charts/piechart.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2004 Free Software Foundation, Inc. + Copyright (C) 2004, 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 @@ -14,199 +14,57 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ - #include -#include -#include -#include -#include - - -#include -#include - -#include -#include -#include +#include "output/charts/piechart.h" -#include "minmax.h" +#include +#include "libpspp/cast.h" +#include "libpspp/str.h" +#include "output/chart-item-provider.h" -/* Pie charts of course need to know Pi :) */ -#ifndef M_PI -#define M_PI ( 22.0 / 7.0 ) -#endif +#include "gl/xalloc.h" - - -/* Draw a single slice of the pie */ -static void -draw_segment(struct chart *ch, - double centre_x, double centre_y, - double radius, - double start_angle, double segment_angle, - const char *colour) ; - - - -/* Draw a piechart */ -void -piechart_plot(const char *title, const struct slice *slices, int n_slices) +/* Creates and returns a chart that will render a piechart with + the given TITLE and the N_SLICES described in SLICES. */ +struct chart_item * +piechart_create (const char *title, const struct slice *slices, int n_slices) { + struct piechart *pie; int i; - double total_magnetude=0; - - struct chart *ch = chart_create(); - - const double left_label = ch->data_left + - (ch->data_right - ch->data_left)/10.0; - - const double right_label = ch->data_right - - (ch->data_right - ch->data_left)/10.0; - const double centre_x = (ch->data_right + ch->data_left ) / 2.0 ; - const double centre_y = (ch->data_top + ch->data_bottom ) / 2.0 ; - - const double radius = MIN( - 5.0 / 12.0 * (ch->data_top - ch->data_bottom), - 1.0 / 4.0 * (ch->data_right - ch->data_left) - ); - - - chart_write_title(ch, title); - - for (i = 0 ; i < n_slices ; ++i ) - total_magnetude += slices[i].magnetude; - - for (i = 0 ; i < n_slices ; ++i ) + pie = xmalloc (sizeof *pie); + chart_item_init (&pie->chart_item, &piechart_class, title); + pie->slices = xnmalloc (n_slices, sizeof *pie->slices); + for (i = 0; i < n_slices; i++) { - static double angle=0.0; - - const double segment_angle = - slices[i].magnetude / total_magnetude * 2 * M_PI ; - - const double label_x = centre_x - - radius * sin(angle + segment_angle/2.0); - - const double label_y = centre_y + - radius * cos(angle + segment_angle/2.0); - - /* Fill the segment */ - draw_segment(ch, - centre_x, centre_y, radius, - angle, segment_angle, - data_colour[i]); - - /* Now add the labels */ - if ( label_x < centre_x ) - { - pl_line_r(ch->lp, label_x, label_y, - left_label, label_y ); - pl_moverel_r(ch->lp,0,5); - pl_alabel_r (ch->lp, 0, 0, ds_cstr (&slices[i].label)); - } - else - { - pl_line_r(ch->lp, - label_x, label_y, - right_label, label_y - ); - pl_moverel_r(ch->lp,0,5); - pl_alabel_r (ch->lp, 'r', 0, ds_cstr (&slices[i].label)); - } - - angle += segment_angle; + const struct slice *src = &slices[i]; + struct slice *dst = &pie->slices[i]; + ds_init_string (&dst->label, &src->label); + dst->magnitude = src->magnitude; } - - /* Draw an outline to the pie */ - pl_filltype_r(ch->lp,0); - pl_fcircle_r (ch->lp, centre_x, centre_y, radius); - - chart_submit(ch); + pie->n_slices = n_slices; + return &pie->chart_item; } static void -fill_segment(struct chart *ch, - double x0, double y0, - double radius, - double start_angle, double segment_angle) ; - - -/* Fill a segment with the current fill colour */ -static void -fill_segment(struct chart *ch, - double x0, double y0, - double radius, - double start_angle, double segment_angle) +piechart_destroy (struct chart_item *chart_item) { + struct piechart *pie = to_piechart (chart_item); + int i; - const double start_x = x0 - radius * sin(start_angle); - const double start_y = y0 + radius * cos(start_angle); - - const double stop_x = - x0 - radius * sin(start_angle + segment_angle); - - const double stop_y = - y0 + radius * cos(start_angle + segment_angle); - - assert(segment_angle <= 2 * M_PI); - assert(segment_angle >= 0); - - if ( segment_angle > M_PI ) - { - /* Then we must draw it in two halves */ - fill_segment(ch, x0, y0, radius, start_angle, segment_angle / 2.0 ); - fill_segment(ch, x0, y0, radius, start_angle + segment_angle / 2.0, - segment_angle / 2.0 ); - } - else + for (i = 0; i < pie->n_slices; i++) { - pl_move_r(ch->lp, x0, y0); - - pl_cont_r(ch->lp, stop_x, stop_y); - pl_cont_r(ch->lp, start_x, start_y); - - pl_arc_r(ch->lp, - x0, y0, - stop_x, stop_y, - start_x, start_y - ); - - pl_endpath_r(ch->lp); + struct slice *slice = &pie->slices[i]; + ds_destroy (&slice->label); } + free (pie->slices); + free (pie); } - - -/* Draw a single slice of the pie */ -static void -draw_segment(struct chart *ch, - double x0, double y0, - double radius, - double start_angle, double segment_angle, - const char *colour) -{ - const double start_x = x0 - radius * sin(start_angle); - const double start_y = y0 + radius * cos(start_angle); - - pl_savestate_r(ch->lp); - - pl_savestate_r(ch->lp); - pl_colorname_r(ch->lp, colour); - - pl_pentype_r(ch->lp,1); - pl_filltype_r(ch->lp,1); - - fill_segment(ch, x0, y0, radius, start_angle, segment_angle); - pl_restorestate_r(ch->lp); - - /* Draw line dividing segments */ - pl_pentype_r(ch->lp, 1); - pl_fline_r(ch->lp, x0, y0, start_x, start_y); - - - pl_restorestate_r(ch->lp); -} - +const struct chart_item_class piechart_class = + { + piechart_destroy + };