projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bernhard Fischer:
[rrdtool.git]
/
src
/
rrd_graph.h
diff --git
a/src/rrd_graph.h
b/src/rrd_graph.h
index
22523be
..
dd03615
100644
(file)
--- a/
src/rrd_graph.h
+++ b/
src/rrd_graph.h
@@
-20,6
+20,8
@@
#define FORCE_UNITS 0x100 /* mask for all FORCE_UNITS_* flags */
#define FORCE_UNITS_SI 0x100 /* force use of SI units in Y axis (no effect in linear graph, SI instead of E in log graph) */
#define FORCE_UNITS 0x100 /* mask for all FORCE_UNITS_* flags */
#define FORCE_UNITS_SI 0x100 /* force use of SI units in Y axis (no effect in linear graph, SI instead of E in log graph) */
+#define FULL_SIZE_MODE 0x200 /* -width and -height indicate the total size of the image */
+
enum tmt_en { TMT_SECOND = 0, TMT_MINUTE, TMT_HOUR, TMT_DAY,
TMT_WEEK, TMT_MONTH, TMT_YEAR
};
enum tmt_en { TMT_SECOND = 0, TMT_MINUTE, TMT_HOUR, TMT_DAY,
TMT_WEEK, TMT_MONTH, TMT_YEAR
};
@@
-99,7
+101,6
@@
typedef struct ylab_t {
int lfac[4]; /* associated label spacing */
} ylab_t;
int lfac[4]; /* associated label spacing */
} ylab_t;
-
/* this structure describes the elements which can make up a graph.
because they are quite diverse, not all elements will use all the
possible parts of the structure. */
/* this structure describes the elements which can make up a graph.
because they are quite diverse, not all elements will use all the
possible parts of the structure. */
@@
-120,7
+121,7
@@
typedef struct graph_desc_t {
long ds; /* data source number */
enum cf_en cf; /* consolidation function */
enum cf_en cf_reduce; /* consolidation function for reduce_data() */
long ds; /* data source number */
enum cf_en cf; /* consolidation function */
enum cf_en cf_reduce; /* consolidation function for reduce_data() */
-
gfx_color_t col;
/* graph color */
+
struct gfx_color_t col;
/* graph color */
char format[FMT_LEG_LEN + 5]; /* format for PRINT AND GPRINT */
char legend[FMT_LEG_LEN + 5]; /* legend */
int strftm; /* should the VDEF legend be formated with strftime */
char format[FMT_LEG_LEN + 5]; /* format for PRINT AND GPRINT */
char legend[FMT_LEG_LEN + 5]; /* legend */
int strftm; /* should the VDEF legend be formated with strftime */
@@
-158,7
+159,7
@@
typedef struct image_desc_t {
#ifdef WITH_PIECHART
long piesize; /* size of the piechart */
#endif
#ifdef WITH_PIECHART
long piesize; /* size of the piechart */
#endif
-
gfx_color_t graph_col[__GRC_END__];
/* real colors for the graph */
+
struct gfx_color_t graph_col[__GRC_END__];
/* real colors for the graph */
text_prop_t text_prop[TEXT_PROP_LAST]; /* text properties */
char ylegend[210]; /* legend along the yaxis */
char title[210]; /* title for graph */
text_prop_t text_prop[TEXT_PROP_LAST]; /* text properties */
char ylegend[210]; /* legend along the yaxis */
char title[210]; /* title for graph */
@@
-182,6
+183,7
@@
typedef struct image_desc_t {
grindlines falls in integer pixel values */
char *imginfo; /* construct an <IMG ... tag and return
as first retval */
grindlines falls in integer pixel values */
char *imginfo; /* construct an <IMG ... tag and return
as first retval */
+ enum gfx_if_en imgformat; /* image format */
int lazy; /* only update the image if there is
reasonable probablility that the
existing one is out of date */
int lazy; /* only update the image if there is
reasonable probablility that the
existing one is out of date */
@@
-195,6
+197,7
@@
typedef struct image_desc_t {
long pie_x, pie_y; /* where is the centerpoint */
#endif
long ximg, yimg; /* total size of the image */
long pie_x, pie_y; /* where is the centerpoint */
#endif
long ximg, yimg; /* total size of the image */
+ double zoom;
double magfact; /* numerical magnitude */
long base; /* 1000 or 1024 depending on what we graph */
char symbol; /* magnitude symbol for y-axis */
double magfact; /* numerical magnitude */
long base; /* 1000 or 1024 depending on what we graph */
char symbol; /* magnitude symbol for y-axis */
@@
-209,7
+212,8
@@
typedef struct image_desc_t {
long prt_c; /* number of print elements */
long gdes_c; /* number of graphics elements */
graph_desc_t *gdes; /* points to an array of graph elements */
long prt_c; /* number of print elements */
long gdes_c; /* number of graphics elements */
graph_desc_t *gdes; /* points to an array of graph elements */
- gfx_canvas_t *canvas; /* graphics library */
+ cairo_surface_t *surface; /* graphics library */
+ cairo_t *cr; /* drawin context */
} image_desc_t;
/* Prototypes */
} image_desc_t;
/* Prototypes */
@@
-276,7
+280,8
@@
int print_calc(
image_desc_t *,
char ***);
int leg_place(
image_desc_t *,
char ***);
int leg_place(
- image_desc_t *);
+ image_desc_t *,
+ int *);
int calc_horizontal_grid(
image_desc_t *);
int draw_horizontal_grid(
int calc_horizontal_grid(
image_desc_t *);
int draw_horizontal_grid(