X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fcairo-chart.c;h=db8eb67ecf45f65625bb2df0229a8b3335d6a17e;hb=dc0e37529d185a9848b0e53d424d40239d195c8c;hp=01c5d5c044c45dfb8b1961f813acb392006b9519;hpb=aad0ae4913ecd01ccc954f8828623ad5da35cd1b;p=pspp

diff --git a/src/output/cairo-chart.c b/src/output/cairo-chart.c
index 01c5d5c044..db8eb67ecf 100644
--- a/src/output/cairo-chart.c
+++ b/src/output/cairo-chart.c
@@ -17,7 +17,6 @@
 #include <config.h>
 
 #include "output/cairo-chart.h"
-#include "math/decimal.h"
 #include "math/chart-geometry.h"
 
 #include <assert.h>
@@ -48,7 +47,7 @@ xrchart_geometry_init (cairo_t *cr, struct xrchart_geometry *geom,
 {
   /* Set default chart geometry. */
   geom->axis[SCALE_ORDINATE].data_max = 0.900 * length;
-  geom->axis[SCALE_ORDINATE].data_min = 0.120 * length;
+  geom->axis[SCALE_ORDINATE].data_min = 0.200 * length;
 
   geom->axis[SCALE_ABSCISSA].data_min = 0.150 * width;
   geom->axis[SCALE_ABSCISSA].data_max = 0.800 * width;
@@ -100,8 +99,8 @@ pango_layout_get_baseline (PangoLayout    *layout)
 }
 #endif
 
-/*  
-    These colours come from: 
+/*
+    These colours come from:
     http://tango.freedesktop.org/static/cvs/tango-art-tools/palettes/Tango-Palette.gpl */
 const struct xrchart_colour data_colour[XRCHART_N_COLOURS] =
   {
@@ -179,7 +178,7 @@ xrchart_label_rotate (cairo_t *cr, int horz_justify, int vert_justify,
   PangoLayout *layout;
   double x, y;
 
-  desc = pango_font_description_from_string ("sans serif");
+  desc = pango_font_description_from_string ("Sans");
   if (desc == NULL)
     {
       cairo_new_path (cr);
@@ -196,7 +195,7 @@ xrchart_label_rotate (cairo_t *cr, int horz_justify, int vert_justify,
 
   layout = pango_cairo_create_layout (cr);
   pango_layout_set_font_description (layout, desc);
-  pango_layout_set_text (layout, string, -1);
+  pango_layout_set_markup (layout, string, -1);
   if (horz_justify != 'l')
     {
       int width_pango;
@@ -310,15 +309,13 @@ draw_tick_internal (cairo_t *cr, const struct xrchart_geometry *geom,
 
       if (orientation == SCALE_ABSCISSA)
 	{
-	  if ( rotated) 
+	  if ( rotated)
 	    xrchart_label_rotate (cr, 'l', 'c', geom->font_size, s, -G_PI_4);
 	  else
 	    xrchart_label (cr, 'c', 't', geom->font_size, s);
 	}
       else if (orientation == SCALE_ORDINATE)
         {
-          if (fabs (position) < DBL_EPSILON)
-	    cairo_rel_move_to (cr, 0, 10);
           xrchart_label (cr, 'r', 'c', geom->font_size, s);
         }
     }
@@ -345,7 +342,29 @@ xrchart_write_title (cairo_t *cr, const struct xrchart_geometry *geom,
   cairo_restore (cr);
 }
 
+static void
+xrchart_text_extents (cairo_t *cr, const struct xrchart_geometry *geom,
+		      const char *utf8,
+		      double *width, double *height)
+{
+  PangoFontDescription *desc;
+  PangoLayout *layout;
+  int width_pango;
+  int height_pango;
 
+  desc = pango_font_description_from_string ("Sans");
+  if (desc == NULL)
+      return;
+  pango_font_description_set_absolute_size (desc, geom->font_size * PANGO_SCALE);
+  layout = pango_cairo_create_layout (cr);
+  pango_layout_set_font_description (layout, desc);
+  pango_layout_set_markup (layout, utf8, -1);
+  pango_layout_get_size (layout, &width_pango, &height_pango);
+  *width = (double) width_pango / PANGO_SCALE;
+  *height = (double) height_pango / PANGO_SCALE;
+  g_object_unref (layout);
+  pango_font_description_free (desc);
+}
 
 static void
 xrchart_write_scale (cairo_t *cr, struct xrchart_geometry *geom,
@@ -354,36 +373,51 @@ xrchart_write_scale (cairo_t *cr, struct xrchart_geometry *geom,
   int s;
   int ticks;
 
-  struct decimal dinterval;
-  struct decimal dlower;
-  struct decimal dupper;
+  double interval;
+  double lower;
+  double upper;
+  double tickscale;
+  char *tick_format_string;
+  bool tickoversize = false;
+
+  chart_get_scale (smax, smin, &lower, &interval, &ticks);
 
-  chart_get_scale (smax, smin, &dlower, &dinterval, &ticks);
+  tick_format_string = chart_get_ticks_format (lower, interval, ticks, &tickscale);
 
-  dupper = dinterval;
-  decimal_int_multiply (&dupper, ticks);
-  decimal_add (&dupper, &dlower);
+  upper = lower + interval * (ticks+1);
 
-  double tick_interval = decimal_to_double (&dinterval);
-   
-  geom->axis[orient].max = decimal_to_double (&dupper);
-  geom->axis[orient].min = decimal_to_double (&dlower);
-  
-  geom->axis[orient].scale = (fabs (geom->axis[orient].data_max - geom->axis[orient].data_min)
-			      / fabs (geom->axis[orient].max - geom->axis[orient].min));
-  
-  struct decimal pos = dlower;
+  geom->axis[orient].max = upper;
+  geom->axis[orient].min = lower;
 
-  for (s = 0 ; s < ticks; ++s)
+  struct xrchart_axis *axis = &geom->axis[orient];
+  geom->axis[orient].scale = (fabs ((double) axis->data_max - axis->data_min)
+			      / fabs (axis->max - axis->min));
+
+  if (orient == SCALE_ABSCISSA)
     {
-      char *str = decimal_to_string (&pos);
-      draw_tick (cr, geom, orient, false,
-      		 s * tick_interval * geom->axis[orient].scale,
-		 "%s", str);
-      free (str);
-      
-      decimal_add (&pos, &dinterval);
+      char *test_text;
+      double lower_txt_width, upper_txt_width, unused, width;
+      test_text = xasprintf(tick_format_string, upper*tickscale);
+      xrchart_text_extents (cr, geom, test_text, &upper_txt_width, &unused);
+      free(test_text);
+      test_text = xasprintf(tick_format_string, lower*tickscale);
+      xrchart_text_extents (cr, geom, test_text, &lower_txt_width, &unused);
+      free(test_text);
+      width = MAX(lower_txt_width, upper_txt_width);
+      tickoversize = width > 0.9 *
+	((double)(geom->axis[SCALE_ABSCISSA].data_max - geom->axis[SCALE_ABSCISSA].data_min))/(ticks+1);
     }
+
+  double pos = lower;
+
+  for (s = 0 ; s <= ticks; ++s)
+    {
+      draw_tick (cr, geom, orient, tickoversize,
+		 s * interval * geom->axis[orient].scale,
+		 tick_format_string, pos*tickscale);
+      pos += interval;
+    }
+  free(tick_format_string);
 }
 
 /* Set the scale for the ordinate */
@@ -569,3 +603,4 @@ xrchart_line(cairo_t *cr, const struct xrchart_geometry *geom,
   cairo_line_to (cr, x2, y2);
   cairo_stroke (cr);
 }
+