X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fcharts%2Fplot-chart.h;h=1a44212ce1fd27ccf552913a113480af4168ded0;hb=77dc491d3b0c1429801ec839e7afab0fbef6a7fc;hp=e425987b9a5f66f1c5bd8d5327fda31e6909f43d;hpb=e0c37920bb2cc46ee559e3992470572d4b4d27e6;p=pspp

diff --git a/src/output/charts/plot-chart.h b/src/output/charts/plot-chart.h
index e425987b9a..1a44212ce1 100644
--- a/src/output/charts/plot-chart.h
+++ b/src/output/charts/plot-chart.h
@@ -17,6 +17,7 @@
 #ifndef PLOT_CHART_H
 #define PLOT_CHART_H
 
+#include <cairo/cairo.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
@@ -47,10 +48,23 @@ enum tick_orientation
 struct chart_geometry;
 
 
+enum marker_type
+  {
+    MARKER_CIRCLE,              /* Hollow circle. */
+    MARKER_ASTERISK,            /* Asterisk (*). */
+    MARKER_SQUARE               /* Hollow square. */
+  };
+
+void chart_draw_marker (cairo_t *, double x, double y, enum marker_type,
+                        double size);
+
+void chart_label (cairo_t *, int horz_justify, int vert_justify,
+                  const char *);
+
 /* Draw a tick mark at position
    If label is non zero, then print it at the tick mark
 */
-void draw_tick(plPlotter *, const struct chart_geometry *,
+void draw_tick(cairo_t *, const struct chart_geometry *,
 	  enum tick_orientation orientation,
 	  double position,
 	       const char *label, ...)
@@ -58,25 +72,25 @@ void draw_tick(plPlotter *, const struct chart_geometry *,
 
 
 /* Write the title on a chart*/
-void   chart_write_title(plPlotter *, const struct chart_geometry *,
+void   chart_write_title(cairo_t *, const struct chart_geometry *,
                          const char *title, ...)
   PRINTF_FORMAT (3, 4);
 
 
 /* Set the scale for the abscissa */
-void  chart_write_xscale(plPlotter *, struct chart_geometry *,
+void  chart_write_xscale(cairo_t *, struct chart_geometry *,
                          double min, double max, int ticks);
 
 
 /* Set the scale for the ordinate */
-void  chart_write_yscale(plPlotter *, struct chart_geometry *,
+void  chart_write_yscale(cairo_t *, struct chart_geometry *,
                          double smin, double smax, int ticks);
 
-void chart_write_xlabel(plPlotter *, const struct chart_geometry *,
+void chart_write_xlabel(cairo_t *, const struct chart_geometry *,
                         const char *label) ;
 
 /* Write the ordinate label */
-void  chart_write_ylabel(plPlotter *, const struct chart_geometry *,
+void  chart_write_ylabel(cairo_t *, const struct chart_geometry *,
                          const char *label);
 
 #endif