X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_graph.h;h=0339e0b4e410bfa2a9918bb49e32c729e27f54f3;hb=9040c686e2194855afd52ff0424221efc25a311a;hp=e61d6b02f5ff6495febbc2e27720b8b5a55a3ca4;hpb=88cc1edb85219b8b3ca287cad88718e7d72ece80;p=rrdtool.git

diff --git a/src/rrd_graph.h b/src/rrd_graph.h
index e61d6b0..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,7 +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};
+	    GF_PART, GF_XPORT};
 
 enum vdef_op_en {
 		 VDEF_MAXIMUM	/* like the MAX in (G)PRINT */
@@ -91,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 */
@@ -122,6 +129,7 @@ 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 */
     gfx_color_t    graph_col[__GRC_END__]; /* real colors for the graph */   
     text_prop_t    text_prop[TEXT_PROP_LAST]; /* text properties */
@@ -204,12 +212,11 @@ int graph_paint(image_desc_t *, char ***);
 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 *);
@@ -217,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