X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_graph.c;h=c9411e25f6f3555daaddbea6f19f2bd6230714f9;hb=aa4d951ab71eb7fe57840c3baaddf36809806aef;hp=33f0e516bf35279972358e5bed0fa76bba800111;hpb=361a0fd38d7adf95847508f54c0bde9b3f98662e;p=rrdtool.git

diff --git a/src/rrd_graph.c b/src/rrd_graph.c
index 33f0e51..c9411e2 100644
--- a/src/rrd_graph.c
+++ b/src/rrd_graph.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * RRDtool 1.2.8  Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2.10  Copyright by Tobi Oetiker, 1997-2005
  ****************************************************************************
  * rrd__graph.c  produce graphs from data in rrdfiles
  ****************************************************************************/
@@ -350,8 +350,6 @@ si_unit(
 
     im->viewfactor = im->magfact / pow((double)im->base , viewdigits);
 
-    pow((double)im->base , viewdigits);
-
     if ( ((viewdigits+symbcenter) < sizeof(symbol)) &&
 		    ((viewdigits+symbcenter) >= 0) )
         im->symbol = symbol[(int)viewdigits+symbcenter];
@@ -394,7 +392,7 @@ expand_range(image_desc_t *im)
 	      delt = im->maxval - im->minval;
 	      adj = delt * 0.1;
 	      fact = 2.0 * pow(10.0,
-		    floor(log10(max(fabs(im->minval), fabs(im->maxval)))) - 2);
+		    floor(log10(max(fabs(im->minval), fabs(im->maxval))/im->magfact)) - 2);
 	      if (delt < fact) {
 		adj = (fact - delt) * 0.55;
 #ifdef DEBUG
@@ -432,10 +430,6 @@ expand_range(image_desc_t *im)
 		    -sensiblevalues[i] >=scaled_max)
 		    im->maxval = -sensiblevalues[i]*(im->magfact);
 	    }
