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

diff --git a/src/rrd_graph.h b/src/rrd_graph.h
index 181474c..1e02c62 100644
--- a/src/rrd_graph.h
+++ b/src/rrd_graph.h
@@ -8,20 +8,20 @@
 #define MAX_VNAME_LEN 29
 #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 NOMINOR         0x20    /* Turn off minor gridlines */
-#define ONLY_GRAPH      0x24   /* use only graph */
-#define FORCE_RULES_LEGEND	0x40	/* force printing of HRULE and VRULE 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__};
 
 #define MGRIDWIDTH 0.6
 #define GRIDWIDTH  0.4
@@ -29,10 +29,13 @@ 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_SHIFT,
-	    GF_PART, GF_XPORT};
+#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 */
@@ -49,7 +52,7 @@ enum text_prop_en { TEXT_PROP_DEFAULT=0,   /* default settings */
 
 typedef struct text_prop_t {
   double       size;
-  char *       font;
+  char         font[1024];
 } text_prop_t;
 
 
@@ -101,7 +104,7 @@ typedef  struct graph_desc_t {
     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 */
@@ -137,7 +140,10 @@ typedef struct image_desc_t {
 
     char           graphfile[MAXPATH]; /* filename for graphic */
     FILE	  *graphhandle;        /* FILE to use if filename is "-" */
-    long           xsize,ysize,piesize;    /* graph area size in pixels */
+    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 */
@@ -169,7 +175,9 @@ typedef struct image_desc_t {
     /* status information */
     	    
     long           xorigin,yorigin;/* where is (0,0) of the graph */
+#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 */
@@ -216,20 +224,25 @@ 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 *, FILE *);
+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 *, int);
 int rrd_graph_check_vname(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 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 graph_size_location(image_desc_t *, int
+#ifdef WITH_PIECHART
+ ,int
+#endif
+);
 
 #endif