LIST: Remove WEIGHT subcommand.

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

diff --git a/src/output/charts/cartesian.h b/src/output/charts/cartesian.h
index 15fb8840b1b80a667519d530d09c38a80bab83d3..3c21db6efc444c87cca867bbe184867dd1e707fe 100644 (file)
--- a/src/output/charts/cartesian.h
+++ b/src/output/charts/cartesian.h
@@ -19,10 +19,9 @@
 #ifndef CARTESIAN_H
 #define CARTESIAN_H
 
-#include <stdio.h>
-#include <plot.h>
-
+#include <cairo/cairo.h>
 #include <libpspp/compiler.h>
+#include <output/chart.h>
 
 enum CHART_DIM
   {
@@ -32,8 +31,13 @@ enum CHART_DIM
 
 struct chart_geometry;
 
+void  chart_vector_start (cairo_t *, struct chart_geometry *,
+                          const char *name);
+void chart_vector_end (cairo_t *, struct chart_geometry *);
+void chart_vector (cairo_t *, struct chart_geometry *, double x, double y);
+
 /* Plot a data point */
-void chart_datum(plPlotter *, const struct chart_geometry *,
+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.
@@ -41,7 +45,7 @@ void chart_datum(plPlotter *, const struct chart_geometry *,
    If lim_dim is CHART_DIM_Y then the limit{1,2} are on the
    y axis otherwise the x axis
 */
-void chart_line(plPlotter *, const struct chart_geometry *,
+void chart_line(cairo_t *, const struct chart_geometry *,
                 double slope, double intercept,
                double limit1, double limit2, enum CHART_DIM lim_dim);