X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fcharts%2Fbarchart.c;h=aca03ee8c41ad3320f11d499ddfd6fe52baf619a;hb=20921a454b4e10f27ca4ccfef811f5b482911b49;hp=5d35719a861796cbf1d82e3ab0f5ea9310e22c12;hpb=0df9cdd3df66caf4353128feff3008289cda8115;p=pspp

diff --git a/src/output/charts/barchart.c b/src/output/charts/barchart.c
index 5d35719a86..aca03ee8c4 100644
--- a/src/output/charts/barchart.c
+++ b/src/output/charts/barchart.c
@@ -75,10 +75,17 @@ compare_freq_2level_ptr_3way (const void *a_, const void *b_, const void *bc_)
 
 
 /* Creates and returns a chart that will render a barchart with
-   the given TITLE and the N_BARS described in CATS. */
+   the given TITLE and the N_CATS described in CATS. 
+
+   VAR is an array containing the categorical variables, and N_VAR 
+   the number of them. N_VAR must be exactly 1 or 2.
+
+   CATS are the counts of the values of those variables. N_CATS is the
+   number of distinct values.
+*/
 struct chart_item *
 barchart_create (const struct variable **var, int n_vars,
-		 const char *ylabel, 
+		 const char *ylabel, bool percent, 
 		 struct freq *const *cats, int n_cats)
 {
   struct barchart *bar;
@@ -93,6 +100,7 @@ barchart_create (const struct variable **var, int n_vars,
   assert (n_vars >= 1);
 
   bar = xzalloc (sizeof *bar);
+  bar->percent = percent;
   bar->var = var;
   bar->n_vars = n_vars;
   bar->n_nzcats = n_cats;
@@ -129,8 +137,9 @@ barchart_create (const struct variable **var, int n_vars,
 	    {
 	      struct category *s = xzalloc (sizeof *s);
 	      s->idx = idx++;
-	      value_init (&s->val, var_get_width (var[pidx]));
-	      value_copy (&s->val, &src->values[pidx], var_get_width (var[pidx]));
+	      s->width = var_get_width (var[pidx]);
+	      value_init (&s->val, s->width);
+	      value_copy (&s->val, &src->values[pidx], s->width);
 	      ds_init_empty (&s->label);
 	      var_append_value_name (var[pidx], &s->val, &s->label);
 
@@ -166,7 +175,8 @@ barchart_create (const struct variable **var, int n_vars,
 	    {
 	      struct category *s = xzalloc (sizeof *s);
 	      s->idx = idx++;
-	      value_init (&s->val, var_get_width (var[sidx]));
+	      s->width = var_get_width (var[sidx]);
+	      value_init (&s->val, s->width);
 	      value_copy (&s->val, &src->values[sidx], var_get_width (var[sidx]));
 	      ds_init_empty (&s->label);
 	      var_append_value_name (var[sidx], &s->val, &s->label);
@@ -204,18 +214,19 @@ barchart_create (const struct variable **var, int n_vars,
 	struct freq *c = cats[i];
 
 	struct freq *foo;
-	int flag = 0;
+	bool flag = false;
 	size_t hash = hash_freq_2level_ptr (&c, bar);
 	HMAP_FOR_EACH_WITH_HASH (foo, struct freq, node, hash, &level2table)
 	  {
 	    if (0 == compare_freq_2level_ptr_3way (&foo, &c, bar))
 	      {
 		foo->count += c->count;
+		bar->total_count += c->count;
 		
 		if (foo->count > bar->largest)
 		  bar->largest = foo->count;
 		
-		flag = 1;
+		flag = true;
 		break;
 	      }
 	  }
@@ -228,6 +239,7 @@ barchart_create (const struct variable **var, int n_vars,
 	    if (c->count > bar->largest)
 	      bar->largest = aggregated_freq->count;
 	    
+	    bar->total_count += c->count;
 	    bar->cats[x++] = aggregated_freq;
 	  }
       }
@@ -249,6 +261,8 @@ destroy_cat_map (struct hmap *m)
   struct category *next = NULL;
   HMAP_FOR_EACH_SAFE (foo, next, struct category, node, m)
     {
+      value_destroy (&foo->val, foo->width);
+
       ds_destroy (&foo->label);
       free (foo);
     }