output-item: Collapse the inheritance hierarchy into a single struct.

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

diff --git a/src/output/charts/spreadlevel-cairo.c b/src/output/charts/spreadlevel-cairo.c
index eeb3c813be762c201c3bfafc2fd03e096c0a7ca2..815cfe5dd371384fa24aaa00dae3fcc77df325ee 100644 (file)
--- a/src/output/charts/spreadlevel-cairo.c
+++ b/src/output/charts/spreadlevel-cairo.c
@@ -26,21 +26,24 @@
 #define _(msgid) gettext (msgid)
 
 void
-xrchart_draw_spreadlevel (const struct chart_item *chart_item, cairo_t *cr,
-                    struct xrchart_geometry *geom)
+xrchart_draw_spreadlevel (const struct chart *chart, cairo_t *cr,
+                          struct xrchart_geometry *geom)
 {
-  const struct spreadlevel_plot_chart *sl = to_spreadlevel_plot_chart (chart_item);
+  const struct spreadlevel_plot_chart *sl = to_spreadlevel_plot_chart (chart);
   size_t i;
 
-  const char *name = chart_item_get_title (chart_item);
+  const char *name = chart_get_title (chart);
 
   xrchart_write_title (cr, geom, _("Spread vs. Level Plot of %s"), name);
   xrchart_write_xlabel (cr, geom, _("Level"));
   xrchart_write_ylabel (cr, geom, _("Spread"));
-  
 
-  xrchart_write_xscale (cr, geom, sl->x_lower, sl->x_upper, 5);
-  xrchart_write_yscale (cr, geom, sl->y_lower, sl->y_upper, 5);
+
+  if (! xrchart_write_xscale (cr, geom, sl->x_lower, sl->x_upper))
+    return;
+
+  if (! xrchart_write_yscale (cr, geom, sl->y_lower, sl->y_upper))
+    return;
 
   for (i = 0 ; i < sl->n_data; ++i)
     {