let rrd_graph return the actual value range it picked ...

-- Henrik Stoerner <henrik@hswn.dk>

git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@297 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 717ff1f..dc2974b 100644 (file)
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -61,6 +61,7 @@ Debugging and code contributions
        Mike Slifcak <slif@bellsouth.net> many rrdtool-1.1.x fixes
        Peter Speck <speck@vitality.dk> eps/svg/pdf file format code in rrdtool-1.x
        David Grimes <dgrimes@navisite.com> SQRT/SORT/REV/SHIFT/TREND
        Mike Slifcak <slif@bellsouth.net> many rrdtool-1.1.x fixes
        Peter Speck <speck@vitality.dk> eps/svg/pdf file format code in rrdtool-1.x
        David Grimes <dgrimes@navisite.com> SQRT/SORT/REV/SHIFT/TREND

+       Henrik Storner <henrik@hswn.dk> make rrd_graph() provide the min/max values of data in graph

 
 Documentation
 
 
 Documentation
 

diff --git a/bindings/perl-shared/RRDs.xs b/bindings/perl-shared/RRDs.xs
index 28a6bde..558bdc0 100644 (file)
--- a/bindings/perl-shared/RRDs.xs
+++ b/bindings/perl-shared/RRDs.xs
@@ -178,6 +178,7 @@ rrd_graph(...)
        PREINIT:
        char **calcpr=NULL;
        int i,xsize,ysize;
        PREINIT:
        char **calcpr=NULL;
        int i,xsize,ysize;

+       double ymin,ymax;

        char **argv;
        AV *retar;
        PPCODE:
        char **argv;
        AV *retar;
        PPCODE:


@@ -193,7 +194,7 @@ rrd_graph(...)
                }
                optind=0; opterr=0; 
                rrd_clear_error();
                }
                optind=0; opterr=0; 
                rrd_clear_error();

-               rrd_graph(items+1,argv,&calcpr,&xsize,&ysize,NULL); 
+               rrd_graph(items+1,argv,&calcpr,&xsize,&ysize,NULL,&ymin,&ymax); 

                for (i=0; i < items; i++) {
                    free(argv[i+1]);
                }
                for (i=0; i < items; i++) {
                    free(argv[i+1]);
                }

