X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fchart-provider.h;h=82a93809a521892c223b75d9f12dad6a77366c69;hb=bcaaaebdde43e26a8d27c53590f34bf29eb56406;hp=9becb6f5ed2e200e69474e6059dc8d5bb259ff55;hpb=7c08a6e1009cf60847e770a77a73c650e9326379;p=pspp

diff --git a/src/output/chart-provider.h b/src/output/chart-provider.h
index 9becb6f5ed..82a93809a5 100644
--- a/src/output/chart-provider.h
+++ b/src/output/chart-provider.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2004, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2009, 2011 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
@@ -17,73 +17,14 @@
 #ifndef OUTPUT_CHART_PROVIDER_H
 #define OUTPUT_CHART_PROVIDER_H 1
 
-#include <cairo/cairo.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <output/chart.h>
-
-struct chart_colour
-  {
-    uint8_t red;
-    uint8_t green;
-    uint8_t blue;
-  };
-
-/* The geometry of a chart. */
-struct chart_geometry
-  {
-    int data_top   ;
-    int data_right ;
-    int data_bottom;
-    int data_left  ;
-
-    int abscissa_top;
-
-    int ordinate_right ;
-
-    int title_bottom ;
-
-    /* Legend. */
-    int legend_left ;
-    int legend_right ;
-    const char **dataset;
-    int n_datasets;
-
-    /* Default font size for the plot. */
-    double font_size;
-
-    struct chart_colour fill_colour;
-
-    /* Stuff Particular to Cartesians (and Boxplots ) */
-    double ordinate_scale;
-    double abscissa_scale;
-    double x_min;
-    double x_max;
-    double y_min;
-    double y_max;
-    bool in_path;
-  };
+#include "output/chart.h"
 
 struct chart_class
   {
-    void (*draw) (const struct chart *, cairo_t *, struct chart_geometry *);
     void (*destroy) (struct chart *);
   };
 
-struct chart
-  {
-    const struct chart_class *class;
-    int ref_cnt;
-  };
-
-void chart_init (struct chart *, const struct chart_class *);
-
-void chart_geometry_init (cairo_t *, struct chart_geometry *,
-                          double width, double length);
-void chart_geometry_free (cairo_t *, struct chart_geometry *);
-
-void chart_draw (const struct chart *, cairo_t *, struct chart_geometry *);
-char *chart_draw_png (const struct chart *, const char *file_name_template,
-                      int number);
+void chart_init (struct chart *, const struct chart_class *,
+                 const char *title);
 
 #endif /* output/chart-provider.h */