X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Foutput%2Fcharts%2Fpiechart.c;h=d7db80e921a6f573991ed0be14e1eaf583e8527d;hb=58e00a3068cffe79b28c195b58841edb617d995e;hp=15d69664bb8bf9ef4fc662ffea010f288486dfce;hpb=f5c108becd49d78f4898cab11352291f5689d24e;p=pspp-builds.git

diff --git a/src/output/charts/piechart.c b/src/output/charts/piechart.c
index 15d69664..d7db80e9 100644
--- a/src/output/charts/piechart.c
+++ b/src/output/charts/piechart.c
@@ -1,21 +1,18 @@
-/* PSPP - draws pie charts of sample statistics
+/* PSPP - a program for statistical analysis.
+   Copyright (C) 2004, 2009 Free Software Foundation, Inc.
 
-Copyright (C) 2004 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
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-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 the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-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., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301, USA. */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 
 #include <config.h>
@@ -60,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;
@@ -99,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 )
@@ -107,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
 	{
@@ -116,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;