projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed leak in VDEF_PERCENT handlin -- Perry Stoll <perry_stoll@yahoo.com>
[rrdtool.git]
/
src
/
rrd_graph.h
diff --git
a/src/rrd_graph.h
b/src/rrd_graph.h
index
de73a72
..
0f9079a
100644
(file)
--- a/
src/rrd_graph.h
+++ b/
src/rrd_graph.h
@@
-1,3
+1,6
@@
+#ifndef _RRD_GRAPH_H
+#define _RRD_GRAPH_H
+
#include "rrd_tool.h"
#include "rrd_rpncalc.h"
#include "rrd_gfx.h"
#include "rrd_tool.h"
#include "rrd_rpncalc.h"
#include "rrd_gfx.h"
@@
-23,7
+26,7
@@
enum grc_en {GRC_CANVAS=0,GRC_BACK,GRC_SHADEA,GRC_SHADEB,
enum gf_en {GF_PRINT=0,GF_GPRINT,GF_COMMENT,GF_HRULE,GF_VRULE,GF_LINE,
GF_AREA,GF_STACK,GF_TICK,
GF_DEF, GF_CDEF, GF_VDEF,
enum gf_en {GF_PRINT=0,GF_GPRINT,GF_COMMENT,GF_HRULE,GF_VRULE,GF_LINE,
GF_AREA,GF_STACK,GF_TICK,
GF_DEF, GF_CDEF, GF_VDEF,
- GF_PART};
+ GF_PART
, GF_XPORT
};
enum vdef_op_en {
VDEF_MAXIMUM /* like the MAX in (G)PRINT */
enum vdef_op_en {
VDEF_MAXIMUM /* like the MAX in (G)PRINT */
@@
-66,6
+69,12
@@
typedef struct xlab_t {
char *stst; /* strftime string*/
} xlab_t;
char *stst; /* strftime string*/
} xlab_t;
+typedef struct ygrid_scale_t { /* y axis grid scaling info */
+ double gridstep;
+ int labfact;
+ char labfmt[64];
+} ygrid_scale_t;
+
/* sensible y label intervals ...*/
typedef struct ylab_t {
/* sensible y label intervals ...*/
typedef struct ylab_t {
@@
-85,6
+94,8
@@
typedef struct ylab_t {
typedef struct graph_desc_t {
enum gf_en gf; /* graphing function */
typedef struct graph_desc_t {
enum gf_en gf; /* graphing function */
+ int stack; /* boolean */
+ int debug; /* boolean */
char vname[MAX_VNAME_LEN+1]; /* name of the variable */
long vidx; /* gdes reference */
char rrd[255]; /* name of the rrd_file containing data */
char vname[MAX_VNAME_LEN+1]; /* name of the variable */
long vidx; /* gdes reference */
char rrd[255]; /* name of the rrd_file containing data */
@@
-123,6
+134,7
@@
typedef struct image_desc_t {
char title[200]; /* title for graph */
int draw_x_grid; /* no x-grid at all */
int draw_y_grid; /* no x-grid at all */
char title[200]; /* title for graph */
int draw_x_grid; /* no x-grid at all */
int draw_y_grid; /* no x-grid at all */
+ double grid_dash_on, grid_dash_off;
xlab_t xlab_user; /* user defined labeling for xaxis */
char xlab_form[200]; /* format for the label on the xaxis */
xlab_t xlab_user; /* user defined labeling for xaxis */
char xlab_form[200]; /* format for the label on the xaxis */
@@
-134,6
+146,9
@@
typedef struct image_desc_t {
rrd_value_t minval,maxval; /* extreme values in the data */
int rigid; /* do not expand range even with
values outside */
rrd_value_t minval,maxval; /* extreme values in the data */
int rigid; /* do not expand range even with
values outside */
+ ygrid_scale_t ygrid_scale; /* calculated y axis grid info */
+ int gridfit; /* adjust y-axis range etc so all
+ grindlines falls in integer pixel values */
char* imginfo; /* construct an <IMG ... tag and return
as first retval */
int lazy; /* only update the image if there is
char* imginfo; /* construct an <IMG ... tag and return
as first retval */
int lazy; /* only update the image if there is
@@
-161,7
+176,7
@@
typedef struct image_desc_t {
/* Prototypes */
int xtr(image_desc_t *,time_t);
/* Prototypes */
int xtr(image_desc_t *,time_t);
-
int
ytr(image_desc_t *, double);
+
double
ytr(image_desc_t *, double);
enum gf_en gf_conv(char *);
enum gfx_if_en if_conv(char *);
enum tmt_en tmt_conv(char *);
enum gf_en gf_conv(char *);
enum gfx_if_en if_conv(char *);
enum tmt_en tmt_conv(char *);
@@
-171,6
+186,7
@@
int im_free(image_desc_t *);
void auto_scale( image_desc_t *, double *, char **, double *);
void si_unit( image_desc_t *);
void expand_range(image_desc_t *);
void auto_scale( image_desc_t *, double *, char **, double *);
void si_unit( image_desc_t *);
void expand_range(image_desc_t *);
+void apply_gridfit(image_desc_t *);
void reduce_data( enum cf_en, unsigned long, time_t *, time_t *, unsigned long *, unsigned long *, rrd_value_t **);
int data_fetch( image_desc_t *);
long find_var(image_desc_t *, char *);
void reduce_data( enum cf_en, unsigned long, time_t *, time_t *, unsigned long *, unsigned long *, rrd_value_t **);
int data_fetch( image_desc_t *);
long find_var(image_desc_t *, char *);
@@
-182,7
+198,8
@@
time_t find_first_time( time_t, enum tmt_en, long);
time_t find_next_time( time_t, enum tmt_en, long);
int print_calc(image_desc_t *, char ***);
int leg_place(image_desc_t *);
time_t find_next_time( time_t, enum tmt_en, long);
int print_calc(image_desc_t *, char ***);
int leg_place(image_desc_t *);
-int horizontal_grid(image_desc_t *);
+int calc_horizontal_grid(image_desc_t *);
+int draw_horizontal_grid(image_desc_t *);
int horizontal_log_grid(image_desc_t *);
void vertical_grid(image_desc_t *);
void axis_paint(image_desc_t *);
int horizontal_log_grid(image_desc_t *);
void vertical_grid(image_desc_t *);
void axis_paint(image_desc_t *);
@@
-197,7
+214,6
@@
void rrd_graph_init(image_desc_t *);
void rrd_graph_options(int, char **, image_desc_t *);
void rrd_graph_script(int, char **, image_desc_t *);
int rrd_graph_check_vname(image_desc_t *, char *, char *);
void rrd_graph_options(int, char **, image_desc_t *);
void rrd_graph_script(int, char **, image_desc_t *);
int rrd_graph_check_vname(image_desc_t *, char *, char *);
-int rrd_graph_check_CF(image_desc_t *, char *, char *);
int rrd_graph_color(image_desc_t *, char *, char *, int);
int rrd_graph_legend(graph_desc_t *, char *);
int bad_format(char *);
int rrd_graph_color(image_desc_t *, char *, char *, int);
int rrd_graph_legend(graph_desc_t *, char *);
int bad_format(char *);
@@
-205,3
+221,5
@@
int vdef_parse(struct graph_desc_t *,char *);
int vdef_calc(image_desc_t *, int);
int vdef_percent_compar(const void *,const void *);
int graph_size_location(image_desc_t *, int, int);
int vdef_calc(image_desc_t *, int);
int vdef_percent_compar(const void *,const void *);
int graph_size_location(image_desc_t *, int, int);
+
+#endif