Support mult-data charts and legend.

[pspp-builds.git] / src / output / chart.h

diff --git a/src/output/chart.h b/src/output/chart.h
index 43543cf5e2239ddb8a2793aee7cab8e4ed97fbba..4da12ecfe5b0afba3ea7035680fca5b1ea1d9af9 100644 (file)
--- a/src/output/chart.h
+++ b/src/output/chart.h
@@ -14,7 +14,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
-#include <config.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
@@ -25,10 +24,11 @@
 
 #include <math/chart-geometry.h>
 #include <libpspp/str.h>
-#include <libpspp/alloc.h>
 #include "manager.h"
 #include "output.h"
 
+#include "xalloc.h"
+
 #ifndef CHART_H
 #define CHART_H
 
@@ -64,6 +64,8 @@ struct chart {
 
   int legend_left ;
   int legend_right ;
+  const char **dataset;
+  int n_datasets;
 
 
   /* Default font size for the plot (if zero, then use plotter default) */
@@ -78,6 +80,7 @@ struct chart {
   double x_max;
   double y_min;
   double y_max;
+  bool in_path;
 };
 
 
@@ -89,6 +92,7 @@ void chart_submit(struct chart *ch);
    separate file. */
 void chart_init_separate (struct chart *, const char *type,
                           const char *file_name_tmpl, int number);
+
 void chart_finalise_separate (struct chart *);
 
 #endif