X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fcharts%2Fplot-chart.c;h=cda6d1ec83ce5f431d6e75f93e3a607005308bc3;hb=c9a3c45e44c1c03d13d4eb186e3817bc836f75f8;hp=04c10c4d9122e199e8fab4ac63cf02da1b3e1257;hpb=e9fc76ec1091b47b92aeb2143d6159dacf3b70b2;p=pspp-builds.git

diff --git a/src/output/charts/plot-chart.c b/src/output/charts/plot-chart.c
index 04c10c4d..cda6d1ec 100644
--- a/src/output/charts/plot-chart.c
+++ b/src/output/charts/plot-chart.c
@@ -39,6 +39,26 @@
 
 #include "xalloc.h"
 
+#if ! PANGO_VERSION_CHECK (2, 22, 0)
+int pango_layout_get_baseline (PangoLayout    *layout);
+
+/* Shamelessly copied from the pango source */
+int
+pango_layout_get_baseline (PangoLayout    *layout)
+{
+  int baseline;
+
+  /* XXX this is so inefficient */
+  PangoLayoutIter *iter = pango_layout_get_iter (layout);
+  baseline = pango_layout_iter_get_baseline (iter);
+  pango_layout_iter_free (iter);
+
+  return baseline;
+}
+#endif
+
+
+
 const struct chart_colour data_colour[N_CHART_COLOURS] =
   {
     { 165, 42, 42 },            /* brown */
@@ -86,7 +106,7 @@ chart_draw_marker (cairo_t *cr, double x, double y, enum marker_type marker,
 }
 
 void
-chart_label (cairo_t *cr, int horz_justify, int vert_justify,
+chart_label (cairo_t *cr, int horz_justify, int vert_justify, double font_size,
              const char *string)
 {
   PangoFontDescription *desc;
@@ -99,7 +119,7 @@ chart_label (cairo_t *cr, int horz_justify, int vert_justify,
       cairo_new_path (cr);
       return;
     }
-  pango_font_description_set_absolute_size (desc, 15 * PANGO_SCALE);
+  pango_font_description_set_absolute_size (desc, font_size * PANGO_SCALE);
 
   cairo_save (cr);
   cairo_get_current_point (cr, &x, &y);
@@ -190,12 +210,12 @@ draw_tick (cairo_t *cr, const struct chart_geometry *geom,
       va_start (ap, label);
       s = xvasprintf (label, ap);
       if (orientation == TICK_ABSCISSA)
-        chart_label (cr, 'c', 't', s);
+        chart_label (cr, 'c', 't', geom->font_size, s);
       else if (orientation == TICK_ORDINATE)
         {
           if (fabs (position) < DBL_EPSILON)
 	    cairo_rel_move_to (cr, 0, 10);
-          chart_label (cr, 'r', 'c', s);
+          chart_label (cr, 'r', 'c', geom->font_size, s);
         }
       free (s);
       va_end (ap);
@@ -212,12 +232,11 @@ chart_write_title (cairo_t *cr, const struct chart_geometry *geom,
   char *s;
 
   cairo_save (cr);
-  // pl_ffontsize_r (cr, geom->font_size * 1.5); /* XXX */
   cairo_move_to (cr, geom->data_left, geom->title_bottom);
 
   va_start(ap, title);
   s = xvasprintf (title, ap);
-  chart_label (cr, 'l', 'x', s);
+  chart_label (cr, 'l', 'x', geom->font_size * 1.5, s);
   free (s);
   va_end (ap);
 
@@ -274,7 +293,7 @@ chart_write_xlabel (cairo_t *cr, const struct chart_geometry *geom,
                     const char *label)
 {
   cairo_move_to (cr, geom->data_left, geom->abscissa_top);
-  chart_label (cr, 'l', 't', label);
+  chart_label (cr, 'l', 't', geom->font_size, label);
 }
 
 /* Write the ordinate label */
@@ -286,6 +305,52 @@ chart_write_ylabel (cairo_t *cr, const struct chart_geometry *geom,
   cairo_translate (cr, -geom->data_bottom, -geom->ordinate_right);
   cairo_move_to (cr, 0, 0);
   cairo_rotate (cr, M_PI / 2.0);
-  chart_label (cr, 'l', 'x', label);
+  chart_label (cr, 'l', 'x', geom->font_size, label);
+  cairo_restore (cr);
+}
+
+
+void
+chart_write_legend (cairo_t *cr, const struct chart_geometry *geom)
+{
+  int i;
+  const int vstep = geom->font_size * 2;
+  const int xpad = 10;
+  const int ypad = 10;
+  const int swatch = 20;
+  const int legend_top = geom->data_top;
+  const int legend_bottom = legend_top -
+    (vstep * geom->n_datasets + 2 * ypad );
+
+  cairo_save (cr);
+
+  cairo_rectangle (cr, geom->legend_left, legend_top,
+                   geom->legend_right - xpad - geom->legend_left,
+                   legend_bottom - legend_top);
+  cairo_stroke (cr);
+
+  for (i = 0 ; i < geom->n_datasets ; ++i )
+    {
+      const int ypos = legend_top - vstep * (i + 1);
+      const int xpos = geom->legend_left + xpad;
+      const struct chart_colour *colour;
+
+      cairo_move_to (cr, xpos, ypos);
+
+      cairo_save (cr);
+      colour = &data_colour [ i % N_CHART_COLOURS];
+      cairo_set_source_rgb (cr,
+                            colour->red / 255.0,
+                            colour->green / 255.0,
+                            colour->blue / 255.0);
+      cairo_rectangle (cr, xpos, ypos, swatch, swatch);
+      cairo_fill_preserve (cr);
+      cairo_stroke (cr);
+      cairo_restore (cr);
+
+      cairo_move_to (cr, xpos + swatch * 1.5, ypos);
+      chart_label (cr, 'l', 'x', geom->font_size, geom->dataset[i]);
+    }
+
   cairo_restore (cr);
 }