X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_graph.c;h=9e9cd8f9978812b7bba45f414efdd39d2afcd685;hb=0cdbc46c70b605d795a1ac3342d1ddddef0d307e;hp=a405a29fa728493f5617243bd77aa508f76ce053;hpb=32bff69819374d9875577fe106dee60af473637b;p=rrdtool.git

diff --git a/src/rrd_graph.c b/src/rrd_graph.c
index a405a29..9e9cd8f 100644
--- a/src/rrd_graph.c
+++ b/src/rrd_graph.c
@@ -1008,7 +1008,7 @@ data_proc( image_desc_t *im ){
 			paintval = 0.0;
 		case GF_STACK:
 		    value = im->gdes[ii].yrule;
-		    if (isnan(value)) { /* not a number or VDEF */
+		    if (isnan(value) || (im->gdes[ii].gf == GF_TICK)) {
 			/* The time of the data doesn't necessarily match
 			** the time of the graph. Beware.
 			*/
@@ -1591,7 +1591,7 @@ int draw_horizontal_grid(image_desc_t *im)
 			      MGRIDWIDTH, im->graph_col[GRC_MGRID],
 			      im->grid_dash_on, im->grid_dash_off);	       
 	       
-	    } else {		
+	    } else if (!(im->extra_flags & NOMINOR)) {		
 	       gfx_new_dashed_line ( im->canvas,
 			      X0-1,Y0,
 			      X1+1,Y0,
@@ -1721,27 +1721,30 @@ vertical_grid(
    
 
     /* paint the minor grid */
-    for(ti = find_first_time(im->start,
-			    im->xlab_user.gridtm,
-			    im->xlab_user.gridst),
-        timajor = find_first_time(im->start,
-			    im->xlab_user.mgridtm,
-			    im->xlab_user.mgridst);
-	ti < im->end; 
-	ti = find_next_time(ti,im->xlab_user.gridtm,im->xlab_user.gridst)
-	){
-	/* are we inside the graph ? */
-	if (ti < im->start || ti > im->end) continue;
-	while (timajor < ti) {
-	    timajor = find_next_time(timajor,
-		    im->xlab_user.mgridtm, im->xlab_user.mgridst);
-	}
-	if (ti == timajor) continue; /* skip as falls on major grid line */
-       X0 = xtr(im,ti);       
-       gfx_new_dashed_line(im->canvas,X0,Y0+1, X0,Y1-1,GRIDWIDTH,
-	   im->graph_col[GRC_GRID],
-	   im->grid_dash_on, im->grid_dash_off);
-       
+    if (!(im->extra_flags & NOMINOR))
+    {
+        for(ti = find_first_time(im->start,
+                                im->xlab_user.gridtm,
+                                im->xlab_user.gridst),
+            timajor = find_first_time(im->start,
+                                im->xlab_user.mgridtm,
+                                im->xlab_user.mgridst);
+            ti < im->end; 
+            ti = find_next_time(ti,im->xlab_user.gridtm,im->xlab_user.gridst)
+            ){
+            /* are we inside the graph ? */
+            if (ti < im->start || ti > im->end) continue;
+            while (timajor < ti) {
+                timajor = find_next_time(timajor,
+                        im->xlab_user.mgridtm, im->xlab_user.mgridst);
+            }
+            if (ti == timajor) continue; /* skip as falls on major grid line */
+           X0 = xtr(im,ti);       
+           gfx_new_dashed_line(im->canvas,X0,Y0+1, X0,Y1-1,GRIDWIDTH,
+               im->graph_col[GRC_GRID],
+               im->grid_dash_on, im->grid_dash_off);
+           
+        }
     }
 
     /* paint the major grid */
@@ -2396,14 +2399,11 @@ graph_paint(image_desc_t *im, char ***calcpr)
       /* 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])) {
-          double ybase = 0.0;
           if (lastgdes) {
-            ybase = ytr(im,lastgdes->p_data[ii-1]);
-          };
-          if (isnan(ybase) || !lastgdes ){
-            ybase =  ytr(im,areazero);
+            im->gdes[i].p_data[ii] = lastgdes->p_data[ii];
+          } else {
+            im->gdes[i].p_data[ii] =  ytr(im,areazero);
           }
-          im->gdes[i].p_data[ii] = ybase;
         }
       } 
       lastgdes = &(im->gdes[i]);                         
@@ -2707,41 +2707,45 @@ rrd_graph_options(int argc, char *argv[],image_desc_t *im)
 	    {"lazy",       no_argument,       0,  'z'},
             {"zoom",       required_argument, 0,  'm'},
 	    {"no-legend",  no_argument,       0,  'g'},
-	    {"alt-y-grid", no_argument,       0,   257 },
-	    {"alt-autoscale", no_argument,    0,   258 },
-	    {"alt-autoscale-max", no_argument,    0,   259 },
-	    {"units-exponent",required_argument, 0,  260},
-	    {"step",       required_argument, 0,   261},
-	    {"no-gridfit", no_argument,       0,   262},
+	    {"alt-y-grid", no_argument,       0,  'Y'},
+            {"no-minor",   no_argument,       0,  'I'},
+	    {"alt-autoscale", no_argument,    0,  'A'},
+	    {"alt-autoscale-max", no_argument, 0, 'M'},
+	    {"units-exponent",required_argument, 0, 'X'},
+	    {"step",       required_argument, 0,    'S'},
+	    {"no-gridfit", no_argument,       0,   'N'},
 	    {0,0,0,0}};
 	int option_index = 0;
 	int opt;
 
 
 	opt = getopt_long(argc, argv, 
-			  "s:e:x:y:v:w:h:iu:l:rb:oc:n:m:t:f:a:z:g",
+			  "s:e:x:y:v:w:h:iu:l:rb:oc:n:m:t:f:a:I:zgYAMX:S:N",
 			  long_options, &option_index);
 
 	if (opt == EOF)
 	    break;
 	
 	switch(opt) {
-	case 257:
+        case 'I':
+            im->extra_flags |= NOMINOR;
+            break;
+	case 'Y':
 	    im->extra_flags |= ALTYGRID;
 	    break;
-	case 258:
+	case 'A':
 	    im->extra_flags |= ALTAUTOSCALE;
 	    break;
-	case 259:
+	case 'M':
 	    im->extra_flags |= ALTAUTOSCALE_MAX;
 	    break;
 	case 'g':
 	    im->extra_flags |= NOLEGEND;
 	    break;
-	case 260:
+	case 'X':
 	    im->unitsexponent = atoi(optarg);
 	    break;
-	case 261:
+	case 'S':
 	    im->step =  atoi(optarg);
 	    break;
 	case 262:
@@ -3064,9 +3068,9 @@ int bad_format(char *fmt) {
                  if (*ptr == '.') ptr++;
                  while (*ptr >= '0' && *ptr <= '9') ptr++;
   
-                 /* Either 'le' or 'lf' must follow here */
+                 /* Either 'le', 'lf' or 'lg' must follow here */
                  if (*ptr++ != 'l') return 1;
-                 if (*ptr == 'e' || *ptr == 'f') ptr++;
+                 if (*ptr == 'e' || *ptr == 'f' || *ptr == 'g') ptr++;
                  else return 1;
                  n++;
             }