projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
output-item: Collapse the inheritance hierarchy into a single struct.
[pspp]
/
src
/
language
/
stats
/
crosstabs.q
diff --git
a/src/language/stats/crosstabs.q
b/src/language/stats/crosstabs.q
index a66ee7798f2e4a4b0cdf6caec1f3c7494fa31cdd..e5f174f00773788b18025a8d735d877939f3c5eb 100644
(file)
--- a/
src/language/stats/crosstabs.q
+++ b/
src/language/stats/crosstabs.q
@@
-56,7
+56,6
@@
#include "libpspp/pool.h"
#include "libpspp/str.h"
#include "output/pivot-table.h"
#include "libpspp/pool.h"
#include "libpspp/str.h"
#include "output/pivot-table.h"
-#include "output/chart-item.h"
#include "output/charts/barchart.h"
#include "gl/minmax.h"
#include "output/charts/barchart.h"
#include "gl/minmax.h"
@@
-786,9
+785,9
@@
postcalc (struct crosstabs_proc *proc)
const struct variable **vars = xcalloc (n_vars, sizeof *vars);
for (size_t i = 0; i < n_vars; i++)
vars[i] = xt->vars[i].var;
const struct variable **vars = xcalloc (n_vars, sizeof *vars);
for (size_t i = 0; i < n_vars; i++)
vars[i] = xt->vars[i].var;
- chart_
item_
submit (barchart_create (vars, n_vars, _("Count"),
-
false,
-
xt->entries, xt->n_entries));
+ chart_submit (barchart_create (vars, n_vars, _("Count"),
+ false,
+ xt->entries, xt->n_entries));
free (vars);
}
}
free (vars);
}
}
@@
-1239,7
+1238,8
@@
create_crosstab_table (struct crosstabs_proc *proc, struct crosstabulation *xt,
ds_put_format (&title, ", %s=", var_to_string (var));
/* Insert the formatted value of VAR without any leading spaces. */
ds_put_format (&title, ", %s=", var_to_string (var));
/* Insert the formatted value of VAR without any leading spaces. */
- s = data_out (value, var_get_encoding (var), var_get_print_format (var));
+ s = data_out (value, var_get_encoding (var), var_get_print_format (var),
+ settings_get_fmt_settings ());
ds_put_cstr (&title, s + strspn (s, " "));
free (s);
}
ds_put_cstr (&title, s + strspn (s, " "));
free (s);
}
@@
-1247,7
+1247,6
@@
create_crosstab_table (struct crosstabs_proc *proc, struct crosstabulation *xt,
pivot_value_new_user_text_nocopy (ds_steal_cstr (&title)),
"Crosstabulation");
pivot_table_set_weight_format (table, &proc->weight_format);
pivot_value_new_user_text_nocopy (ds_steal_cstr (&title)),
"Crosstabulation");
pivot_table_set_weight_format (table, &proc->weight_format);
- table->look.omit_empty = true;
struct pivot_dimension *statistics = pivot_dimension_create (
table, PIVOT_AXIS_ROW, N_("Statistics"));
struct pivot_dimension *statistics = pivot_dimension_create (
table, PIVOT_AXIS_ROW, N_("Statistics"));
@@
-1287,7
+1286,6
@@
create_chisq_table (struct crosstabulation *xt)
{
struct pivot_table *chisq = pivot_table_create (N_("Chi-Square Tests"));
pivot_table_set_weight_format (chisq, &xt->weight_format);
{
struct pivot_table *chisq = pivot_table_create (N_("Chi-Square Tests"));
pivot_table_set_weight_format (chisq, &xt->weight_format);
- chisq->look.omit_empty = true;
pivot_dimension_create (
chisq, PIVOT_AXIS_ROW, N_("Statistics"),
pivot_dimension_create (
chisq, PIVOT_AXIS_ROW, N_("Statistics"),
@@
-1318,7
+1316,6
@@
create_sym_table (struct crosstabulation *xt)
{
struct pivot_table *sym = pivot_table_create (N_("Symmetric Measures"));
pivot_table_set_weight_format (sym, &xt->weight_format);
{
struct pivot_table *sym = pivot_table_create (N_("Symmetric Measures"));
pivot_table_set_weight_format (sym, &xt->weight_format);
- sym->look.omit_empty = true;
pivot_dimension_create (
sym, PIVOT_AXIS_COLUMN, N_("Values"),
pivot_dimension_create (
sym, PIVOT_AXIS_COLUMN, N_("Values"),
@@
-1358,7
+1355,6
@@
create_risk_table (struct crosstabulation *xt,
{
struct pivot_table *risk = pivot_table_create (N_("Risk Estimate"));
pivot_table_set_weight_format (risk, &xt->weight_format);
{
struct pivot_table *risk = pivot_table_create (N_("Risk Estimate"));
pivot_table_set_weight_format (risk, &xt->weight_format);
- risk->look.omit_empty = true;
struct pivot_dimension *values = pivot_dimension_create (
risk, PIVOT_AXIS_COLUMN, N_("Values"),
struct pivot_dimension *values = pivot_dimension_create (
risk, PIVOT_AXIS_COLUMN, N_("Values"),
@@
-1405,7
+1401,6
@@
create_direct_table (struct crosstabulation *xt)
{
struct pivot_table *direct = pivot_table_create (N_("Directional Measures"));
pivot_table_set_weight_format (direct, &xt->weight_format);
{
struct pivot_table *direct = pivot_table_create (N_("Directional Measures"));
pivot_table_set_weight_format (direct, &xt->weight_format);
- direct->look.omit_empty = true;
pivot_dimension_create (
direct, PIVOT_AXIS_COLUMN, N_("Values"),
pivot_dimension_create (
direct, PIVOT_AXIS_COLUMN, N_("Values"),