chart: Fix format string issues in draw_tick callers.

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

diff --git a/src/output/charts/piechart.c b/src/output/charts/piechart.c
index c4dc0e67a8b36a0d390e9247e8ec3fc5c886e74c..97910010c69101d16c21f607cc13a369aad0f3b7 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
@@ -19,6 +19,7 @@
 
 #include <float.h>
 #include <assert.h>
+#include <gsl/gsl_math.h>
 #include <math.h>
 #include <stdio.h>
 
@@ -32,14 +33,6 @@
 
 #include "minmax.h"
 
-
-/* Pie charts of course need to know Pi :) */
-#ifndef M_PI
-#define M_PI ( 22.0 / 7.0 )
-#endif
-
-
-
 /* Draw a single slice of the pie */
 static void
 draw_segment(struct chart *ch,
@@ -55,7 +48,7 @@ void
 piechart_plot(const char *title, const struct slice *slices, int n_slices)
 {
   int i;
-  double total_magnetude=0;
+  double total_magnitude=0;
 
   struct chart *ch = chart_create();
 
@@ -73,18 +66,19 @@ piechart_plot(const char *title, const struct slice *slices, int n_slices)
                            1.0 / 4.0 * (ch->data_right - ch->data_left)
                            );
 
+  double angle;
+
 
-  chart_write_title(ch, title);
+  chart_write_title(ch, "%s", title);
 
   for (i = 0 ; i < n_slices ; ++i )
-    total_magnetude += slices[i].magnetude;
+    total_magnitude += slices[i].magnitude;
 
+  angle = 0.0;
   for (i = 0 ; i < n_slices ; ++i )
     {
-      static double angle=0.0;
-
       const double segment_angle =
-       slices[i].magnetude / total_magnetude * 2 * M_PI ;
+       slices[i].magnitude / total_magnitude * 2 * M_PI ;
 
       const double label_x = centre_x -
        radius * sin(angle + segment_angle/2.0);
@@ -96,7 +90,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 )