CORRELATIONS: Added support for the STATISTICS subcommand

[pspp-builds.git] / src / output / charts / piechart.c

diff --git a/src/output/charts/piechart.c b/src/output/charts/piechart.c
index aeac555c261fcd3ea563febdd1bbaddacccd787c..d7db80e921a6f573991ed0be14e1eaf583e8527d 100644 (file)
--- 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 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
@@ -57,24 +57,28 @@ piechart_plot(const char *title, const struct slice *slices, int n_slices)
   int i;
   double total_magnetude=0;
 
-  struct chart *ch = chart_create();
+  struct chart *ch;
 
-  const double left_label = ch->data_left +
-    (ch->data_right - ch->data_left)/10.0;
+  double left_label;
+  double right_label;
 
-  const double right_label = ch->data_right -
-    (ch->data_right - ch->data_left)/10.0;
+  double centre_x;
+  double centre_y;
 
-  const double centre_x = (ch->data_right + ch->data_left ) / 2.0 ;
-  const double centre_y = (ch->data_top + ch->data_bottom ) / 2.0 ;
+  double radius;
 
-  const double radius = MIN(
-                           5.0 / 12.0 * (ch->data_top - ch->data_bottom),
-                           1.0 / 4.0 * (ch->data_right - ch->data_left)
-                           );
+  ch = chart_create ();
+  if (ch == NULL)
+    return;
 
+  left_label = ch->data_left + (ch->data_right - ch->data_left)/10.0;
+  right_label = ch->data_right - (ch->data_right - ch->data_left)/10.0;
+  centre_x = (ch->data_right + ch->data_left ) / 2.0;
+  centre_y = (ch->data_top + ch->data_bottom ) / 2.0;
+  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);
+  chart_write_title(ch, "%s", title);
 
   for (i = 0 ; i < n_slices ; ++i )
     total_magnetude += slices[i].magnetude;
@@ -96,7 +100,7 @@ piechart_plot(const char *title, const struct slice *slices, int n_slices)
       draw_segment(ch,
                   centre_x, centre_y, radius,
                   angle, segment_angle,
-                  data_colour[i]);
+                  data_colour[i % N_CHART_COLOURS]);
 
       /* Now add the labels */
       if ( label_x < centre_x )
@@ -104,7 +108,7 @@ piechart_plot(const char *title, const struct slice *slices, int n_slices)
          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,slices[i].label);
+         pl_alabel_r (ch->lp, 0, 0, ds_cstr (&slices[i].label));
        }
       else
        {
@@ -113,7 +117,7 @@ piechart_plot(const char *title, const struct slice *slices, int n_slices)
                    right_label, label_y
                    );
          pl_moverel_r(ch->lp,0,5);
-         pl_alabel_r(ch->lp,'r',0,slices[i].label);
+         pl_alabel_r (ch->lp, 'r', 0, ds_cstr (&slices[i].label));
        }
 
       angle += segment_angle;