diff --git a/src/rrd_graph.h b/src/rrd_graph.h
index 1b452848edb0e15663dd08c3285bab1200166fe4..18b49a3e8a45f489c3c626dafdabef2130a7ee65 100644 (file)
--- a/src/rrd_graph.h
+++ b/src/rrd_graph.h
#define y1 cairo_y1
#define index cairo_index
+/* this may configure __EXTENSIONS__ without which pango will fail to compile
+ so load this early */
+#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
+#include "../win32/config.h"
+#else
+#ifdef HAVE_CONFIG_H
+#include "../rrd_config.h"
+#endif
+#endif
+
#include <cairo.h>
#include <cairo-pdf.h>
#include <cairo-svg.h>
#include <cairo-ps.h>
+
#include <pango/pangocairo.h>
+
#include "rrd_tool.h"
#include "rrd_rpncalc.h"
+#ifdef WIN32
+# include <windows.h>
+# define MAXPATH MAX_PATH
+#endif
#define ALTYGRID 0x01 /* use alternative y grid algorithm */
#define ALTAUTOSCALE 0x02 /* use alternative algorithm to find lower and upper bounds */
#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 */
+#define NO_RRDTOOL_TAG 0x400 /* disable the rrdtool tag */
+
+#define gdes_fetch_key(x) sprintf_alloc("%s:%d:%d:%d:%d",x.rrd,x.cf,x.cf_reduce,x.start_orig,x.end_orig,x.step_orig)
enum tmt_en { TMT_SECOND = 0, TMT_MINUTE, TMT_HOUR, TMT_DAY,
TMT_WEEK, TMT_MONTH, TMT_YEAR
, VDEF_LSLSLOPE /* least squares line slope */
, VDEF_LSLINT /* least squares line y_intercept */
, VDEF_LSLCORREL /* least squares line correlation coefficient */
+ , VDEF_PERCENTNAN /* Nth percentile ignoring NAN*/
};
-enum text_prop_en { TEXT_PROP_DEFAULT = 0, /* default settings */
+enum text_prop_en {
+ TEXT_PROP_DEFAULT = 0, /* default settings */
TEXT_PROP_TITLE, /* properties for the title */
TEXT_PROP_AXIS, /* for the numbers next to the axis */
TEXT_PROP_UNIT, /* for the vertical unit description */
- TEXT_PROP_LEGEND, /* fot the legend below the graph */
+ TEXT_PROP_LEGEND, /* for the legend below the graph */
+ TEXT_PROP_WATERMARK, /* for the little text to the side of the graph */
TEXT_PROP_LAST
};
+enum legend_pos{ NORTH = 0, WEST, SOUTH, EAST };
+enum legend_direction { TOP_DOWN = 0, BOTTOM_UP };
enum gfx_if_en { IF_PNG = 0, IF_SVG, IF_EPS, IF_PDF };
enum gfx_en { GFX_LINE = 0, GFX_AREA, GFX_TEXT };
typedef struct text_prop_t {
double size;
char font[1024];
+ PangoFontDescription *font_desc;
} text_prop_t;
enum gf_en gf; /* graphing function */
int stack; /* boolean */
int debug; /* boolean */
+ int skipscale; /* boolean */
char vname[MAX_VNAME_LEN + 1]; /* name of the variable */
long vidx; /* gdes reference */
char rrd[1024]; /* name of the rrd_file containing data */
int ndash; /* number of dash segments */
double offset; /* dash offset along the line */
+
enum txa_en txtalign; /* change default alignment strategy for text */
} graph_desc_t;
char title[210]; /* title for graph */
char watermark[110]; /* watermark for graph */
int draw_x_grid; /* no x-grid at all */
- int draw_y_grid; /* no x-grid at all */
+ int draw_y_grid; /* no y-grid at all */
+ unsigned int draw_3d_border; /* size of border in pixels, 0 for off */
+ unsigned int dynamic_labels; /* pick the label shape according to the line drawn */
double grid_dash_on, grid_dash_off;
xlab_t xlab_user; /* user defined labeling for xaxis */
char xlab_form[210]; /* format for the label on the xaxis */
+ double second_axis_scale; /* relative to the first axis (0 to disable) */
+ double second_axis_shift; /* how much is it shifted vs the first axis */
+ char second_axis_legend[210]; /* label to put on the seond axis */
+ char second_axis_format[210]; /* format for the numbers on the scond axis */
double ygridstep; /* user defined step for y grid */
int ylabfact; /* every how many y grid shall a label be written ? */
char *imginfo; /* construct an <IMG ... tag and return
as first retval */
enum gfx_if_en imgformat; /* image format */
+ char *daemon_addr; /* rrdcached connection string */
int lazy; /* only update the image if there is
reasonable probablility that the
existing one is out of date */
int slopemode; /* connect the dots of the curve directly, not using a stair */
+ enum legend_pos legendposition; /* the position of the legend: north, west, south or east */
+ enum legend_direction legenddirection; /* The direction of the legend topdown or bottomup */
int logarithmic; /* scale the yaxis logarithmic */
double force_scale_min; /* Force a scale--min */
double force_scale_max; /* Force a scale--max */
/* status information */
int with_markup;
long xorigin, yorigin; /* where is (0,0) of the graph */
+ long xOriginTitle, yOriginTitle; /* where is the origin of the title */
+ long xOriginLegendY, yOriginLegendY; /* where is the origin of the y legend */
+ long xOriginLegendY2, yOriginLegendY2; /* where is the origin of the second y legend */
+ long xOriginLegend, yOriginLegend; /* where is the origin of the legend */
long ximg, yimg; /* total size of the image */
+ long legendwidth, legendheight; /* the calculated height and width of the legend */
size_t rendered_image_size;
double zoom;
double magfact; /* numerical magnitude */
cairo_t *cr; /* drawin context */
cairo_font_options_t *font_options; /* cairo font options */
cairo_antialias_t graph_antialias; /* antialiasing for the graph */
-
- rrd_info_t *grinfo; /* root pointer to extra graph info */
- rrd_info_t *grinfo_current; /* pointing to current entry */
+ PangoLayout *layout; /* the pango layout we use for writing fonts */
+ rrd_info_t *grinfo; /* root pointer to extra graph info */
+ rrd_info_t *grinfo_current; /* pointing to current entry */
+ GHashTable* gdef_map; /* a map of all *def gdef entries for quick access */
+ GHashTable* rrd_map; /* a map of all rrd files in use for gdef entries */
} image_desc_t;
/* Prototypes */
image_desc_t *);
int leg_place(
image_desc_t *,
- int *);
+ int);
int calc_horizontal_grid(
image_desc_t *);
int draw_horizontal_grid(
char *const);
void rrd_graph_init(
image_desc_t *);
+
void rrd_graph_options(
int,
char **,
double x,
double y,
gfx_color_t color,
- char *font,
- double size,
+ PangoFontDescription *font_desc,
double tabwidth,
double angle,
enum gfx_h_align_en h_align,
double gfx_get_text_width(
image_desc_t *im,
double start,
- char *font,
- double size,
+ PangoFontDescription *font_desc,
double tabwidth,
char *text);
void grinfo_push(
image_desc_t *im,
char *key,
- rrd_info_type_t type,
- rrd_infoval_t value);
+ rrd_info_type_t type, rrd_infoval_t value);