X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_graph.h;h=0339e0b4e410bfa2a9918bb49e32c729e27f54f3;hb=87264104167c04f84e61e3580292217269bab14f;hp=d222f9ae5d5e16ba05a64241e5ab1b1a0a1896b3;hpb=3c8cee9e032f175c987c538a49e6dc0440789e02;p=rrdtool.git

diff --git a/src/rrd_graph.h b/src/rrd_graph.h
index d222f9a..0339e0b 100644
--- a/src/rrd_graph.h
+++ b/src/rrd_graph.h
@@ -1,14 +1,19 @@
+#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 ALTAUTOSCALE_MAX 0x04	/* use alternative algorithm to find upper bounds */
 #define NOLEGEND	0x08	/* use no legend */
+#define NOMINOR         0x20    /* Turn off minor gridlines */
+#define ONLY_GRAPH      0x24   /* use only graph */
 
 
 enum tmt_en {TMT_SECOND=0,TMT_MINUTE,TMT_HOUR,TMT_DAY,
@@ -23,9 +28,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,
-	    GF_PART};
-
-enum if_en {IF_PNG=0};
+	    GF_PART, GF_XPORT};
 
 enum vdef_op_en {
 		 VDEF_MAXIMUM	/* like the MAX in (G)PRINT */
@@ -68,6 +71,12 @@ typedef struct 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 {
@@ -87,6 +96,8 @@ typedef struct ylab_t {
 
 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 */
@@ -118,14 +129,15 @@ typedef struct image_desc_t {
     /* configuration of graph */
 
     char           graphfile[MAXPATH]; /* filename for graphic */
+    FILE	  *graphhandle;        /* FILE to use if filename is "-" */
     long           xsize,ysize,piesize;    /* graph area size in pixels */
-    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 */
     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 */
 
@@ -137,19 +149,21 @@ 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 */
+    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           pie_x,pie_y;    /* where is the centerpoint */
-    long           xgif,ygif;      /* total size of the gif */
-    int            interlaced;     /* will the graph be interlaced? */
+    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 */
@@ -160,14 +174,14 @@ 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 grc_en text_prop_conv(char *);
@@ -175,6 +189,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 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 *);
@@ -186,22 +201,22 @@ 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 *);
-int horizontal_grid(gfx_canvas_t *,image_desc_t *);
-int horizontal_log_grid(gfx_canvas_t *, image_desc_t *);
-void vertical_grid(gfx_canvas_t *, image_desc_t *);
-void axis_paint( image_desc_t *, gfx_canvas_t *);
-void grid_paint( image_desc_t *, gfx_canvas_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 *);
+void grid_paint(image_desc_t *);
 int lazy_check(image_desc_t *);
 int graph_paint(image_desc_t *, char ***);
-void pie_part(gfx_canvas_t *, gfx_color_t, double, double, double, double, double);
+void pie_part(image_desc_t *, gfx_color_t, double, double, double, double, double);
 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 *);
 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 *);
-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 *);
@@ -209,3 +224,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);
+
+#endif