From a58399ea2ce9421f72cc5771cd215b121bd8f9dd Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Sat, 13 Aug 2022 22:41:38 -0700 Subject: [PATCH] reractor --- src/language/stats/ctables.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c index 6c8812a1a4..cd963e785f 100644 --- a/src/language/stats/ctables.c +++ b/src/language/stats/ctables.c @@ -4728,6 +4728,10 @@ ctables_prepare_table (struct ctables_table *t) drop_inner = true; n_drop = 0; } + else if (at == CTAT_LAYERROW) + n_drop = a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN; + else if (at == CTAT_LAYERCOL) + n_drop = a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW; else { n_drop = 0; @@ -4736,8 +4740,8 @@ ctables_prepare_table (struct ctables_table *t) : at == CTAT_COL ? a == PIVOT_AXIS_ROW : false) n_drop++; - if (((at == CTAT_ROW || at == CTAT_LAYERROW) && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN && a == PIVOT_AXIS_ROW) - || ((at == CTAT_COL || at == CTAT_LAYERCOL) && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW && a == PIVOT_AXIS_COLUMN)) + if ((at == CTAT_ROW && a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN) + || (at == CTAT_COL && a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW)) n_drop++; } -- 2.30.2