pspp-output: Add new --nth-commands option.

[pspp] / src / output / charts / piechart-cairo.c

diff --git a/src/output/charts/piechart-cairo.c b/src/output/charts/piechart-cairo.c
index bd0452ca3bfe8ae9ea55e2b2449458b44b192d70..c63706792ea0aff9096fecda6a6f6a4bcf10d90a 100644 (file)
--- a/src/output/charts/piechart-cairo.c
+++ b/src/output/charts/piechart-cairo.c
@@ -63,9 +63,6 @@ xrchart_draw_piechart (const struct chart_item *chart_item, cairo_t *cr,
   left_label = geom->axis[SCALE_ORDINATE].data_min + (geom->axis[SCALE_ABSCISSA].data_max - geom->axis[SCALE_ORDINATE].data_min)/10.0;
   right_label = geom->axis[SCALE_ABSCISSA].data_max - (geom->axis[SCALE_ABSCISSA].data_max - geom->axis[SCALE_ORDINATE].data_min)/10.0;
 
-  radius = MIN (5.0 / 12.0 * (geom->axis[SCALE_ORDINATE].data_max - geom->axis[SCALE_ORDINATE].data_min),
-                1.0 / 4.0 * (geom->axis[SCALE_ABSCISSA].data_max - geom->axis[SCALE_ORDINATE].data_min));
-
   radius = MIN (5.0 / 12.0 * (geom->axis[SCALE_ORDINATE].data_max - geom->axis[SCALE_ORDINATE].data_min),
                 1.0 / 4.0 * (geom->axis[SCALE_ABSCISSA].data_max - geom->axis[SCALE_ORDINATE].data_min));
 
@@ -78,7 +75,7 @@ xrchart_draw_piechart (const struct chart_item *chart_item, cairo_t *cr,
 
   /* Draw the segments */
   angle = 0.0;
-  for (i = 0; i < pie->n_slices ; ++i )
+  for (i = 0; i < pie->n_slices ; ++i)
     {
       const double segment_angle =
        pie->slices[i].magnitude / total_magnitude * 2 * M_PI ;
@@ -99,7 +96,7 @@ xrchart_draw_piechart (const struct chart_item *chart_item, cairo_t *cr,
      obscure them.
    */
   angle = 0.0;
-  for (i = 0; i < pie->n_slices ; ++i )
+  for (i = 0; i < pie->n_slices ; ++i)
     {
       const double segment_angle =
        pie->slices[i].magnitude / total_magnitude * 2 * M_PI ;
@@ -110,7 +107,7 @@ xrchart_draw_piechart (const struct chart_item *chart_item, cairo_t *cr,
       const double label_y = centre_y +
        radius * sin (angle + segment_angle/2.0);
 
-      if ( label_x < centre_x )
+      if (label_x < centre_x)
        {
           cairo_move_to (cr, label_x, label_y);
           cairo_line_to (cr, left_label, label_y);