projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VLABELS
[pspp]
/
src
/
language
/
stats
/
ctables.c
diff --git
a/src/language/stats/ctables.c
b/src/language/stats/ctables.c
index e34621e2fa4ad270ede00e0d80d39059e35edf58..4f231caa7a9f8f6ace7596be97576b52f6dfce3a 100644
(file)
--- a/
src/language/stats/ctables.c
+++ b/
src/language/stats/ctables.c
@@
-3405,6
+3405,7
@@
ctables_table_output (struct ctables *ct, struct ctables_table *t)
}
type;
}
type;
+ enum settings_value_show vlabel; /* CTL_VAR only. */
size_t var_idx;
};
struct ctables_level *levels = xnmalloc (1 + 2 * max_depth, sizeof *levels);
size_t var_idx;
};
struct ctables_level *levels = xnmalloc (1 + 2 * max_depth, sizeof *levels);
@@
-3416,6
+3417,7
@@
ctables_table_output (struct ctables *ct, struct ctables_table *t)
{
levels[n_levels++] = (struct ctables_level) {
.type = CTL_VAR,
{
levels[n_levels++] = (struct ctables_level) {
.type = CTL_VAR,
+ .vlabel = (enum settings_value_show) vlabel,
.var_idx = k,
};
}
.var_idx = k,
};
}
@@
-3511,7
+3513,10
@@
ctables_table_output (struct ctables *ct, struct ctables_table *t)
const struct variable *var = nest->vars[level->var_idx];
struct pivot_value *label;
if (level->type == CTL_VAR)
const struct variable *var = nest->vars[level->var_idx];
struct pivot_value *label;
if (level->type == CTL_VAR)
- label = pivot_value_new_variable (var);
+ {
+ label = pivot_value_new_variable (var);
+ label->variable.show = level->vlabel;
+ }
else if (level->type == CTL_CATEGORY)
{
const struct ctables_cell_value *cv = &cell->axes[a].cvs[level->var_idx];
else if (level->type == CTL_CATEGORY)
{
const struct ctables_cell_value *cv = &cell->axes[a].cvs[level->var_idx];