X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_graph.h;h=d67f135f17ca145b981df1bb9a59ceaf201dfa43;hp=0339e0b4e410bfa2a9918bb49e32c729e27f54f3;hb=375995188dfc9e69f3884e8d4631809d137cc5e8;hpb=e152e99bee5541b5264b7308606f20ea29f0872b

diff --git a/src/rrd_graph.h b/src/rrd_graph.h
index 0339e0b..d67f135 100644
--- a/src/rrd_graph.h
+++ b/src/rrd_graph.h
@@ -14,6 +14,7 @@
 #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 */
 
 
 enum tmt_en {TMT_SECOND=0,TMT_MINUTE,TMT_HOUR,TMT_DAY,
@@ -27,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_DEF, GF_CDEF, GF_VDEF, GF_SHIFT,
 	    GF_PART, GF_XPORT};
 
 enum vdef_op_en {
@@ -104,6 +105,7 @@ 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 */
+    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*/
@@ -113,6 +115,11 @@ typedef  struct graph_desc_t {
     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 */
@@ -184,7 +191,7 @@ enum gf_en gf_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 *);
+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 *);
@@ -212,10 +219,10 @@ 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 *, 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 *);
+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 *);