size_t n_drop;
bool drop_inner = false;
- if (at == CTAT_SUBTABLE
- && t->clabels_from_axis != PIVOT_AXIS_LAYER)
+ if (at == CTAT_SUBTABLE)
{
- if (t->clabels_to_axis != PIVOT_AXIS_LAYER)
- n_drop = a == t->clabels_from_axis ? 2 : 0;
- else
+ if (t->clabels_from_axis != PIVOT_AXIS_LAYER)
{
- drop_inner = a == t->clabels_from_axis;
- n_drop = a != t->clabels_from_axis && a != PIVOT_AXIS_LAYER;
+ if (t->clabels_to_axis != PIVOT_AXIS_LAYER)
+ n_drop = a == t->clabels_from_axis ? 2 : 0;
+ else
+ {
+ drop_inner = a == t->clabels_from_axis;
+ n_drop = a != t->clabels_from_axis && a != PIVOT_AXIS_LAYER;
+ }
}
+ else
+ n_drop = a != PIVOT_AXIS_LAYER;
}
else if (at == CTAT_ROW && a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN)
n_drop = 0;
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
+ else if (at == CTAT_ROW)
{
- n_drop = 0;
- if (at == CTAT_SUBTABLE ? a != PIVOT_AXIS_LAYER
- : at == CTAT_ROW ? a == PIVOT_AXIS_COLUMN
- : at == CTAT_COL ? a == PIVOT_AXIS_ROW
- : false)
+ n_drop = a == PIVOT_AXIS_COLUMN;
+ if (a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN)
n_drop++;
- 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))
+ }
+ else if (at == CTAT_COL)
+ {
+ n_drop = a == PIVOT_AXIS_ROW;
+ if (a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW)
n_drop++;
}
+ else
+ {
+ n_drop = 0;
+ }
if (drop_inner)
{