X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fcairo-chart.h;h=60ef282928b913e768ca25c693793abdfe9ef9bd;hb=6b6ed1de7e41fe0683ec458bf8f455a159a2a653;hp=090bc9cede577666f7e39caa0298d22a1602ee0e;hpb=39d61ddbc7ad08260bd7e0b28da218fb9a6360a4;p=pspp

diff --git a/src/output/cairo-chart.h b/src/output/cairo-chart.h
index 090bc9cede..60ef282928 100644
--- a/src/output/cairo-chart.h
+++ b/src/output/cairo-chart.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2011, 2015 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
@@ -44,8 +44,11 @@ struct xrchart_axis
 /* The geometry of a chart. */
 struct xrchart_geometry
   {
-    int abscissa_top;
-    int ordinate_right;
+    /* Bottom of the abscissa segment */
+    int abscissa_bottom;
+
+    /* Left of the ordinate segment */
+    int ordinate_left;
 
     int title_bottom;
 
@@ -71,7 +74,7 @@ void xrchart_geometry_init (cairo_t *, struct xrchart_geometry *,
                             double width, double length);
 void xrchart_geometry_free (cairo_t *, struct xrchart_geometry *);
 
-#define XRCHART_N_COLOURS 9
+#define XRCHART_N_COLOURS 27
 extern const struct xrchart_colour data_colour[];
 
 enum tick_orientation
@@ -93,13 +96,19 @@ void xrchart_draw_marker (cairo_t *, double x, double y, enum xrmarker_type,
 void xrchart_label (cairo_t *, int horz_justify, int vert_justify,
                     double font_size, const char *);
 
+void xrchart_label_rotate (cairo_t *cr, int horz_justify, int vert_justify,
+			   double font_size, const char *string, double angle);
+
+
 /* Draw a tick mark at position
    If label is non zero, then print it at the tick mark
 */
 void draw_tick (cairo_t *, const struct xrchart_geometry *,
-                enum tick_orientation orientation, double position,
+                enum tick_orientation orientation,
+		bool rotated,
+		double position,
                 const char *label, ...)
-  PRINTF_FORMAT (5, 6);
+  PRINTF_FORMAT (6, 7);
 
 
 /* Write the title on a chart*/
@@ -109,12 +118,12 @@ void xrchart_write_title (cairo_t *, const struct xrchart_geometry *,
 
 /* Set the scale for the abscissa */
 void xrchart_write_xscale (cairo_t *, struct xrchart_geometry *,
-                           double min, double max, int ticks);
+                           double min, double max);
 
 
 /* Set the scale for the ordinate */
 void xrchart_write_yscale (cairo_t *, struct xrchart_geometry *,
-                           double smin, double smax, int ticks);
+                           double smin, double smax);
 
 void xrchart_write_xlabel (cairo_t *, const struct xrchart_geometry *,
                            const char *label) ;
@@ -156,6 +165,8 @@ void xrchart_draw_roc (const struct chart_item *, cairo_t *,
                        struct xrchart_geometry *);
 void xrchart_draw_piechart (const struct chart_item *, cairo_t *,
                             struct xrchart_geometry *);
+void xrchart_draw_barchart (const struct chart_item *, cairo_t *,
+                            struct xrchart_geometry *);
 void xrchart_draw_histogram (const struct chart_item *, cairo_t *,
                              struct xrchart_geometry *);
 void xrchart_draw_np_plot (const struct chart_item *, cairo_t *,
@@ -164,6 +175,7 @@ void xrchart_draw_scree (const struct chart_item *, cairo_t *,
                          struct xrchart_geometry *);
 void xrchart_draw_spreadlevel (const struct chart_item *, cairo_t *,
                          struct xrchart_geometry *);
-
+void xrchart_draw_scatterplot (const struct chart_item *, cairo_t *,
+                         struct xrchart_geometry *);
 
 #endif /* output/cairo-chart.h */