diff --git a/bindings/tcl/tclrrd.c b/bindings/tcl/tclrrd.c
index 2a2fb41..3cc1711 100644 (file)
--- a/bindings/tcl/tclrrd.c
+++ b/bindings/tcl/tclrrd.c
@@ -217,13 +217,14 @@ Rrd_Graph(clientData, interp, argc, argv)
 {
     char **calcpr;
     int xsize, ysize;
 {
     char **calcpr;
     int xsize, ysize;

+    double ymin, ymax;

     Tcl_Obj *listPtr;
     char **argv2;
     
     calcpr = NULL;
 
     argv2 = getopt_init(argc, argv);
     Tcl_Obj *listPtr;
     char **argv2;
     
     calcpr = NULL;
 
     argv2 = getopt_init(argc, argv);

-    if (rrd_graph(argc, argv2, &calcpr, &xsize, &ysize) != -1 ) {
+    if (rrd_graph(argc, argv2, &calcpr, &xsize, &ysize, NULL, &ymin, &ymax) != -1 ) {

         listPtr = Tcl_GetObjResult(interp);
         Tcl_ListObjAppendElement(interp, listPtr, Tcl_NewIntObj(xsize));
         Tcl_ListObjAppendElement(interp, listPtr, Tcl_NewIntObj(ysize));
         listPtr = Tcl_GetObjResult(interp);
         Tcl_ListObjAppendElement(interp, listPtr, Tcl_NewIntObj(xsize));
         Tcl_ListObjAppendElement(interp, listPtr, Tcl_NewIntObj(ysize));

diff --git a/src/rrd.h b/src/rrd.h
index 7509540..f63d117 100644 (file)
--- a/src/rrd.h
+++ b/src/rrd.h
@@ -5,6 +5,10 @@
  *****************************************************************************
  * $Id$
  * $Log$
  *****************************************************************************
  * $Id$
  * $Log$

+ * Revision 1.9  2005/02/13 16:13:33  oetiker
+ * let rrd_graph return the actual value range it picked ...
+ * -- Henrik Stoerner <henrik@hswn.dk>
+ *

  * Revision 1.8  2004/05/26 22:11:12  oetiker
  * reduce compiler warnings. Many small fixes. -- Mike Slifcak <slif@bellsouth.net>
  *
  * Revision 1.8  2004/05/26 22:11:12  oetiker
  * reduce compiler warnings. Many small fixes. -- Mike Slifcak <slif@bellsouth.net>
  *


@@ -59,7 +63,7 @@ typedef double       rrd_value_t;         /* the data storage type is
 /* main function blocks */
 int    rrd_create(int, char **);
 int    rrd_update(int, char **);
 /* main function blocks */
 int    rrd_create(int, char **);
 int    rrd_update(int, char **);

-int    rrd_graph(int, char **, char ***, int *, int *, FILE *);
+int    rrd_graph(int, char **, char ***, int *, int *, FILE *, double *, double *);

 int    rrd_fetch(int, char **, time_t *, time_t *, unsigned long *,
                 unsigned long *, char ***, rrd_value_t **);
 int    rrd_restore(int, char **);
 int    rrd_fetch(int, char **, time_t *, time_t *, unsigned long *,
                 unsigned long *, char ***, rrd_value_t **);
 int    rrd_restore(int, char **);

diff --git a/src/rrd_cgi.c b/src/rrd_cgi.c
index 411b02b..610413f 100644 (file)
--- a/src/rrd_cgi.c
+++ b/src/rrd_cgi.c
@@ -688,6 +688,7 @@ char* cgiget(long argc, const char **args){
 
 char* drawgraph(long argc, char **args){
   int i,xsize, ysize;
 
 char* drawgraph(long argc, char **args){
   int i,xsize, ysize;

+  double ymin,ymax;

   for(i=0;i<argc;i++)
     if(strcmp(args[i],"--imginfo")==0 || strcmp(args[i],"-g")==0) break;
   if(i==argc) {
   for(i=0;i<argc;i++)
     if(strcmp(args[i],"--imginfo")==0 || strcmp(args[i],"-g")==0) break;
   if(i==argc) {


@@ -697,7 +698,7 @@ char* drawgraph(long argc, char **args){
   optind=0; /* reset gnu getopt */
   opterr=0; /* reset gnu getopt */
   calfree();
   optind=0; /* reset gnu getopt */
   opterr=0; /* reset gnu getopt */
   calfree();

-  if( rrd_graph(argc+1, args-1, &calcpr, &xsize, &ysize,NULL) != -1 ) {
+  if( rrd_graph(argc+1, args-1, &calcpr, &xsize, &ysize,NULL,&ymin,&ymax) != -1 ) {

     return stralloc(calcpr[0]);
   } else {
     if (rrd_test_error()) {
     return stralloc(calcpr[0]);
   } else {
     if (rrd_test_error()) {

diff --git a/src/rrd_graph.c b/src/rrd_graph.c
index 85984b3..3ac3623 100644 (file)
--- a/src/rrd_graph.c
+++ b/src/rrd_graph.c
@@ -2635,7 +2635,7 @@ scan_for_col(char *input, int len, char *output)
 ** - script parsing   now in rrd_graph_script()
 */
 int 
 ** - script parsing   now in rrd_graph_script()
 */
 int 

-rrd_graph(int argc, char **argv, char ***prdata, int *xsize, int *ysize, FILE *stream)
+rrd_graph(int argc, char **argv, char ***prdata, int *xsize, int *ysize, FILE *stream, double *ymin, double *ymax)

 {
     image_desc_t   im;
             
 {
     image_desc_t   im;
             


@@ -2676,6 +2676,8 @@ rrd_graph(int argc, char **argv, char ***prdata, int *xsize, int *ysize, FILE *s
 
     *xsize=im.ximg;
     *ysize=im.yimg;
 
     *xsize=im.ximg;
     *ysize=im.yimg;

+    *ymin=im.minval;
+    *ymax=im.maxval;

     if (im.imginfo) {
        char *filename;
        if (!(*prdata)) {
     if (im.imginfo) {
        char *filename;
        if (!(*prdata)) {

diff --git a/src/rrd_graph.h b/src/rrd_graph.h
index 181474c..d67f135 100644 (file)
--- a/src/rrd_graph.h
+++ b/src/rrd_graph.h
@@ -219,7 +219,7 @@ 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 *);
 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 *, int);
 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);

diff --git a/src/rrd_tool.c b/src/rrd_tool.c
index fce0925..94c2b15 100644 (file)
--- a/src/rrd_tool.c
+++ b/src/rrd_tool.c
@@ -623,9 +623,10 @@ int HandleInputLine(int argc, char **argv, FILE* out)
        const char *imgfile = argv[2]; /* rrd_graph changes argv pointer */
 #endif
        int xsize, ysize;
        const char *imgfile = argv[2]; /* rrd_graph changes argv pointer */
 #endif
        int xsize, ysize;

+       double ymin,ymax;

        int i;
        int tostdout = (strcmp(argv[2],"-") == 0);      
        int i;
        int tostdout = (strcmp(argv[2],"-") == 0);      

-       if( rrd_graph(argc-1, &argv[1], &calcpr, &xsize, &ysize, NULL) != -1 ) {
+       if( rrd_graph(argc-1, &argv[1], &calcpr, &xsize, &ysize, NULL, &ymin, &ymax) != -1 ) {

            if (!tostdout) 
                printf ("%dx%d\n",xsize,ysize);
            if (calcpr) {
            if (!tostdout) 
                printf ("%dx%d\n",xsize,ysize);
            if (calcpr) {