X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fctables.c;fp=src%2Flanguage%2Fstats%2Fctables.c;h=4f231caa7a9f8f6ace7596be97576b52f6dfce3a;hb=1009b87e0b1a2f9a8273033ba4e34c3cbb9d1540;hp=e34621e2fa4ad270ede00e0d80d39059e35edf58;hpb=c2bb9cc94805a9cecaa02ff6171115c484aef063;p=pspp diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c index e34621e2fa..4f231caa7a 100644 --- 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; + enum settings_value_show vlabel; /* CTL_VAR only. */ 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, + .vlabel = (enum settings_value_show) vlabel, .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) - 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];