X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_graph.c;h=a0748ad800059c892fa133c079991ded45a2f767;hp=4b9cb6c9a27a764bb08b950f273cca1a794dbaf1;hb=f9e5bd6a9d41c4607291cbbd88280129184ab325;hpb=d8c5e46b26d3870f3d52c7e8ad5eb2adf534503d

diff --git a/src/rrd_graph.c b/src/rrd_graph.c
index 4b9cb6c..a0748ad 100644
--- a/src/rrd_graph.c
+++ b/src/rrd_graph.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * RRDtool 1.2rc5  Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2rc6  Copyright by Tobi Oetiker, 1997-2005
  ****************************************************************************
  * rrd__graph.c  produce graphs from data in rrdfiles
  ****************************************************************************/
@@ -99,8 +99,8 @@ gfx_color_t graph_col[] =   /* default colors */
      0x90909080,   /* grid       */
      0xE0505080,   /* major grid */
      0x000000FF,   /* font       */ 
-     0xFF0000FF,   /* arrow      */
-     0x404040FF    /* axis       */
+     0x802020FF,   /* arrow      */
+     0x202020FF    /* axis       */
 };
 
 
@@ -1854,11 +1854,17 @@ axis_paint(
 		         MGRIDWIDTH, im->graph_col[GRC_AXIS]);
    
     
-    /* arrow for X axis direction */
+    /* arrow for X and Y axis direction */
     gfx_new_area ( im->canvas, 
-		   im->xorigin+im->xsize+3,  im->yorigin-3,
-		   im->xorigin+im->xsize+3,  im->yorigin+4,
-		   im->xorigin+im->xsize+8,  im->yorigin+0.5, /* LINEOFFSET */
+		   im->xorigin+im->xsize+2,  im->yorigin-2,
+		   im->xorigin+im->xsize+2,  im->yorigin+3,
+		   im->xorigin+im->xsize+7,  im->yorigin+0.5, /* LINEOFFSET */
+		   im->graph_col[GRC_ARROW]);
+
+    gfx_new_area ( im->canvas, 
+		   im->xorigin-2,  im->yorigin-im->ysize-2,
+		   im->xorigin+3,  im->yorigin-im->ysize-2,
+		   im->xorigin+0.5,    im->yorigin-im->ysize-7, /* LINEOFFSET */
 		   im->graph_col[GRC_ARROW]);
 
 }
@@ -2418,81 +2424,70 @@ graph_paint(image_desc_t *im, char ***calcpr)
           
         }
       } /* for */
