Rewrite PSPP output engine.

[pspp-builds.git] / src / language / stats / npar-summary.c

diff --git a/src/language/stats/npar-summary.c b/src/language/stats/npar-summary.c
index 04c83e1a0ed694456d3518e5c9ccad30101a2abb..05fa1d02527951bf7ecbf26a724ee76cfe2e8ffe 100644 (file)
--- a/src/language/stats/npar-summary.c
+++ b/src/language/stats/npar-summary.c
@@ -15,7 +15,9 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
-#include <output/table.h>
+
+#include <data/format.h>
+#include <output/tab.h>
 #include <data/casereader.h>
 #include <libpspp/hash.h>
 #include <data/variable.h>
@@ -97,20 +99,18 @@ do_summary_box (const struct descriptives *desc,
   int columns = 1 ;
   struct tab_table *table ;
 
-
   if ( desc ) columns += 5;
   if ( quartiles ) columns += 3;
 
-  table = tab_create (columns, 2 + n_vars, 0);
+  table = tab_create (columns, 2 + n_vars);
 
-  tab_dim (table, tab_natural_dimensions);
 
   tab_title (table, _("Descriptive Statistics"));
 
   tab_headers (table, 1, 0, 1, 0);
 
   tab_box (table, TAL_1, TAL_1, -1, TAL_1,
-          0, 0, table->nc - 1, tab_nr(table) - 1 );
+          0, 0, tab_nc (table) - 1, tab_nr(table) - 1 );
 
   tab_hline (table, TAL_2, 0, tab_nc (table) -1, 2);
   tab_vline (table, TAL_2, 1, 0, tab_nr (table) - 1);
@@ -152,15 +152,19 @@ do_summary_box (const struct descriptives *desc,
       col++;
     }
 
+
   for ( v = 0 ; v < n_vars ; ++v )
     {
-      tab_text (table, 0, 2 + v, TAT_NONE, var_to_string (vv[v]));
+      const struct variable *var = vv[v];
+      const struct fmt_spec *fmt = var_get_print_format (var);
+
+      tab_text (table, 0, 2 + v, 0, var_to_string (var));
 
-      tab_float (table, 1, 2 + v, TAT_NONE, desc[v].n, 8, 0);
-      tab_float (table, 2, 2 + v, TAT_NONE, desc[v].mean, 8, 3);
-      tab_float (table, 3, 2 + v, TAT_NONE, desc[v].std_dev, 8, 3);
-      tab_float (table, 4, 2 + v, TAT_NONE, desc[v].min, 8, 3);
-      tab_float (table, 5, 2 + v, TAT_NONE, desc[v].max, 8, 3);
+      tab_double (table, 1, 2 + v, 0, desc[v].n, fmt);
+      tab_double (table, 2, 2 + v, 0, desc[v].mean, fmt);
+      tab_double (table, 3, 2 + v, 0, desc[v].std_dev, fmt);
+      tab_double (table, 4, 2 + v, 0, desc[v].min, fmt);
+      tab_double (table, 5, 2 + v, 0, desc[v].max, fmt);
     }