output: Use Cairo and Pango to draw charts, instead of libplot.

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

diff --git a/src/output/charts/cartesian.h b/src/output/charts/cartesian.h
index 6a23390cb3446707cefd86b810885f1ab38ce65a..feda1b6fb724d79201c1ee154d47827aa6e8c652 100644 (file)
--- a/src/output/charts/cartesian.h
+++ b/src/output/charts/cartesian.h
@@ -1,27 +1,27 @@
-/* PSPP - computes sample statistics.
-   Copyright (C) 2004 Free Software Foundation, Inc.
-   Written by John Darrington <john@darrington.wattle.id.au>
+/* PSPP - a program for statistical analysis.
+   Copyright (C) 2004, 2009 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 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/>. */
 
 
 
 #ifndef CARTESIAN_H
 #define CARTESIAN_H
 
+#include <cairo/cairo.h>
+#include <libpspp/compiler.h>
+#include <output/chart.h>
 
 enum CHART_DIM
   {
@@ -29,17 +29,19 @@ enum CHART_DIM
     CHART_DIM_Y
   };
 
-
+struct chart_geometry;
 
 /* Plot a data point */
-void chart_datum(struct chart *ch, int dataset UNUSED, double x, double y);
+void chart_datum(cairo_t *, const struct chart_geometry *,
+                 int dataset UNUSED, double x, double y);
 
 /* Draw a line with slope SLOPE and intercept INTERCEPT.
    between the points limit1 and limit2.
-   If lim_dim is CHART_DIM_Y then the limit{1,2} are on the 
+   If lim_dim is CHART_DIM_Y then the limit{1,2} are on the
    y axis otherwise the x axis
 */
-void chart_line(struct chart *ch, double slope, double intercept, 
+void chart_line(cairo_t *, const struct chart_geometry *,
+                double slope, double intercept,
                double limit1, double limit2, enum CHART_DIM lim_dim);