X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Frender.c;h=08f89a177ed1cc1c3c073974923dff0f4c57e354;hb=dc341c8d3ebc6ac700c7d92eb289bc7a0f4431c1;hp=f9a93a4016113241ebfcc11983cae36b90a987bb;hpb=a5b07bb0f5c2df4542b3d48bab1aefd17abb1982;p=pspp diff --git a/src/output/render.c b/src/output/render.c index f9a93a4016..08f89a177e 100644 --- a/src/output/render.c +++ b/src/output/render.c @@ -26,9 +26,9 @@ #include "libpspp/hash-functions.h" #include "libpspp/hmap.h" #include "libpspp/pool.h" +#include "output/pivot-output.h" #include "output/pivot-table.h" #include "output/render.h" -#include "output/table-item.h" #include "output/table.h" #include "gl/minmax.h" @@ -539,9 +539,8 @@ render_page_allocate__ (const struct render_params *params, for (int i = 0; i < TABLE_N_AXES; i++) { - page->cp[i] = xmalloc ((2 * n[i] + 2) * sizeof *page->cp[i]); - page->join_crossing[i] = xzalloc ((n[i] + 1) - * sizeof *page->join_crossing[i]); + page->cp[i] = xcalloc ((2 * n[i] + 2) , sizeof *page->cp[i]); + page->join_crossing[i] = xcalloc ((n[i] + 1) , sizeof *page->join_crossing[i]); } hmap_init (&page->overflows); @@ -714,8 +713,8 @@ render_page_create (const struct render_params *params, struct table *table, { enum { MIN, MAX }; - int nc = table_nc (table); - int nr = table_nr (table); + int nc = table->n[H]; + int nr = table->n[V]; /* Figure out rule widths. */ int *rules[TABLE_N_AXES]; @@ -732,7 +731,7 @@ render_page_create (const struct render_params *params, struct table *table, span multiple columns. */ struct render_row *columns[2]; for (int i = 0; i < 2; i++) - columns[i] = xzalloc (nc * sizeof *columns[i]); + columns[i] = xcalloc (nc, sizeof *columns[i]); for (int y = 0; y < nr; y++) for (int x = 0; x < nc;) { @@ -790,7 +789,7 @@ render_page_create (const struct render_params *params, struct table *table, /* Decide final column widths. */ int table_widths[2]; for (int i = 0; i < 2; i++) - table_widths[i] = calculate_table_width (table_nc (table), + table_widths[i] = calculate_table_width (table->n[H], columns[i], rules[H]); struct render_page *page; @@ -816,7 +815,7 @@ render_page_create (const struct render_params *params, struct table *table, } /* Calculate heights of cells that do not span multiple rows. */ - struct render_row *rows = xzalloc (nr * sizeof *rows); + struct render_row *rows = XCALLOC (nr, struct render_row); for (int y = 0; y < nr; y++) for (int x = 0; x < nc;) { @@ -1088,7 +1087,7 @@ render_cell (const struct render_page *page, const int ofs[TABLE_N_AXES], bb[V][0] = clip[V][0] = ofs[V] + page->cp[V][cell->d[V][0] * 2 + 1]; bb[V][1] = clip[V][1] = ofs[V] + page->cp[V][cell->d[V][1] * 2]; - enum table_valign valign = cell->style->cell_style.valign; + enum table_valign valign = cell->cell_style->valign; int valign_offset = 0; if (valign != TABLE_VALIGN_TOP) { @@ -1483,28 +1482,23 @@ struct render_pager const struct render_params *params; double scale; - /* An array of "render_page"s to be rendered, in order, vertically. From - the user's perspective, there's only one table per render_pager, but the - implementation treats the title, table body, caption, footnotes, - etc. each as a table, and that's why we have an array here. */ - struct render_page **pages; - size_t n_pages, allocated_pages; + /* An array of "render_page"s to be rendered, in order, vertically. There + may be up to 5 pages, for the pivot table's title, layers, body, + captions, and footnotes. */ + struct render_page *pages[5]; + size_t n_pages; size_t cur_page; struct render_break x_break; struct render_break y_break; }; -static const struct render_page * +static void render_pager_add_table (struct render_pager *p, struct table *table, int min_width) { - if (p->n_pages >= p->allocated_pages) - p->pages = x2nrealloc (p->pages, &p->allocated_pages, sizeof *p->pages); - - struct render_page *page = render_page_create (p->params, table, min_width); - p->pages[p->n_pages++] = page; - return page; + if (table) + p->pages[p->n_pages++] = render_page_create (p->params, table, min_width); } static void @@ -1515,85 +1509,33 @@ render_pager_start_page (struct render_pager *p) render_break_init_empty (&p->y_break); } -static void -add_footnote_page (struct render_pager *p, const struct table_item *item) -{ - const struct footnote **f; - size_t n_footnotes = table_collect_footnotes (item, &f); - if (!n_footnotes) - return; - - struct table *t = table_create (1, n_footnotes, 0, 0, 0, 0); - - for (size_t i = 0; i < n_footnotes; i++) - { - table_text_format (t, 0, i, 0, "%s. %s", f[i]->marker, f[i]->content); - table_add_style (t, 0, i, f[i]->style); - } - render_pager_add_table (p, t, 0); - - free (f); -} - -static void -add_text_page (struct render_pager *p, const struct table_item_text *t, - int min_width) -{ - if (!t) - return; - - struct table *tab = table_create (1, 1, 0, 0, 0, 0); - table_text (tab, 0, 0, 0, t->content); - for (size_t i = 0; i < t->n_footnotes; i++) - table_add_footnote (tab, 0, 0, t->footnotes[i]); - if (t->style) - tab->styles[0] = table_area_style_clone (tab->container, t->style); - render_pager_add_table (p, tab, min_width); -} - -static void -add_layers_page (struct render_pager *p, - const struct table_item_layers *layers, int min_width) -{ - if (!layers) - return; - - struct table *tab = table_create (1, layers->n_layers, 0, 0, 0, 0); - for (size_t i = 0; i < layers->n_layers; i++) - { - const struct table_item_layer *layer = &layers->layers[i]; - table_text (tab, 0, i, 0, layer->content); - for (size_t j = 0; j < layer->n_footnotes; j++) - table_add_footnote (tab, 0, i, layer->footnotes[j]); - } - if (layers->style) - tab->styles[0] = table_area_style_clone (tab->container, layers->style); - render_pager_add_table (p, tab, min_width); -} - -/* Creates and returns a new render_pager for rendering TABLE_ITEM on the - device with the given PARAMS. */ +/* Creates and returns a new render_pager for rendering PT on the device + with the given PARAMS. */ struct render_pager * render_pager_create (const struct render_params *params, - const struct table_item *table_item) + const struct pivot_table *pt, + const size_t *layer_indexes) { - const struct table *table = table_item_get_table (table_item); + if (!layer_indexes) + layer_indexes = pt->current_layer; + + struct table *title, *layers, *body, *caption, *footnotes; + pivot_output (pt, layer_indexes, params->printing, + &title, &layers, &body, &caption, &footnotes, NULL, NULL); /* Figure out the width of the body of the table. Use this to determine the base scale. */ - struct render_page *page = render_page_create (params, table_ref (table), 0); - int body_width = table_width (page, H); + struct render_page *body_page = render_page_create (params, body, 0); + int body_width = table_width (body_page, H); double scale = 1.0; if (body_width > params->size[H]) { - if (table_item->pt - && table_item->pt->look->shrink_to_fit[H] - && params->ops->scale) + if (pt->look->shrink_to_fit[H] && params->ops->scale) scale = params->size[H] / (double) body_width; else { struct render_break b; - render_break_init (&b, page, H); + render_break_init (&b, render_page_ref (body_page), H); struct render_page *subpage = render_break_next (&b, params->size[H]); body_width = subpage ? subpage->cp[H][2 * subpage->n[H] + 1] : 0; @@ -1605,11 +1547,12 @@ render_pager_create (const struct render_params *params, /* Create the pager. */ struct render_pager *p = xmalloc (sizeof *p); *p = (struct render_pager) { .params = params, .scale = scale }; - add_text_page (p, table_item_get_title (table_item), body_width); - add_layers_page (p, table_item_get_layers (table_item), body_width); - render_pager_add_table (p, table_ref (table_item_get_table (table_item)), 0); - add_text_page (p, table_item_get_caption (table_item), 0); - add_footnote_page (p, table_item); + render_pager_add_table (p, title, body_width); + render_pager_add_table (p, layers, body_width); + p->pages[p->n_pages++] = body_page; + render_pager_add_table (p, caption, 0); + render_pager_add_table (p, footnotes, 0); + assert (p->n_pages <= sizeof p->pages / sizeof *p->pages); /* If we're shrinking tables to fit the page length, then adjust the scale factor. @@ -1619,9 +1562,7 @@ render_pager_create (const struct render_params *params, they won't break across as much vertical space, thus shrinking the table vertically more than the scale would imply. Shrinking only as much as necessary would require an iterative search. */ - if (table_item->pt - && table_item->pt->look->shrink_to_fit[V] - && params->ops->scale) + if (pt->look->shrink_to_fit[V] && params->ops->scale) { int total_height = 0; for (size_t i = 0; i < p->n_pages; i++) @@ -1645,7 +1586,6 @@ render_pager_destroy (struct render_pager *p) render_break_destroy (&p->y_break); for (size_t i = 0; i < p->n_pages; i++) render_page_unref (p->pages[i]); - free (p->pages); free (p); } } @@ -2035,7 +1975,7 @@ static struct render_overflow * insert_overflow (struct render_page_selection *s, const struct table_cell *cell) { - struct render_overflow *of = xzalloc (sizeof *of); + struct render_overflow *of = XZALLOC (struct render_overflow); cell_to_subpage (s, cell, of->d); hmap_insert (&s->subpage->overflows, &of->node, hash_cell (of->d[H], of->d[V]));