X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fexamine.q;h=090d5835db9c10db80d9451f4902a935a253ee84;hb=a46ed36dcbab01d36c08cf560ff96a7effd9779a;hp=1d399b5a1888908a4b08c8cfe2874da0af039bed;hpb=cb586666724d5fcbdb658ce471b85484f0a7babe;p=pspp-builds.git

diff --git a/src/language/stats/examine.q b/src/language/stats/examine.q
index 1d399b5a..090d5835 100644
--- a/src/language/stats/examine.q
+++ b/src/language/stats/examine.q
@@ -17,7 +17,6 @@
 #include <config.h>
 
 #include <gsl/gsl_cdf.h>
-#include <libpspp/message.h>
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -43,15 +42,14 @@
 #include <language/dictionary/split-file.h>
 #include <language/lexer/lexer.h>
 #include <libpspp/compiler.h>
-#include <libpspp/hash.h>
 #include <libpspp/message.h>
 #include <libpspp/misc.h>
 #include <libpspp/str.h>
 #include <math/moments.h>
-#include <output/charts/box-whisker.h>
+#include <output/chart-item.h>
+#include <output/charts/boxplot.h>
 #include <output/charts/np-plot.h>
-#include <output/manager.h>
-#include <output/table.h>
+#include <output/tab.h>
 
 #include "minmax.h"
 #include "xalloc.h"
@@ -61,9 +59,7 @@
 #define N_(msgid) msgid
 
 /* (headers) */
-#include <output/chart.h>
 #include <output/charts/plot-hist.h>
-#include <output/charts/plot-chart.h>
 #include <math/histogram.h>
 
 /* (specification)
@@ -339,7 +335,7 @@ show_npplot (const struct variable **dependent_var,
 	  struct string label;
 	  const struct factor_result *result =
 	    ll_data (ll, struct factor_result, ll);
-          struct chart *npp, *dnpp;
+          struct chart_item *npp, *dnpp;
           struct casereader *reader;
           struct np *np;
 
@@ -357,16 +353,17 @@ show_npplot (const struct variable **dependent_var,
           if (npp == NULL || dnpp == NULL)
             {
               msg (MW, _("Not creating NP plot because data set is empty."));
-              chart_unref (npp);
-              chart_unref (dnpp);
+              chart_item_unref (npp);
+              chart_item_unref (dnpp);
             }
           else
             {
-              chart_submit (npp);
-              chart_submit (dnpp);
+              chart_item_submit (npp);
+              chart_item_submit (dnpp);
             }
 
 	  statistic_destroy (&np->parent.parent);
+	  casereader_destroy (reader);
 	}
     }
 }
@@ -406,8 +403,9 @@ show_histogram (const struct variable **dependent_var,
 
           moments1_calculate (result->metrics[v].moments,
                               &n, &mean, &var, NULL,  NULL);
-          chart_submit (histogram_chart_create (histogram, ds_cstr (&str),
-                                                n, mean, sqrt (var), false));
+          chart_item_submit (histogram_chart_create (histogram->gsl_hist,
+                                                     ds_cstr (&str), n, mean,
+                                                     sqrt (var), false));
 
 	  ds_destroy (&str);
 	}
@@ -471,7 +469,7 @@ show_boxplot_groups (const struct variable **dependent_var,
 	  ds_destroy (&str);
 	}
 
-      chart_submit (boxplot_get_chart (boxplot));
+      boxplot_submit (boxplot);
     }
 }
 
@@ -519,7 +517,7 @@ show_boxplot_variables (const struct variable **dependent_var,
           metrics->box_whisker = NULL;
 	}
 
-      chart_submit (boxplot_get_chart (boxplot));
+      boxplot_submit (boxplot);
     }
 }
 
@@ -1135,8 +1133,6 @@ show_summary (const struct variable **dependent_var, int n_dep_var,
   tbl = tab_create (n_cols, n_rows);
   tab_headers (tbl, heading_columns, 0, heading_rows, 0);
 
-  tab_dim (tbl, tab_natural_dimensions, NULL, NULL);
-
   /* Outline the box */
   tab_box (tbl,
 	   TAL_2, TAL_2,
@@ -1372,8 +1368,6 @@ show_descriptives (const struct variable **dependent_var,
   tbl = tab_create (n_cols, n_rows);
   tab_headers (tbl, heading_columns, 0, heading_rows, 0);
 
-  tab_dim (tbl, tab_natural_dimensions, NULL, NULL);
-
   /* Outline the box */
   tab_box (tbl,
 	   TAL_2, TAL_2,
@@ -1684,8 +1678,6 @@ show_extremes (const struct variable **dependent_var,
   tbl = tab_create (n_cols, n_rows);
   tab_headers (tbl, heading_columns, 0, heading_rows, 0);
 
-  tab_dim (tbl, tab_natural_dimensions, NULL, NULL);
-
   /* Outline the box */
   tab_box (tbl,
 	   TAL_2, TAL_2,
@@ -1888,8 +1880,6 @@ show_percentiles (const struct variable **dependent_var,
   tbl = tab_create (n_cols, n_rows);
   tab_headers (tbl, heading_columns, 0, heading_rows, 0);
 
-  tab_dim (tbl, tab_natural_dimensions, NULL, NULL);
-
   /* Outline the box */
   tab_box (tbl,
 	   TAL_2, TAL_2,