X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fcharts%2Fbarchart.h;h=a9eb5812ac5b2a265b194cadb3f1d141c5adf411;hb=52afd109c4f1e4a524ff068c0389388592055455;hp=ea6c27e0796a246c025cd2e3a835abafb6a56766;hpb=5443c41f89a2b29cf8cf55f21eecb839fae08177;p=pspp

diff --git a/src/output/charts/barchart.h b/src/output/charts/barchart.h
index ea6c27e079..a9eb5812ac 100644
--- a/src/output/charts/barchart.h
+++ b/src/output/charts/barchart.h
@@ -18,19 +18,70 @@
 #define BARCHART_H
 
 #include "libpspp/str.h"
+#include "libpspp/hmap.h"
+#include "data/value.h"
 #include "output/chart-item.h"
 
+
+struct category
+{
+  struct hmap_node node;
+  int idx;                     /* Unique zero based index */
+  struct string label;         /* The label to be displayed for this category */
+  union value val;             /* The value of this category */
+  int width;                   /* The width of VAL */
+};
+
+
 struct barchart
   {
     struct chart_item chart_item;
-    struct slice *bars;
-    int n_bars;
+
+    /* Should the chart be displayed as percentages */
+    bool percent;
+
+    /* The categories */
+    struct freq **cats;
+
+    /* The total number of categories (regardless of level) */
+    int n_nzcats;
+
+    /* The number of primary categories */
+    int n_pcats;
+
+    /* The largest count of all the categories */
     double largest;
+
+    /* The sum of all the counts */
+    double total_count;
+
+    /* The label for the ordinate (vertical axis) */
     char *ylabel;
+
+    /* The variables holding the categorical values */
+    const struct variable **var;
+    int n_vars;
+
+    int widths[2];
+
+    /* A hash table of struct category indexed by VAL */
+    struct hmap primaries;
+
+    /* A hash table of struct category indexed by VAL */
+    struct hmap secondaries;
+
+    /* A array of pointers to the members of the above hmap,
+       (the secondaries) sorted by VAL */
+    struct category **ss;
   };
 
-struct chart_item *barchart_create (const char *title, const char *ylabel,
-                                    const struct slice *, int n_bars);
+
+struct variable;
+struct freq;
+
+struct chart_item *barchart_create (const struct variable **, int n_vars,
+				    const char *ylabel, bool percent,
+                                    struct freq *const *, int n_cats);
 
 /* This boilerplate for barchart, a subclass of chart_item, was
    autogenerated by mk-class-boilerplate. */