X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_graph.h;h=2854ed6331391575b1b7dc7b033418898b48f13f;hp=2833dbd32caf658b272429c42eef1260ebe4f520;hb=a1fe8fd19bb4f558150e52c0624869667b739877;hpb=e8f4081448f258adfbfa962b75d8392a7e152849 diff --git a/src/rrd_graph.h b/src/rrd_graph.h index 2833dbd..2854ed6 100644 --- a/src/rrd_graph.h +++ b/src/rrd_graph.h @@ -1,5 +1,6 @@ #include "rrd_tool.h" #include "rrd_rpncalc.h" +#include "rrd_gfx.h" #define MAX_VNAME_LEN 29 #define DEF_NAM_FMT "%29[_A-Za-z0-9]" @@ -16,9 +17,11 @@ enum tmt_en {TMT_SECOND=0,TMT_MINUTE,TMT_HOUR,TMT_DAY, enum grc_en {GRC_CANVAS=0,GRC_BACK,GRC_SHADEA,GRC_SHADEB, GRC_GRID,GRC_MGRID,GRC_FONT,GRC_FRAME,GRC_ARROW,__GRC_END__}; +#define MGRIDWIDTH 0.6 +#define GRIDWIDTH 0.4 -enum gf_en {GF_PRINT=0,GF_GPRINT,GF_COMMENT,GF_HRULE,GF_VRULE,GF_LINE1, - GF_LINE2,GF_LINE3,GF_AREA,GF_STACK,GF_TICK, +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 if_en {IF_GIF=0,IF_PNG=1}; @@ -32,6 +35,19 @@ enum vdef_op_en { ,VDEF_FIRST /* first non-unknown value and time */ ,VDEF_LAST /* last non-unknown value and time */ }; +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_LAST }; + +typedef struct text_prop_t { + double size; + char * font; +} text_prop_t; + + typedef struct vdef_t { enum vdef_op_en op; double param; /* parameter for function, if applicable */ @@ -39,14 +55,6 @@ typedef struct vdef_t { time_t when; /* timestamp, if applicable */ } vdef_t; -typedef struct col_trip_t { - int red; /* red = -1 is no color */ - int green; - int blue; - int i; /* color index assigned in gif image i=-1 is unasigned*/ -} col_trip_t; - - typedef struct xlab_t { long minsec; /* minimum sec per pix */ enum tmt_en gridtm; /* grid interval in what ?*/ @@ -59,41 +67,6 @@ typedef struct xlab_t { char *stst; /* strftime string*/ } xlab_t; -#if 0 -xlab_t xlab[] = { - {0, TMT_SECOND,30, TMT_MINUTE,5, TMT_MINUTE,5, 0,"%H:%M"}, - {2, TMT_MINUTE,1, TMT_MINUTE,5, TMT_MINUTE,5, 0,"%H:%M"}, - {5, TMT_MINUTE,2, TMT_MINUTE,10, TMT_MINUTE,10, 0,"%H:%M"}, - {10, TMT_MINUTE,5, TMT_MINUTE,20, TMT_MINUTE,20, 0,"%H:%M"}, - {30, TMT_MINUTE,10, TMT_HOUR,1, TMT_HOUR,1, 0,"%H:%M"}, - {60, TMT_MINUTE,30, TMT_HOUR,2, TMT_HOUR,2, 0,"%H:%M"}, - {180, TMT_HOUR,1, TMT_HOUR,6, TMT_HOUR,6, 0,"%H:%M"}, - /*{300, TMT_HOUR,3, TMT_HOUR,12, TMT_HOUR,12, 12*3600,"%a %p"}, this looks silly*/ - {600, TMT_HOUR,6, TMT_DAY,1, TMT_DAY,1, 24*3600,"%a"}, - {1800, TMT_HOUR,12, TMT_DAY,1, TMT_DAY,2, 24*3600,"%a"}, - {3600, TMT_DAY,1, TMT_WEEK,1, TMT_WEEK,1, 7*24*3600,"Week %W"}, - {3*3600, TMT_WEEK,1, TMT_MONTH,1, TMT_WEEK,2, 7*24*3600,"Week %W"}, - {6*3600, TMT_MONTH,1, TMT_MONTH,1, TMT_MONTH,1, 30*24*3600,"%b"}, - {48*3600, TMT_MONTH,1, TMT_MONTH,3, TMT_MONTH,3, 30*24*3600,"%b"}, - {10*24*3600, TMT_YEAR,1, TMT_YEAR,1, TMT_YEAR,1, 365*24*3600,"%y"}, - {-1,TMT_MONTH,0,TMT_MONTH,0,TMT_MONTH,0,0,""} -}; - -/* sensible logarithmic y label intervals ... - the first element of each row defines the possible starting points on the - y axis ... the other specify the */ - -double yloglab[][12]= {{ 1e9, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 1e3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 1e1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - /* { 1e1, 1, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, */ - { 1e1, 1, 2.5, 5, 7.5, 0, 0, 0, 0, 0, 0, 0 }, - { 1e1, 1, 2, 4, 6, 8, 0, 0, 0, 0, 0, 0 }, - { 1e1, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 0 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }}; - -#endif - /* sensible y label intervals ...*/ typedef struct ylab_t { @@ -101,37 +74,6 @@ typedef struct ylab_t { int lfac[4]; /* associated label spacing*/ } ylab_t; -#if 0 -ylab_t ylab[]= { - {0.1, {1,2, 5,10}}, - {0.2, {1,5,10,20}}, - {0.5, {1,2, 4,10}}, - {1.0, {1,2, 5,10}}, - {2.0, {1,5,10,20}}, - {5.0, {1,2, 4,10}}, - {10.0, {1,2, 5,10}}, - {20.0, {1,5,10,20}}, - {50.0, {1,2, 4,10}}, - {100.0, {1,2, 5,10}}, - {200.0, {1,5,10,20}}, - {500.0, {1,2, 4,10}}, - {0.0, {0,0,0,0}}}; - - - -col_trip_t graph_col[] = { /* default colors */ - {255,255,255,-1}, /* canvas */ - {245,245,245,-1}, /* background */ - {200,200,200,-1}, /* shade A */ - {150,150,150,-1}, /* shade B */ - {140,140,140,-1}, /* grid */ - {130,30,30,-1}, /* major grid */ - {0,0,0,-1}, /* font */ - {0,0,0,-1}, /* frame */ - {255,0,0,-1} /*arrow*/ -}; - -#endif /* this structure describes the elements which can make up a graph. because they are quite diverse, not all elements will use all the @@ -150,10 +92,10 @@ typedef struct graph_desc_t { char ds_nam[DS_NAM_SIZE]; /* data source name */ long ds; /* data source number */ enum cf_en cf; /* consolidation function */ - col_trip_t col; /* graph color */ - char format[FMT_LEG_LEN+5]; /* format for PRINT AND GPRINT */ - char legend[FMT_LEG_LEN+5]; /* legend*/ - gdPoint legloc; /* location of legend */ + gfx_color_t col; /* graph color */ + char format[FMT_LEG_LEN+5]; /* format for PRINT AND GPRINT */ + char legend[FMT_LEG_LEN+5]; /* legend*/ + double leg_x,leg_y; /* location of legend */ double yrule; /* value for y rule line and for VDEF */ time_t xrule; /* time for x rule line and for VDEF */ vdef_t vf; /* instruction for VDEF function */ @@ -167,7 +109,7 @@ typedef struct graph_desc_t { char **ds_namv; /* name of datasources in the fetch. */ rrd_value_t *data; /* the raw data drawn from the rrd */ rrd_value_t *p_data; /* processed data, xsize elments */ - + double linewidth; /* linewideth */ } graph_desc_t; typedef struct image_desc_t { @@ -176,7 +118,9 @@ typedef struct image_desc_t { char graphfile[MAXPATH]; /* filename for graphic */ long xsize,ysize; /* graph area size in pixels */ - col_trip_t graph_col[__GRC_END__]; /* real colors for the graph */ + double zoom; /* zoom for graph */ + gfx_color_t graph_col[__GRC_END__]; /* real colors for the graph */ + text_prop_t text_prop[TEXT_PROP_LAST]; /* text properties */ char ylegend[200]; /* legend along the yaxis */ char title[200]; /* title for graph */ int draw_x_grid; /* no x-grid at all */ @@ -186,18 +130,18 @@ typedef struct image_desc_t { double ygridstep; /* user defined step for y grid */ int ylabfact; /* every how many y grid shall a label be written ? */ - + double tabwidth; /* tabwdith */ time_t start,end; /* what time does the graph cover */ - unsigned long step; /* any preference for the default step ? */ + unsigned long step; /* any preference for the default step ? */ rrd_value_t minval,maxval; /* extreme values in the data */ int rigid; /* do not expand range even with values outside */ - char* imginfo; /* construct an