Merge commit 'origin/stable'

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

diff --git a/src/output/charts/plot-chart.h b/src/output/charts/plot-chart.h
index ffcf3b0180f7e807969d38fbe282a5d97fcaffb4..f4cc5bbf06c3f91650c4988b15e76e36f8efc74a 100644 (file)
--- a/src/output/charts/plot-chart.h
+++ b/src/output/charts/plot-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>
@@ -27,32 +23,34 @@
 #include <math.h>
 
 
-#include "chart-geometry.h"
-#include "chart.h"
-#include "str.h"
-#include "alloc.h"
-#include "manager.h"
-#include "output.h"
+#include <math/chart-geometry.h>
+#include <output/chart.h>
 
+#include <libpspp/str.h>
+#include <output/manager.h>
+#include <output/output.h>
+
+#include "xalloc.h"
 
 #ifndef PLOT_CHART_H
 #define PLOT_CHART_H
 
-                                                            
-extern const char *data_colour[];
+#define N_CHART_COLOURS 9
+extern const char *const data_colour[];
 
-enum tick_orientation {
-  TICK_ABSCISSA=0,
-  TICK_ORDINATE
-};
+enum tick_orientation
+  {
+    TICK_ABSCISSA=0,
+    TICK_ORDINATE
+  };
 
 
 /* Draw a tick mark at position
    If label is non zero, then print it at the tick mark
 */
-void draw_tick(struct chart *chart, 
-         enum tick_orientation orientation, 
-         double position, 
+void draw_tick(struct chart *chart,
+         enum tick_orientation orientation,
+         double position,
               const char *label, ...);
 
 
@@ -67,5 +65,11 @@ void  chart_write_xscale(struct chart *ch, double min, double max, int ticks);
 /* Set the scale for the ordinate */
 void  chart_write_yscale(struct chart *ch, double smin, double smax, int ticks);
 
+void chart_write_xlabel(struct chart *ch, const char *label) ;
+
+/* Write the ordinate label */
+void  chart_write_ylabel(struct chart *ch, const char *label);
+
+void chart_write_legend (struct chart *ch);
 
 #endif