X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Frrd_graph.h;h=d0482b592f9b7329f914258bb559fe38cbb6715c;hb=379aed39263df73f848792ea0e280a91f17a077e;hp=9cbfd027f3bc828dd7b73e7162c13ecc236033dc;hpb=a669be0918d3b0427e6ce549c1877963ce046b95;p=rrdtool.git

diff --git a/src/rrd_graph.h b/src/rrd_graph.h
index 9cbfd02..d0482b5 100644
--- a/src/rrd_graph.h
+++ b/src/rrd_graph.h
@@ -5,8 +5,8 @@
 #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 */
@@ -42,6 +42,9 @@ enum vdef_op_en {
 		,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. */
@@ -231,7 +237,7 @@ int graph_paint(image_desc_t *, char ***);
 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 scan_for_col(const char *const , int, char *const);
 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 *);
@@ -239,7 +245,7 @@ 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 bad_format(char *);
-int vdef_parse(struct graph_desc_t *,char *);
+int vdef_parse(struct graph_desc_t *,const char *const);
 int vdef_calc(image_desc_t *, int);
 int vdef_percent_compar(const void *,const void *);
 int graph_size_location(image_desc_t *, int