for (const struct pivot_category *c = d->presentation_leaves[index];
c; c = c->parent)
{
- if (!row_ofs)
+ /* A category can covert multiple rows. Only return the category for its
+ top row. */
+ if (row_ofs == c->extra_depth)
return c;
row_ofs -= 1 + c->extra_depth;
table_area_style_override (struct pool *pool,
const struct table_area_style *in,
const struct cell_style *cell_,
- const struct font_style *font_)
+ const struct font_style *font_,
+ bool rotate_label)
{
const struct cell_style *cell = cell_ ? cell_ : &in->cell_style;
const struct font_style *font = font_ ? font_ : &in->font_style;
? pool_alloc (pool, sizeof *out)
: xmalloc (sizeof *out));
*out = (struct table_area_style) {
- .cell_style.halign = cell->halign,
- .cell_style.valign = cell->valign,
+ .cell_style.halign = rotate_label ? TABLE_HALIGN_CENTER : cell->halign,
+ .cell_style.valign = rotate_label ? TABLE_VALIGN_CENTER : cell->valign,
.cell_style.decimal_offset = cell->decimal_offset,
.cell_style.margin[H][0] = cell->margin[H][0],
.cell_style.margin[H][1] = cell->margin[H][1],
if (value)
{
- if (value->cell_style || value->font_style)
+ if (value->cell_style || value->font_style || rotate_label)
table_add_style (t, x1, y1,
table_area_style_override (t->container, style,
value->cell_style,
- value->font_style));
+ value->font_style,
+ rotate_label));
for (size_t i = 0; i < value->n_footnotes; i++)
{
.content = ds_steal_cstr (&s),
.footnotes = xnmalloc (value->n_footnotes, sizeof *text->footnotes),
.style = table_area_style_override (
- NULL, area, value->cell_style, value->font_style),
+ NULL, area, value->cell_style, value->font_style, false),
};
for (size_t i = 0; i < value->n_footnotes; i++)
table_vline (t, rule, a, b0, b1);
}
+/* Fills row or column headings into T.
+
+ This function uses terminology and variable names for column headings, but
+ it also applies to row headings because it uses variables for the
+ differences, e.g. when for column headings it would use the H axis, it
+ instead uses 'h', which is set to H for column headings and V for row
+ headings. */
static void
compose_headings (struct table *t,
const struct pivot_axis *a_axis, enum table_axis a,
if (!a_axis->n_dimensions || !n_columns || !b_size)
return;
- int bottom_row = b_size - 1;
const int stride = MAX (1, a_axis->n_dimensions);
- for (int dim_index = 0; dim_index < a_axis->n_dimensions; dim_index++)
+
+ /* Below, we're going to iterate through the dimensions. Each dimension
+ occupies one or more rows in the heading. 'top_row' is the top row of
+ these (and 'top_row + d->label_depth - 1' is the bottom row). */
+ int top_row = 0;
+
+ /* We're going to iterate through dimensions and the rows that label them
+ from top to bottom (from outer to inner dimensions). As we move downward,
+ we start drawing vertical rules to separate categories and groups. After
+ we start drawing a vertical rule in a particular horizontal position, it
+ continues until the bottom of the heading. vrules[pos] indicates whether,
+ in our current row, we have already started drawing a vertical rule in
+ horizontal position 'pos'. (There are n_columns + 1 horizontal positions.
+ We allocate all of them for convenience below but only the inner n_columns
+ - 1 of them really matter.)
+
+ Here's an example that shows how vertical rules continue all the way
+ downward:
+
+ +-----------------------------------------------------+ __
+ | bbbb | |
+ +-----------------+-----------------+-----------------+ |dimension "bbbb"
+ | bbbb1 | bbbb2 | bbbb3 | _|
+ +-----------------+-----------------+-----------------+ __
+ | aaaa | aaaa | aaaa | |
+ +-----+-----+-----+-----+-----+-----+-----+-----+-----+ |dimension "aaaa"
+ |aaaa1|aaaa2|aaaa3|aaaa1|aaaa2|aaaa3|aaaa1|aaaa2|aaaa3| _|
+ +-----+-----+-----+-----+-----+-----+-----+-----+-----+
+
+ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^
+ | | | | | | | | | |
+ 0 1 2 3 4 5 6 7 8 9
+ |___________________vrules[] indexes__________________|
+
+ Our data structures are more naturally iterated from bottom to top (inner
+ to outer dimensions). A previous version of this code actually worked
+ like that, but it didn't draw all of the vertical lines correctly as shown
+ above. It ended up rendering the above heading much like shown below,
+ which isn't what users expect. The "aaaa" label really needs to be shown
+ three times for clarity:
+
+ +-----------------------------------------------------+
+ | bbbb |
+ +-----------------+-----------------+-----------------+
+ | bbbb1 | bbbb2 | bbbb3 |
+ +-----------------+-----------------+-----------------+
+ | | aaaa | |
+ +-----+-----+-----+-----+-----+-----+-----+-----+-----+
+ |aaaa1|aaaa2|aaaa3|aaaa1|aaaa2|aaaa3|aaaa1|aaaa2|aaaa3|
+ +-----+-----+-----+-----+-----+-----+-----+-----+-----+
+ */
+ bool *vrules = xzalloc (n_columns + 1);
+ vrules[0] = vrules[n_columns] = true;
+ for (int dim_index = a_axis->n_dimensions; --dim_index >= 0; )
{
const struct pivot_dimension *d = a_axis->dimensions[dim_index];
if (d->hide_all_labels)
for (size_t x1 = 0; x1 < n_columns;)
{
const struct pivot_category *c = find_category (
- d, dim_index, column_enumeration + x1 * stride, row_ofs);
+ d, dim_index, column_enumeration + x1 * stride,
+ d->label_depth - row_ofs - 1);
if (!c)
{
x1++;
size_t x2;
for (x2 = x1 + 1; x2 < n_columns; x2++)
{
+ if (vrules[x2])
+ break;
const struct pivot_category *c2 = find_category (
- d, dim_index, column_enumeration + x2 * stride, row_ofs);
+ d, dim_index, column_enumeration + x2 * stride,
+ d->label_depth - row_ofs - 1);
if (c != c2)
break;
}
- int y1 = bottom_row - row_ofs - c->extra_depth;
- int y2 = bottom_row - row_ofs + 1;
+ int y1 = top_row + row_ofs;
+ int y2 = top_row + row_ofs + c->extra_depth + 1;
bool is_outer_row = y1 == 0;
bool is_inner_row = y2 == b_size;
if (pivot_category_is_leaf (c) || c->show_label)
label_style, label_style_idx, c->name, footnotes,
show_values, show_variables, rotate);
- if (pivot_category_is_leaf (c) && x2 + 1 <= n_columns)
+ /* Draw all the vertical lines in our running example, other
+ than the far left and far right ones. Only the ones that
+ start in the last row of the heading are drawn with the
+ "category" style, the rest with the "dimension" style,
+ e.g. only the # below are category style:
+
+ +-----------------------------------------------------+
+ | bbbb |
+ +-----------------+-----------------+-----------------+
+ | bbbb1 | bbbb2 | bbbb3 |
+ +-----------------+-----------------+-----------------+
+ | aaaa | aaaa | aaaa |
+ +-----+-----+-----+-----+-----+-----+-----+-----+-----+
+ |aaaa1#aaaa2#aaaa3|aaaa1#aaaa2#aaaa3|aaaa1#aaaa2#aaaa3|
+ +-----+-----+-----+-----+-----+-----+-----+-----+-----+
+ */
+ enum pivot_border style
+ = (y1 == b_size - 1 ? cat_col_vert : dim_col_vert);
+ if (!vrules[x2])
{
- enum pivot_border style
- = (y1 == 0 && a_axis->label_depth > d->label_depth
- ? dim_col_vert
- : cat_col_vert);
draw_line (t, borders, style, b, x2 + a_ofs, y1,
t->n[b] - 1);
+ vrules[x2] = true;
}
- if (pivot_category_is_leaf (c) && x1 > 0)
+ if (!vrules[x1])
{
- enum pivot_border style
- = (y1 == 0 && a_axis->label_depth > d->label_depth
- ? dim_col_vert
- : cat_col_vert);
draw_line (t, borders, style, b, x1 + a_ofs, y1,
t->n[b] - 1);
+ vrules[x1] = true;
}
}
+
+ /* Draws the horizontal lines within a dimension, that is, those
+ that separate a separating a category (or group) from its
+ parent group or dimension's label. Our running example
+ doesn't have groups but the ==== lines below show the
+ separators between categories and their dimension label:
+
+ +-----------------------------------------------------+
+ | bbbb |
+ +=================+=================+=================+
+ | bbbb1 | bbbb2 | bbbb3 |
+ +-----------------+-----------------+-----------------+
+ | aaaa | aaaa | aaaa |
+ +=====+=====+=====+=====+=====+=====+=====+=====+=====+
+ |aaaa1|aaaa2|aaaa3|aaaa1|aaaa2|aaaa3|aaaa1|aaaa2|aaaa3|
+ +-----+-----+-----+-----+-----+-----+-----+-----+-----+
+ */
if (c->parent && c->parent->show_label)
draw_line (t, borders, cat_col_horz, a, y1,
x1 + a_ofs, x2 + a_ofs - 1);
-
x1 = x2;
}
}
if (d->root->show_label_in_corner && a_ofs > 0)
{
int bb[TABLE_N_AXES][2];
- bb[a][0] = a_ofs - 1;
+ bb[a][0] = 0;
bb[a][1] = a_ofs - 1;
- bb[b][0] = bottom_row - d->label_depth + 1;
- bb[b][1] = bottom_row;
+ bb[b][0] = top_row;
+ bb[b][1] = top_row + d->label_depth - 1;
fill_cell (t, bb[H][0], bb[V][0], bb[H][1], bb[V][1],
corner_style, PIVOT_AREA_CORNER, d->root->name, footnotes,
show_values, show_variables, false);
}
- if (dim_index > 1)
- draw_line (t, borders, dim_col_horz, a, bottom_row + 1, a_ofs,
+ /* Draw the horizontal line between dimensions, e.g. the ===== line here:
+
+ +-----------------------------------------------------+ __
+ | bbbb | |
+ +-----------------+-----------------+-----------------+ |dim "bbbb"
+ | bbbb1 | bbbb2 | bbbb3 | _|
+ +=================+=================+=================+ __
+ | aaaa | aaaa | aaaa | |
+ +-----+-----+-----+-----+-----+-----+-----+-----+-----+ |dim "aaaa"
+ |aaaa1|aaaa2|aaaa3|aaaa1|aaaa2|aaaa3|aaaa1|aaaa2|aaaa3| _|
+ +-----+-----+-----+-----+-----+-----+-----+-----+-----+
+ */
+ if (dim_index != a_axis->n_dimensions - 1)
+ draw_line (t, borders, dim_col_horz, a, top_row, a_ofs,
t->n[a] - 1);
-
- bottom_row -= d->label_depth;
+ top_row += d->label_depth;
}
+ free (vrules);
}
static void
for (size_t i = 0; i < PIVOT_N_AREAS; i++)
table->styles[i] = table_area_style_override (
- table->container, &pt->look->areas[i], NULL, NULL);
+ table->container, &pt->look->areas[i], NULL, NULL, false);
for (size_t i = 0; i < PIVOT_N_BORDERS; i++)
{
table_area_style_override (table->container,
&pt->look->areas[PIVOT_AREA_FOOTER],
pf->content->cell_style,
- pf->content->font_style));
+ pf->content->font_style,
+ false));
free (marker);
free (content);
}
PIVOT_AREA_COLUMN_LABELS,
&pt->look->areas[PIVOT_AREA_CORNER], footnotes,
pt->show_values, pt->show_variables,
- pt->rotate_inner_column_labels, false);
+ pt->rotate_outer_row_labels, false);
compose_headings (table,
&pt->axes[PIVOT_AXIS_ROW], V, &pt->axes[PIVOT_AXIS_COLUMN],
PIVOT_AREA_ROW_LABELS,
&pt->look->areas[PIVOT_AREA_CORNER], footnotes,
pt->show_values, pt->show_variables,
- false, pt->rotate_outer_row_labels);
+ false, pt->rotate_inner_column_labels);
size_t *dindexes = XCALLOC (pt->n_dimensions, size_t);
size_t y = 0;
}
free (dindexes);
- if (pt->corner_text && stub[H] && stub[V])
+ if ((pt->corner_text || !pt->look->row_labels_in_corner)
+ && stub[H] && stub[V])
fill_cell (table, 0, 0, stub[H] - 1, stub[V] - 1,
&pt->look->areas[PIVOT_AREA_CORNER], PIVOT_AREA_CORNER,
pt->corner_text, footnotes,
pt->show_values, pt->show_variables, false);
- if (table_nc (table) && table_nr (table))
+ if (table->n[H] && table->n[V])
{
table_hline (
table, get_table_rule (pt->look->borders, PIVOT_BORDER_INNER_TOP),
- 0, table_nc (table) - 1, 0);
+ 0, table->n[H] - 1, 0);
table_hline (
table, get_table_rule (pt->look->borders, PIVOT_BORDER_INNER_BOTTOM),
- 0, table_nc (table) - 1, table_nr (table));
+ 0, table->n[H] - 1, table->n[V]);
table_vline (
table, get_table_rule (pt->look->borders, PIVOT_BORDER_INNER_LEFT),
- 0, 0, table_nr (table) - 1);
+ 0, 0, table->n[V] - 1);
table_vline (
table, get_table_rule (pt->look->borders, PIVOT_BORDER_INNER_RIGHT),
- table_nc (table), 0, table_nr (table) - 1);
+ table->n[H], 0, table->n[V] - 1);
if (stub[V])
table_hline (
table, get_table_rule (pt->look->borders, PIVOT_BORDER_DATA_TOP),
- 0, table_nc (table) - 1, stub[V]);
+ 0, table->n[H] - 1, stub[V]);
if (stub[H])
table_vline (
table, get_table_rule (pt->look->borders, PIVOT_BORDER_DATA_LEFT),
- stub[H], 0, table_nr (table) - 1);
+ stub[H], 0, table->n[V] - 1);
}
free (column_enumeration);
free (row_enumeration);
- struct table_item *ti = table_item_create (table, NULL, NULL);
+ struct table_item *ti = table_item_create (table, NULL, NULL, pt->notes);
- if (pt->title)
+ if (pt->title && pt->show_title)
{
struct table_item_text *title = pivot_value_to_table_item_text (
pt->title, &pt->look->areas[PIVOT_AREA_TITLE], footnotes,
{
layers = xzalloc (sizeof *layers);
layers->style = table_area_style_override (
- NULL, &pt->look->areas[PIVOT_AREA_LAYERS], NULL, NULL);
+ NULL, &pt->look->areas[PIVOT_AREA_LAYERS], NULL, NULL, false);
layers->layers = xnmalloc (layer_axis->n_dimensions,
sizeof *layers->layers);
}
projects / pspp / blobdiff