output view: make items selectable and use system colours

[pspp] / src / output / cairo-chart.c

diff --git a/src/output/cairo-chart.c b/src/output/cairo-chart.c
index 9c68eb13f88ba8356e7af18cd0918009c1acecf1..00eb98f5f91b0915ad6c129934c3e16e6dfaef25 100644 (file)
--- a/src/output/cairo-chart.c
+++ b/src/output/cairo-chart.c
@@ -1,5 +1,6 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2004, 2009, 2010, 2011, 2014, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2009, 2010, 2011, 2014, 2015,
+   2020 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,7 +20,6 @@
 #include "output/cairo-chart.h"
 #include "math/chart-geometry.h"
 
-#include <assert.h>
 #include <cairo/cairo.h>
 #include <pango/pango.h>
 #include <pango/pangocairo.h>
@@ -99,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] =
   {
@@ -178,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);
@@ -309,7 +309,7 @@ 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);
@@ -352,7 +352,7 @@ xrchart_text_extents (cairo_t *cr, const struct xrchart_geometry *geom,
   int width_pango;
   int height_pango;
 
-  desc = pango_font_description_from_string ("sans serif");
+  desc = pango_font_description_from_string ("Sans");
   if (desc == NULL)
       return;
   pango_font_description_set_absolute_size (desc, geom->font_size * PANGO_SCALE);
@@ -366,7 +366,7 @@ xrchart_text_extents (cairo_t *cr, const struct xrchart_geometry *geom,
   pango_font_description_free (desc);
 }
 
-static void
+static bool
 xrchart_write_scale (cairo_t *cr, struct xrchart_geometry *geom,
                     double smin, double smax, enum tick_orientation orient)
 {
@@ -380,17 +380,21 @@ xrchart_write_scale (cairo_t *cr, struct xrchart_geometry *geom,
   char *tick_format_string;
   bool tickoversize = false;
 
+  if (smax == smin)
+    return false;
+
   chart_get_scale (smax, smin, &lower, &interval, &ticks);
 
   tick_format_string = chart_get_ticks_format (lower, interval, ticks, &tickscale);
 
   upper = lower + interval * (ticks+1);
-   
+
   geom->axis[orient].max = upper;
   geom->axis[orient].min = lower;
-  
-  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 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)
     {
@@ -406,7 +410,7 @@ xrchart_write_scale (cairo_t *cr, struct xrchart_geometry *geom,
       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)
@@ -417,22 +421,24 @@ xrchart_write_scale (cairo_t *cr, struct xrchart_geometry *geom,
       pos += interval;
     }
   free(tick_format_string);
+
+  return true;
 }
 
 /* Set the scale for the ordinate */
-void
+bool
 xrchart_write_yscale (cairo_t *cr, struct xrchart_geometry *geom,
                     double smin, double smax)
 {
-  xrchart_write_scale (cr, geom, smin, smax, SCALE_ORDINATE);
+  return xrchart_write_scale (cr, geom, smin, smax, SCALE_ORDINATE);
 }
 
 /* Set the scale for the abscissa */
-void
+bool
 xrchart_write_xscale (cairo_t *cr, struct xrchart_geometry *geom,
                      double smin, double smax)
 {
-  xrchart_write_scale (cr, geom, smin, smax, SCALE_ABSCISSA);
+  return xrchart_write_scale (cr, geom, smin, smax, SCALE_ABSCISSA);
 }
 
 
@@ -469,7 +475,7 @@ xrchart_write_legend (cairo_t *cr, const struct xrchart_geometry *geom)
   const int swatch = 20;
   const int legend_top = geom->axis[SCALE_ORDINATE].data_max;
   const int legend_bottom = legend_top -
-    (vstep * geom->n_datasets + 2 * ypad );
+    (vstep * geom->n_datasets + 2 * ypad);
 
   cairo_save (cr);
 
@@ -478,7 +484,7 @@ xrchart_write_legend (cairo_t *cr, const struct xrchart_geometry *geom)
                    legend_bottom - legend_top);
   cairo_stroke (cr);
 
-  for (i = 0 ; i < geom->n_datasets ; ++i )
+  for (i = 0 ; i < geom->n_datasets ; ++i)
     {
       const int ypos = legend_top - vstep * (i + 1);
       const int xpos = geom->legend_left + xpad;
@@ -578,10 +584,10 @@ xrchart_line(cairo_t *cr, const struct xrchart_geometry *geom,
   double x1, y1;
   double x2, y2;
 
-  if ( lim_dim == XRCHART_DIM_Y )
+  if (lim_dim == XRCHART_DIM_Y)
     {
-      x1 = ( limit1 - intercept ) / slope;
-      x2 = ( limit2 - intercept ) / slope;
+      x1 = (limit1 - intercept) / slope;
+      x2 = (limit2 - intercept) / slope;
       y1 = limit1;
       y2 = limit2;
     }
@@ -602,3 +608,4 @@ xrchart_line(cairo_t *cr, const struct xrchart_geometry *geom,
   cairo_line_to (cr, x2, y2);
   cairo_stroke (cr);
 }
+