X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fchart.h;h=4da12ecfe5b0afba3ea7035680fca5b1ea1d9af9;hb=f7db18ef6a7e50bda368cf9a9288db58446f04c2;hp=98052f28efe88503ca2f6bcde4ba262f07a2018d;hpb=a19b858e0ac3c69e4a28c0ca6d8674427268a863;p=pspp-builds.git

diff --git a/src/output/chart.h b/src/output/chart.h
index 98052f28..4da12ecf 100644
--- a/src/output/chart.h
+++ b/src/output/chart.h
@@ -1,23 +1,19 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
    Copyright (C) 2004 Free Software Foundation, Inc.
-   Written by John Darrington <john@darrington.wattle.id.au>
 
-   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 the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   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
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA. */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
-#include <config.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
@@ -28,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
 
@@ -47,13 +44,13 @@ struct chart {
 #else
   void *lp;
 #endif
-  char *filename;
+  char *file_name;
   FILE *file;
 
-  /* The geometry of the chart 
+  /* The geometry of the chart
      See diagram at the foot of this file.
    */
-  
+
   int data_top   ;
   int data_right ;
   int data_bottom;
@@ -67,10 +64,12 @@ 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) */
-  int font_size; 
+  int font_size;
 
   char fill_colour[10];
 
@@ -81,6 +80,7 @@ struct chart {
   double x_max;
   double y_min;
   double y_max;
+  bool in_path;
 };
 
 
@@ -88,4 +88,11 @@ struct chart {
 struct chart * chart_create(void);
 void chart_submit(struct chart *ch);
 
+/* Helper functions for output drivers that put each chart into a
+   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