-      
-      if (im->gdes[i].col != 0x0){               
+
+      /* *******************************************************
+                   ___ 
+		  |   |    ___
+              ____|   |   |   |
+              |       |___|
+       -------|---------------------------------------      
+                      
+      if we know the value of y at time t was a then 
+      we draw a square from t-1 to t with the value a.
+
+      ********************************************************* */
+      if (im->gdes[i].col != 0x0){   
         /* GF_LINE and friend */
         if(stack_gf == GF_LINE ){
           node = NULL;
           for(ii=1;ii<im->xsize;ii++){
-            if ( ! isnan(im->gdes[i].p_data[ii-1])
-                 && ! isnan(im->gdes[i].p_data[ii])){
-              if (node == NULL){
-                node = gfx_new_line(im->canvas,
-                                    ii-1+im->xorigin,ytr(im,im->gdes[i].p_data[ii-1]),
+	    if (isnan(im->gdes[i].p_data[ii])){
+		node = NULL;
+		continue;
+	    }
+            if ( node == NULL ) {
+                 node = gfx_new_line(im->canvas,
+                                    ii-1+im->xorigin,ytr(im,im->gdes[i].p_data[ii]),
                                     ii+im->xorigin,ytr(im,im->gdes[i].p_data[ii]),
                                     im->gdes[i].linewidth,
                                     im->gdes[i].col);
-              } else {
-                gfx_add_point(node,ii+im->xorigin,ytr(im,im->gdes[i].p_data[ii]));
-              }
-            } else {
-              node = NULL;
-            }
+             } else {
+               gfx_add_point(node,ii-1+im->xorigin,ytr(im,im->gdes[i].p_data[ii]));
+               gfx_add_point(node,ii+im->xorigin,ytr(im,im->gdes[i].p_data[ii]));
+             };
+
           }
         } else {
-          int area_start=-1;
-          node = NULL;
           for(ii=1;ii<im->xsize;ii++){
-            /* open an area */
-            if ( ! isnan(im->gdes[i].p_data[ii-1])
-                 && ! isnan(im->gdes[i].p_data[ii])){
-              if (node == NULL){
-                float ybase = 0.0;
-/*
-                if (im->gdes[i].gf == GF_STACK) {
-*/
-		if ( (im->gdes[i].gf == GF_STACK)
-		  || (im->gdes[i].stack) ) {
-
-                  ybase = ytr(im,lastgdes->p_data[ii-1]);
-                } else {
-                  ybase =  ytr(im,areazero);
-                }
-                area_start = ii-1;
-                node = gfx_new_area(im->canvas,
-                                    ii-1+im->xorigin,ybase,
-                                    ii-1+im->xorigin,ytr(im,im->gdes[i].p_data[ii-1]),
-                                    ii+im->xorigin,ytr(im,im->gdes[i].p_data[ii]),
-                                    im->gdes[i].col
-                                    );
-              } else {
-                gfx_add_point(node,ii+im->xorigin,ytr(im,im->gdes[i].p_data[ii]));
-              }
+	    /* keep things simple for now, just draw these bars
+	       do not try to build a big and complex area */
+	    float ybase,ytop;
+	    if ( isnan(im->gdes[i].p_data[ii]) ) {
+		continue;
+	    }
+            ytop = ytr(im,im->gdes[i].p_data[ii]);
+ 	    if ( im->gdes[i].stack ) {
+                  ybase = ytr(im,lastgdes->p_data[ii]);
+            } else {
+                  ybase = ytr(im,areazero);
             }
-
-            if ( node != NULL && (ii+1==im->xsize || isnan(im->gdes[i].p_data[ii]) )){
-              /* GF_AREA STACK type*/
-/*
-              if (im->gdes[i].gf == GF_STACK ) {
-*/
-	      if ( (im->gdes[i].gf == GF_STACK)
-		|| (im->gdes[i].stack) ) {
-                int iii;
-                for (iii=ii-1;iii>area_start;iii--){
-                  gfx_add_point(node,iii+im->xorigin,ytr(im,lastgdes->p_data[iii]));
-                }
-              } else {
-                gfx_add_point(node,ii+im->xorigin,ytr(im,areazero));
-              };
-              node=NULL;
-            };
+            if ( ybase == ytop ){
+		continue;
+	    }
+            node = gfx_new_area(im->canvas,
+                                ii-1+im->xorigin,ybase,
+                                ii-1+im->xorigin,ytop,
+                                ii+im->xorigin,ytop,				
+                                im->gdes[i].col
+                               );
+            gfx_add_point(node,ii+im->xorigin,ybase);
           }             
         } /* else GF_LINE */
       } /* if color != 0x0 */
       /* make sure we do not run into trouble when stacking on NaN */
       for(ii=0;ii<im->xsize;ii++){
         if (isnan(im->gdes[i].p_data[ii])) {
-          if (lastgdes && (im->gdes[i].gf == GF_STACK)) {
+          if (lastgdes && (im->gdes[i].stack)) {
             im->gdes[i].p_data[ii] = lastgdes->p_data[ii];
           } else {
             im->gdes[i].p_data[ii] =  ytr(im,areazero);
@@ -2733,7 +2728,9 @@ rrd_graph_init(image_desc_t *im)
 #ifdef HAVE_SETLOCALE
     setlocale(LC_TIME,"");
 #endif
-
+    im->yorigin=0;
+    im->xorigin=0;
+    im->minval=0;
     im->xlab_user.minsec = -1;
     im->ximg=0;
     im->yimg=0;
@@ -2785,7 +2782,6 @@ rrd_graph_init(image_desc_t *im)
     {
             char *deffont; 
             deffont = getenv("RRD_DEFAULT_FONT");
-            /* %windir% is something like D:\windows or C:\winnt */
             if (deffont != NULL) {
                  for(i=0;i<DIM(text_prop);i++){
                 	strncpy(text_prop[i].font,deffont,sizeof(text_prop[i].font)-1);