projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
spv-select: Allow structure_member and png_member to be selected also.
[pspp]
/
src
/
output
/
spv
/
spv.h
diff --git
a/src/output/spv/spv.h
b/src/output/spv/spv.h
index 21d19a6615b9d6b8dbd93eb470a4b1a228dac540..eda7704dd70e746b257175df905dcdd67cafe59f 100644
(file)
--- a/
src/output/spv/spv.h
+++ b/
src/output/spv/spv.h
@@
-26,9
+26,11
@@
top-level headings as a child item.
*/
top-level headings as a child item.
*/
+#include <cairo.h>
#include <stdbool.h>
#include <stddef.h>
#include <stdint.h>
#include <stdbool.h>
#include <stddef.h>
#include <stdint.h>
+
#include "libpspp/compiler.h"
struct fmt_spec;
#include "libpspp/compiler.h"
struct fmt_spec;
@@
-68,7
+70,7
@@
enum spv_item_type
SPV_ITEM_TABLE,
SPV_ITEM_GRAPH,
SPV_ITEM_MODEL,
SPV_ITEM_TABLE,
SPV_ITEM_GRAPH,
SPV_ITEM_MODEL,
- SPV_ITEM_
OBJECT
,
+ SPV_ITEM_
IMAGE
,
SPV_ITEM_TREE,
};
SPV_ITEM_TREE,
};
@@
-116,8
+118,8
@@
struct spv_item
char *structure_member;
enum spv_item_type type;
char *structure_member;
enum spv_item_type type;
- char *label;
- char *command_id; /*
U
nique command identifier. */
+ char *label;
/* Localized label. */
+ char *command_id; /*
Non-localized u
nique command identifier. */
/* Whether the item is visible.
For SPV_ITEM_HEADING, false indicates that the item is collapsed.
/* Whether the item is visible.
For SPV_ITEM_HEADING, false indicates that the item is collapsed.
@@
-138,9
+140,9
@@
struct spv_item
/* SPV_ITEM_TEXT only. */
struct pivot_value *text;
/* SPV_ITEM_TEXT only. */
struct pivot_value *text;
- /* SPV_ITEM_
OBJECT
only. */
- char *
object_type
;
- c
har *uri
;
+ /* SPV_ITEM_
IMAGE
only. */
+ char *
png_member
;
+ c
airo_surface_t *image
;
};
void spv_item_format_path (const struct spv_item *, struct string *);
};
void spv_item_format_path (const struct spv_item *, struct string *);
@@
-157,11
+159,14
@@
size_t spv_item_get_n_children (const struct spv_item *);
struct spv_item *spv_item_get_child (const struct spv_item *, size_t idx);
bool spv_item_is_table (const struct spv_item *);
struct spv_item *spv_item_get_child (const struct spv_item *, size_t idx);
bool spv_item_is_table (const struct spv_item *);
-struct pivot_table *spv_item_get_table (const struct spv_item *);
+
const
struct pivot_table *spv_item_get_table (const struct spv_item *);
bool spv_item_is_text (const struct spv_item *);
const struct pivot_value *spv_item_get_text (const struct spv_item *);
bool spv_item_is_text (const struct spv_item *);
const struct pivot_value *spv_item_get_text (const struct spv_item *);
+bool spv_item_is_image (const struct spv_item *);
+cairo_surface_t *spv_item_get_image (const struct spv_item *);
+
bool spv_item_is_visible (const struct spv_item *);
#define SPV_ITEM_FOR_EACH(ITER, ROOT) \
bool spv_item_is_visible (const struct spv_item *);
#define SPV_ITEM_FOR_EACH(ITER, ROOT) \
@@
-173,7
+178,6
@@
struct spv_item *spv_item_next (const struct spv_item *);
const struct spv_item *spv_item_get_parent (const struct spv_item *);
size_t spv_item_get_level (const struct spv_item *);
const struct spv_item *spv_item_get_parent (const struct spv_item *);
size_t spv_item_get_level (const struct spv_item *);
-const char *spv_item_get_member_name (const struct spv_item *);
const char *spv_item_get_command_id (const struct spv_item *);
const char *spv_item_get_subtype (const struct spv_item *);
const char *spv_item_get_command_id (const struct spv_item *);
const char *spv_item_get_subtype (const struct spv_item *);