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

[pspp] / src / output / charts / np-plot.h

diff --git a/src/output/charts/np-plot.h b/src/output/charts/np-plot.h
index c9742359e9091f1ae15900a1c98571f63c5f21c8..b41dd6b37447c4b0a4840610ea79082a8b0a88d1 100644 (file)
--- a/src/output/charts/np-plot.h
+++ b/src/output/charts/np-plot.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2004, 2008, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2008, 2009, 2011 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
@@ -17,12 +17,93 @@
 #ifndef OUTPUT_CHARTS_NP_PLOT_H
 #define OUTPUT_CHARTS_NP_PLOT_H 1
 
-struct casereader;
+#include "output/chart.h"
+
 struct np;
 
-struct chart *np_plot_create (const struct np *, const struct casereader *,
-                              const char *label);
-struct chart *dnp_plot_create (const struct np *, const struct casereader *,
-                               const char *label);
+/* An NP or DNP plot. */
+struct np_plot_chart
+  {
+    struct chart chart;
+    struct casereader *data;
+    bool detrended;
+
+    /* Copied directly from struct np. */
+    double y_min, y_max;
+    double dns_min, dns_max;
+
+    /* Calculated. */
+    double slope, intercept;
+    double y_first, y_last;
+    double x_lower, x_upper;
+    double slack;
+  };
+
+struct chart *np_plot_create (const struct np *,
+                                   const struct casereader *,
+                                   const char *label);
+struct chart *dnp_plot_create (const struct np *,
+                                    const struct casereader *,
+                                    const char *label);
+\f
+/* This boilerplate for np_plot_chart, a subclass of chart, was
+   autogenerated by mk-class-boilerplate. */
+
+#include <assert.h>
+#include "libpspp/cast.h"
+
+extern const struct chart_class np_plot_chart_class;
+
+/* Returns true if SUPER is a np_plot_chart, otherwise false. */
+static inline bool
+is_np_plot_chart (const struct chart *super)
+{
+  return super->class == &np_plot_chart_class;
+}
+
+/* Returns SUPER converted to np_plot_chart.  SUPER must be a np_plot_chart, as
+   reported by is_np_plot_chart. */
+static inline struct np_plot_chart *
+to_np_plot_chart (const struct chart *super)
+{
+  assert (is_np_plot_chart (super));
+  return UP_CAST (super, struct np_plot_chart, chart);
+}
+
+/* Returns INSTANCE converted to chart. */
+static inline struct chart *
+np_plot_chart_super (const struct np_plot_chart *instance)
+{
+  return CONST_CAST (struct chart *, &instance->chart);
+}
+
+/* Increments INSTANCE's reference count and returns INSTANCE. */
+static inline struct np_plot_chart *
+np_plot_chart_ref (const struct np_plot_chart *instance)
+{
+  return to_np_plot_chart (chart_ref (&instance->chart));
+}
+
+/* Decrements INSTANCE's reference count, then destroys INSTANCE if
+   the reference count is now zero. */
+static inline void
+np_plot_chart_unref (struct np_plot_chart *instance)
+{
+  chart_unref (&instance->chart);
+}
+
+/* Returns true if INSTANCE's reference count is greater than 1,
+   false otherwise. */
+static inline bool
+np_plot_chart_is_shared (const struct np_plot_chart *instance)
+{
+  return chart_is_shared (&instance->chart);
+}
 
+static inline void
+np_plot_chart_submit (struct np_plot_chart *instance)
+{
+  chart_submit (&instance->chart);
+}
+\f
 #endif /* output/charts/np-plot.h */