-	    /* no sensiblevalues found. we switch to ALTYGRID mode */
-	    if (sensiblevalues[i] == 0){
-		im->extra_flags |= ALTYGRID;
-	    }		
 	}
     } else {
 	/* adjust min and max to the grid definition if there is one */
@@ -1549,21 +1543,12 @@ calc_horizontal_grid(image_desc_t   *im)
     if(isnan(im->ygridstep)){
 	if(im->extra_flags & ALTYGRID) {
 	    /* find the value with max number of digits. Get number of digits */
-	    decimals = ceil(log10(max(fabs(im->maxval), fabs(im->minval))));
+	    decimals = ceil(log10(max(fabs(im->maxval), fabs(im->minval))*im->viewfactor/im->magfact));
 	    if(decimals <= 0) /* everything is small. make place for zero */
 		decimals = 1;
 	    
-	    fractionals = floor(log10(range));
-	    if(fractionals < 0) { /* small amplitude. */
-		int len = decimals - fractionals + 1;
-		if (im->unitslength < len) im->unitslength = len;
-		sprintf(im->ygrid_scale.labfmt, "%%%d.%df", len, -fractionals + 1);
-	    } else {
-		int len = decimals + 1;
-		if (im->unitslength < len) im->unitslength = len;
-		sprintf(im->ygrid_scale.labfmt, "%%%d.1f", len);
-	    }
-	    im->ygrid_scale.gridstep = pow((double)10, (double)fractionals);
+	    im->ygrid_scale.gridstep = pow((double)10, floor(log10(range*im->viewfactor/im->magfact)))/im->viewfactor*im->magfact;
+	    
 	    if(im->ygrid_scale.gridstep == 0) /* range is one -> 0.1 is reasonable scale */
 		im->ygrid_scale.gridstep = 0.1;
 	    /* should have at least 5 lines but no more then 15 */
@@ -1580,6 +1565,16 @@ calc_horizontal_grid(image_desc_t   *im)
 		im->ygrid_scale.gridstep /= 5;
 		im->ygrid_scale.labfact = 5;
 	    }
+	    fractionals = floor(log10(im->ygrid_scale.gridstep*(double)im->ygrid_scale.labfact*im->viewfactor/im->magfact));
+	    if(fractionals < 0) { /* small amplitude. */
+		int len = decimals - fractionals + 1;
+		if (im->unitslength < len+2) im->unitslength = len+2;
+		sprintf(im->ygrid_scale.labfmt, "%%%d.%df%s", len, -fractionals,(im->symbol != ' ' ? " %c" : ""));
+	    } else {
+		int len = decimals + 1;
+		if (im->unitslength < len+2) im->unitslength = len+2;
+		sprintf(im->ygrid_scale.labfmt, "%%%d.1f%s", len, ( im->symbol != ' ' ? " %c" : "" ));
+	    }
 	}
 	else {
 	    for(i=0;ylab[i].grid > 0;i++){
@@ -1617,30 +1612,34 @@ 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;
+    scaledstep = im->ygrid_scale.gridstep/(double)im->magfact*(double)im->viewfactor;
+    MaxY = scaledstep*(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(MaxY < 10) {
-			if(im->extra_flags & ALTYGRID) {
-			    sprintf(graph_label,im->ygrid_scale.labfmt,scaledstep*im->viewfactor*i);
-			}
-			else {
-			    sprintf(graph_label,"%4.1f",scaledstep*im->viewfactor*i);
-			}
-		    } else {
-			sprintf(graph_label,"%4.0f",scaledstep*im->viewfactor*i);
-		    }
+		if (im->symbol == ' ') {
+ 		    if(im->extra_flags & ALTYGRID) {
+		        sprintf(graph_label,im->ygrid_scale.labfmt,scaledstep*(double)i);
+                    } else {
+                        if(MaxY < 10) {
+		           sprintf(graph_label,"%4.1f",scaledstep*(double)i);
+  		        } else {
+			   sprintf(graph_label,"%4.0f",scaledstep*(double)i);
+		        }
+                    }
 		}else {
-		    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);
-		    }
+		    char sisym = ( i == 0  ? ' ' : im->symbol);
+ 		    if(im->extra_flags & ALTYGRID) {
+		        sprintf(graph_label,im->ygrid_scale.labfmt,scaledstep*(double)i,sisym);
+                    } else {
+  		        if(MaxY < 10){
+		   	  sprintf(graph_label,"%4.1f %c",scaledstep*(double)i, sisym);
+		        } else {
+		   	  sprintf(graph_label,"%4.0f %c",scaledstep*(double)i, sisym);
+		        }
+                    }
 		}
 
 	       gfx_new_text ( im->canvas,
@@ -3152,20 +3151,17 @@ rrd_graph_options(int argc, char *argv[],image_desc_t *im)
 	    if(sscanf(optarg,
 				"%10[A-Z]:%lf:%1000s",
 				prop,&size,font) == 3){
-		int sindex;
+		int sindex,propidx;
 		if((sindex=text_prop_conv(prop)) != -1){
-		    im->text_prop[sindex].size=size;              
-		    strcpy(im->text_prop[sindex].font,font);
-		    if (sindex==0) { /* the default */
-			im->text_prop[TEXT_PROP_TITLE].size=size;
-			strcpy(im->text_prop[TEXT_PROP_TITLE].font,font);
-			im->text_prop[TEXT_PROP_AXIS].size=size;
-			strcpy(im->text_prop[TEXT_PROP_AXIS].font,font);
-			im->text_prop[TEXT_PROP_UNIT].size=size;
-			strcpy(im->text_prop[TEXT_PROP_UNIT].font,font);
-			im->text_prop[TEXT_PROP_LEGEND].size=size;
-			strcpy(im->text_prop[TEXT_PROP_LEGEND].font,font);
-		    }
+                  for (propidx=sindex;propidx<TEXT_PROP_LAST;propidx++){  	              
+  	              if (size > 0){
+    		          im->text_prop[propidx].size=size;              
+                      }
+ 		      if (strlen(font) > 0){
+		          strcpy(im->text_prop[propidx].font,font);
+                      }
+                      if (propidx==sindex && sindex != 0) break;
+                  }
 		} else {
 		    rrd_set_error("invalid fonttag '%s'",prop);
 		    return;