X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_graph.c;h=8162bbfc79f74bf5866f385a17a262004be0273c;hb=37329a5f991870e8f47c8a52f6dd594fef813de6;hp=2fae2583de02cfda0e96f5edeafac79a4dbfc292;hpb=573275391d149bac4636f0928bb8eef914708851;p=rrdtool.git

diff --git a/src/rrd_graph.c b/src/rrd_graph.c
index 2fae258..8162bbf 100644
--- a/src/rrd_graph.c
+++ b/src/rrd_graph.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * RRDtool 1.2.4  Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2.6  Copyright by Tobi Oetiker, 1997-2005
  ****************************************************************************
  * rrd__graph.c  produce graphs from data in rrdfiles
  ****************************************************************************/
@@ -1614,14 +1614,16 @@ int draw_horizontal_grid(image_desc_t *im)
    
     int sgrid = (int)( im->minval / im->ygrid_scale.gridstep - 1);
     int egrid = (int)( im->maxval / im->ygrid_scale.gridstep + 1);
+    double MaxY;
     scaledstep = im->ygrid_scale.gridstep/im->magfact;
+    MaxY = scaledstep*(double)im->viewfactor*(double)egrid;
     for (i = sgrid; i <= egrid; i++){
        double Y0=ytr(im,im->ygrid_scale.gridstep*i);
        if ( Y0 >= im->yorigin-im->ysize
 	         && Y0 <= im->yorigin){       
 	    if(i % im->ygrid_scale.labfact == 0){		
 		if (i==0 || im->symbol == ' ') {
-		    if(scaledstep < 1){
+		    if(MaxY < 10) {
 			if(im->extra_flags & ALTYGRID) {
 			    sprintf(graph_label,im->ygrid_scale.labfmt,scaledstep*im->viewfactor*i);
 			}
@@ -1632,7 +1634,7 @@ int draw_horizontal_grid(image_desc_t *im)
 			sprintf(graph_label,"%4.0f",scaledstep*im->viewfactor*i);
 		    }
 		}else {
-		    if(scaledstep < 1){
+		    if(MaxY < 10){
 			sprintf(graph_label,"%4.1f %c",scaledstep*im->viewfactor*i, im->symbol);
 		    } else {
 			sprintf(graph_label,"%4.0f %c",scaledstep*im->viewfactor*i, im->symbol);