die on error! -- Alex

[rrdtool.git] / src / rrd_graph.h

diff --git a/src/rrd_graph.h b/src/rrd_graph.h
index 10f583a..b92ce9c 100644 (file)
--- a/src/rrd_graph.h
+++ b/src/rrd_graph.h
@@ -5,23 +5,23 @@
 #include "rrd_rpncalc.h"
 #include "rrd_gfx.h"
 
-#define MAX_VNAME_LEN 29
-#define DEF_NAM_FMT "%29[-_A-Za-z0-9]"
+#define MAX_VNAME_LEN 255
+#define DEF_NAM_FMT "%255[-_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_ARROW,GRC_AXIS,__GRC_END__};
+            GRC_GRID,GRC_MGRID,GRC_FONT,GRC_ARROW,GRC_AXIS,GRC_FRAME,__GRC_END__};
 
 #define MGRIDWIDTH 0.6
 #define GRIDWIDTH  0.4
@@ -35,13 +35,16 @@ enum gf_en {GF_PRINT=0,GF_GPRINT,GF_COMMENT,GF_HRULE,GF_VRULE,GF_LINE,
             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 */
                ,VDEF_TOTAL     /* average multiplied by time */
                ,VDEF_FIRST     /* first non-unknown value and time */
                ,VDEF_LAST      /* last  non-unknown value and time */
+               ,VDEF_LSLSLOPE  /* least squares line slope */
+               ,VDEF_LSLINT    /* least squares line y_intercept */
+               ,VDEF_LSLCORREL /* least squares line correlation coefficient */
                };
 enum text_prop_en { TEXT_PROP_DEFAULT=0,   /* default settings */
                    TEXT_PROP_TITLE,       /* properties for the title */
@@ -65,6 +68,7 @@ typedef struct vdef_t {
 
 typedef struct xlab_t {
     long         minsec;       /* minimum sec per pix */
+    long         length;       /* number of secs on the image */
     enum tmt_en  gridtm;       /* grid interval in what ?*/
     long         gridst;       /* how many whats per grid*/
     enum tmt_en  mgridtm;      /* label interval in what ?*/
@@ -125,7 +129,9 @@ typedef  struct graph_desc_t {
 
     /* description of data fetched for the graph element */
     time_t         start,end; /* timestaps for first and last data element */
+    time_t         start_orig,end_orig; /* timestaps for first and last data element */
     unsigned long  step;      /* time between samples */
+    unsigned long  step_orig;      /* time between samples */
     unsigned long  ds_cnt; /* how many data sources are there in the fetch */
     long           data_first; /* first pointer to this data */
     char           **ds_namv; /* name of datasources  in the fetch. */
@@ -170,6 +176,7 @@ typedef struct image_desc_t {
     int            lazy;           /* only update the image if there is
                                      reasonable probablility that the
                                      existing one is out of date */
+    int                   slopemode;      /* connect the dots of the curve directly, not using a stair */
     int            logarithmic;    /* scale the yaxis logarithmic */
     
     /* status information */
@@ -182,7 +189,9 @@ typedef struct image_desc_t {
     double         magfact;        /* numerical magnitude*/
     long         base;            /* 1000 or 1024 depending on what we graph */
     char           symbol;         /* magnitude symbol for y-axis */
+    float          viewfactor;     /* how should the numbers on the y-axis be scaled for viewing ? */
     int            unitsexponent;    /* 10*exponent for units on y-asis */
+    int            unitslength;    /* width of the yaxis labels */
     int            extra_flags;    /* flags for boolean options */
     /* data elements */