X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_graph.h;h=1e02c624ad5269788c97c7d9a66a70aac1f7e4a3;hp=f78278890f76a72eb53033dcdc4cbbeb80cba9f9;hb=f207955a7e325708d056d3dd912863dc9930a71c;hpb=c2add7c35c88043958aebc64851b7b953adf305f

diff --git a/src/rrd_graph.h b/src/rrd_graph.h
index f782788..1e02c62 100644
--- a/src/rrd_graph.h
+++ b/src/rrd_graph.h
@@ -1,30 +1,41 @@
+#ifndef _RRD_GRAPH_H
+#define _RRD_GRAPH_H
+
 #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]"
+#define DEF_NAM_FMT "%29[-_A-Za-z0-9]"
 
-#define ALTYGRID	0x01	/* use alternative y grid algorithm */
-#define ALTAUTOSCALE	0x02	/* use alternative algorithm to find lower and upper bounds */
+#define ALTYGRID  	 0x01	/* use alternative y grid algorithm */
+#define ALTAUTOSCALE	 0x02	/* use alternative algorithm to find lower and upper bounds */
 #define ALTAUTOSCALE_MAX 0x04	/* use alternative algorithm to find upper bounds */
-#define NOLEGEND	0x08	/* use no legend */
+#define NOLEGEND	 0x08	/* use no legend */
+#define NOMINOR          0x10    /* Turn off minor gridlines */
+#define ONLY_GRAPH       0x20   /* use only graph */
+#define FORCE_RULES_LEGEND 0x40	/* force printing of HRULE and VRULE legend */
 
 
 enum tmt_en {TMT_SECOND=0,TMT_MINUTE,TMT_HOUR,TMT_DAY,
 	     TMT_WEEK,TMT_MONTH,TMT_YEAR};
 
 enum grc_en {GRC_CANVAS=0,GRC_BACK,GRC_SHADEA,GRC_SHADEB,
-	     GRC_GRID,GRC_MGRID,GRC_FONT,GRC_FRAME,GRC_ARROW,__GRC_END__};
-
+	     GRC_GRID,GRC_MGRID,GRC_FONT,GRC_ARROW,GRC_AXIS,__GRC_END__};
 
-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,
-	    GF_DEF, GF_CDEF, GF_VDEF};
+#define MGRIDWIDTH 0.6
+#define GRIDWIDTH  0.4
 
-enum if_en {IF_GIF=0,IF_PNG=1};
+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_SHIFT,
+#ifdef WITH_PIECHART
+	    GF_PART,
+#endif
+            GF_XPORT};
 
 enum vdef_op_en {
-		 VDEF_MAXIMUM	/* like the MAX in (G)PRINT */
+		 VDEF_MAXIMUM=0	/* like the MAX in (G)PRINT */
 		,VDEF_MINIMUM	/* like the MIN in (G)PRINT */
 		,VDEF_AVERAGE	/* like the AVERAGE in (G)PRINT */
 		,VDEF_PERCENT	/* Nth percentile */
@@ -32,6 +43,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[1024];
+} text_prop_t;
+
+
 typedef struct vdef_t {
     enum vdef_op_en	op;
     double		param;	/* parameter for function, if applicable */
@@ -39,14 +63,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,40 +75,11 @@ 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
+typedef struct ygrid_scale_t {  /* y axis grid scaling info */
+    double       gridstep;
+    int          labfact;
+    char         labfmt[64];
+} ygrid_scale_t;
 
 /* sensible y label intervals ...*/
 
@@ -101,37 +88,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
@@ -144,21 +100,29 @@ col_trip_t graph_col[] = { /* default colors */
 
 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           rrd[1024];   /* name of the rrd_file containing data */
     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 */   
+    enum cf_en     cf_reduce;  /* consolidation function for reduce_data() */
+    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 */
     rpnp_t         *rpnp;     /* instructions for CDEF function */
 
+    /* SHIFT implementation */
+    int            shidx; /* gdes reference for offset (-1 --> constant) */
+    time_t         shval; /* offset if shidx is -1 */
+    time_t         shift; /* current shift applied */
+
     /* description of data fetched for the graph element */
     time_t         start,end; /* timestaps for first and last data element */
     unsigned long  step;      /* time between samples */
@@ -167,7 +131,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 {
@@ -175,35 +139,46 @@ typedef struct image_desc_t {
     /* configuration of graph */
 
     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 */   
+    FILE	  *graphhandle;        /* FILE to use if filename is "-" */
+    long           xsize,ysize;        /* graph area size in pixels */
+#ifdef WITH_PIECHART
+    long 	   piesize;            /* size of the piechart */
+#endif
+    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 */
     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 */
 
     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 <IMG ... tag and return 
+    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 gif 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 */
     int            logarithmic;    /* scale the yaxis logarithmic */
-    enum if_en     imgformat;         /* image format */
     
     /* status information */
     	    
     long           xorigin,yorigin;/* where is (0,0) of the graph */
-    long           xgif,ygif;      /* total size of the gif */
-    int            interlaced;     /* will the graph be interlaced? */
+#ifdef WITH_PIECHART
+    long           pie_x,pie_y;    /* where is the centerpoint */
+#endif
+    long           ximg,yimg;      /* total size of the image */
     double         magfact;        /* numerical magnitude*/
     long         base;            /* 1000 or 1024 depending on what we graph */
     char           symbol;         /* magnitude symbol for y-axis */
@@ -214,20 +189,22 @@ 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 */
-
+    gfx_canvas_t   *canvas;        /* graphics library */
 } image_desc_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 if_en if_conv(char *);
+enum gfx_if_en if_conv(char *);
 enum tmt_en tmt_conv(char *);
 enum grc_en grc_conv(char *);
+enum text_prop_en text_prop_conv(char *);
 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 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 *);
@@ -237,26 +214,35 @@ int data_calc( image_desc_t *);
 int data_proc( image_desc_t *);
 time_t find_first_time( time_t,  enum tmt_en,  long);
 time_t find_next_time( time_t,  enum tmt_en,  long);
-void gator( gdImagePtr, int, int);
 int print_calc(image_desc_t *, char ***);
 int leg_place(image_desc_t *);
-int horizontal_grid(gdImagePtr, image_desc_t *);
-int horizontal_log_grid(gdImagePtr, image_desc_t *);
-void vertical_grid( gdImagePtr, image_desc_t *);
-void axis_paint( image_desc_t *, gdImagePtr);
-void grid_paint( image_desc_t *, gdImagePtr);
-gdImagePtr MkLineBrush(image_desc_t *,long, enum gf_en);
+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 *);
+void grid_paint(image_desc_t *);
 int lazy_check(image_desc_t *);
 int graph_paint(image_desc_t *, char ***);
+#ifdef WITH_PIECHART
+void pie_part(image_desc_t *, gfx_color_t, double, double, double, double, double);
+#endif
 int gdes_alloc(image_desc_t *);
 int scan_for_col(char *, int, char *);
-int rrd_graph(int, char **, char ***, int *, int *);
+int rrd_graph(int, char **, char ***, int *, int *, FILE *, double *, double *);
 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 *);
+void rrd_graph_script(int, char **, image_desc_t *, int);
 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 bad_format(char *);
 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
+#ifdef WITH_PIECHART
+ ,int
+#endif
+);
+
+#endif