X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fcairo-chart.h;h=646b1cc3d7e97eaa49d86338a1d6eb2b7b63e2e8;hb=bc2bcb0e2e77b4b02a32d6179b8ee6673bfdffa6;hp=5e8123ed1a6617408522043c9f0789aefc2818b8;hpb=084a3ed2450295a9f1ebfd30b9a93f1e3dac7bf1;p=pspp

diff --git a/src/output/cairo-chart.h b/src/output/cairo-chart.h
index 5e8123ed1a..646b1cc3d7 100644
--- a/src/output/cairo-chart.h
+++ b/src/output/cairo-chart.h
@@ -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*/
@@ -162,5 +171,8 @@ void xrchart_draw_np_plot (const struct chart_item *, cairo_t *,
                            struct xrchart_geometry *);
 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 *);
+
 
 #endif /* output/cairo-chart.h */