#include "libpspp/cast.h"
#include "output/driver.h"
#include "output/output-item-provider.h"
+#include "output/pivot-table.h"
#include "output/table-item.h"
+#include "output/table-provider.h"
#include "gl/xalloc.h"
-struct table_item_text *
-table_item_text_create (const char *content)
-{
- if (!content)
- return NULL;
-
- struct table_item_text *text = xmalloc (sizeof *text);
- *text = (struct table_item_text) { .content = xstrdup (content),
- .halign = TAB_LEFT };
- return text;
-}
-
-struct table_item_text *
-table_item_text_clone (const struct table_item_text *old)
-{
- if (!old)
- return NULL;
-
- struct table_item_text *new = xmalloc (sizeof *new);
- *new = (struct table_item_text) {
- .content = xstrdup (old->content),
- .footnotes = xmemdup (old->footnotes,
- old->n_footnotes * sizeof *old->footnotes),
- .n_footnotes = old->n_footnotes,
- .style = cell_style_clone (NULL, old->style),
- .halign = old->halign,
- };
- return new;
-}
-
-void
-table_item_text_destroy (struct table_item_text *text)
-{
- if (text)
- {
- free (text->content);
- free (text->footnotes);
- cell_style_free (text->style);
- free (text);
- }
-}
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
-/* Initializes ITEM as a table item for rendering TABLE. The new table item
- initially has the specified TITLE and CAPTION, which may each be NULL. The
- caller retains ownership of TITLE and CAPTION. */
+/* Initializes ITEM as a table item for rendering PT. Takes ownership of
+ PT. */
struct table_item *
-table_item_create (struct table *table, const char *title, const char *caption)
+table_item_create (struct pivot_table *pt)
{
+ pivot_table_assign_label_depth (pt);
+
struct table_item *item = xmalloc (sizeof *item);
- output_item_init (&item->output_item, &table_item_class);
- item->table = table;
- item->title = table_item_text_create (title);
- item->layers = NULL;
- item->caption = table_item_text_create (caption);
+ *item = (struct table_item) {
+ .output_item = OUTPUT_ITEM_INITIALIZER (&table_item_class),
+ .output_item.command_name = xstrdup_if_nonnull (pt->command_c),
+ .pt = pt,
+ };
return item;
}
-/* Returns the table contained by TABLE_ITEM. The caller must not modify or
- unref the returned table. */
-const struct table *
-table_item_get_table (const struct table_item *table_item)
-{
- return table_item->table;
-}
-
-/* Returns ITEM's title, which is a null pointer if no title has been
- set. */
-const struct table_item_text *
-table_item_get_title (const struct table_item *item)
-{
- return item->title;
-}
-
-/* Sets ITEM's title to TITLE, replacing any previous title. Specify NULL for
- TITLE to clear any title from ITEM. The caller retains ownership of TITLE.
-
- This function may only be used on a table_item that is unshared. */
-void
-table_item_set_title (struct table_item *item,
- const struct table_item_text *title)
-{
- assert (!table_item_is_shared (item));
- table_item_text_destroy (item->title);
- item->title = table_item_text_clone (title);
-}
-
-/* Returns ITEM's layers, which will be a null pointer if no layers have been
- set. */
-const struct table_item_text *
-table_item_get_layers (const struct table_item *item)
-{
- return item->layers;
-}
-
-/* Sets ITEM's layers to LAYERS, replacing any previous layers. Specify NULL
- for LAYERS to clear any layers from ITEM. The caller retains ownership of
- LAYERS.
-
- This function may only be used on a table_item that is unshared. */
-void
-table_item_set_layers (struct table_item *item,
- const struct table_item_text *layers)
-{
- assert (!table_item_is_shared (item));
- table_item_text_destroy (item->layers);
- item->layers = table_item_text_clone (layers);
-}
-
-/* Returns ITEM's caption, which is a null pointer if no caption has been
- set. */
-const struct table_item_text *
-table_item_get_caption (const struct table_item *item)
-{
- return item->caption;
-}
-
-/* Sets ITEM's caption to CAPTION, replacing any previous caption. Specify
- NULL for CAPTION to clear any caption from ITEM. The caller retains
- ownership of CAPTION.
-
- This function may only be used on a table_item that is unshared. */
-void
-table_item_set_caption (struct table_item *item,
- const struct table_item_text *caption)
-{
- assert (!table_item_is_shared (item));
- table_item_text_destroy (item->caption);
- item->caption = table_item_text_clone (caption);
-}
-
/* Submits TABLE_ITEM to the configured output drivers, and transfers ownership
to the output subsystem. */
void
output_submit (&table_item->output_item);
}
\f
+static const char *
+table_item_get_label (const struct output_item *output_item)
+{
+ struct table_item *item = to_table_item (output_item);
+
+ if (!item->cached_label)
+ {
+ if (!item->pt->title)
+ return _("Table");
+
+ item->cached_label = pivot_value_to_string (item->pt->title, item->pt);
+ }
+ return item->cached_label;
+}
+
static void
table_item_destroy (struct output_item *output_item)
{
struct table_item *item = to_table_item (output_item);
- table_item_text_destroy (item->title);
- table_item_text_destroy (item->layers);
- table_item_text_destroy (item->caption);
- table_unref (item->table);
+ pivot_table_unref (item->pt);
+ free (item->cached_label);
free (item);
}
const struct output_item_class table_item_class =
{
+ table_item_get_label,
table_item_destroy,
};
projects / pspp / blobdiff