X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_graph.c;h=3840c2d09b7e4a8a217604a4b4bcd611a1f740fd;hb=97fd0c7bffba47ce2b962364e7382b202cb0a469;hp=64d2e60a7fa645cade1117d4b9bff432c6c1f71e;hpb=b1068f0c33c979eafecd45ca02e03d3aab85415b;p=rrdtool.git

diff --git a/src/rrd_graph.c b/src/rrd_graph.c
index 64d2e60..3840c2d 100644
--- a/src/rrd_graph.c
+++ b/src/rrd_graph.c
@@ -1,5 +1,5 @@
-/****************************************************************************
- * RRDtool 1.2rc6  Copyright by Tobi Oetiker, 1997-2005
+/strfcmp/****************************************************************************
+ * RRDtool 1.2rc7  Copyright by Tobi Oetiker, 1997-2005
  ****************************************************************************
  * rrd__graph.c  produce graphs from data in rrdfiles
  ****************************************************************************/
@@ -329,25 +329,32 @@ si_unit(
 		     'E'};/* 10e18  Exa */
 
     int   symbcenter = 6;
-    double digits;  
+    double digits,viewdigits=0;  
     
+    digits = floor( log( max( fabs(im->minval),fabs(im->maxval)))/log((double)im->base)); 
+
     if (im->unitsexponent != 9999) {
 	/* unitsexponent = 9, 6, 3, 0, -3, -6, -9, etc */
-        digits = floor(im->unitsexponent / 3);
+        viewdigits = floor(im->unitsexponent / 3);
     } else {
-        digits = floor( log( max( fabs(im->minval),fabs(im->maxval)))/log((double)im->base)); 
+	viewdigits = digits;
     }
-    im->magfact = pow((double)im->base , digits);
 
+    im->magfact = pow((double)im->base , digits);
+    
 #ifdef DEBUG
     printf("digits %6.3f  im->magfact %6.3f\n",digits,im->magfact);
 #endif
 
-    if ( ((digits+symbcenter) < sizeof(symbol)) &&
-		    ((digits+symbcenter) >= 0) )
-        im->symbol = symbol[(int)digits+symbcenter];
+    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];
     else
-	im->symbol = ' ';
+	im->symbol = '?';
  }
 
 /*  move min and max values around to become sensible */
@@ -423,6 +430,10 @@ 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 */
@@ -1285,14 +1296,16 @@ print_calc(image_desc_t *im, char ***prdata)
 
 	    if (!strcmp(im->gdes[i].format,"%c")) { /* VDEF time print */
 		char ctime_buf[128]; /* PS: for ctime_r, must be >= 26 chars */
+		int iii=0;
+		ctime_r(&printtime,ctime_buf); 
+		while(isprint(ctime_buf[iii])){iii++};
+		ctime_buf[iii]='\0';
 		if (im->gdes[i].gf == GF_PRINT){
 		    (*prdata)[prlines-2] = malloc((FMT_LEG_LEN+2)*sizeof(char));
-		    sprintf((*prdata)[prlines-2],"%s (%lu)",
-					ctime_r(&printtime,ctime_buf),printtime);
+		    sprintf((*prdata)[prlines-2],"%s (%lu)",ctime_buf,printtime);
 		    (*prdata)[prlines-1] = NULL;
 		} else {
-		    sprintf(im->gdes[i].legend,"%s (%lu)",
-					ctime_r(&printtime,ctime_buf),printtime);
+		    sprintf(im->gdes[i].legend,"%s (%lu)",ctime_buf,printtime);
 		    graphelement = 1;
 		}
 	    } else {
@@ -1535,10 +1548,15 @@ calc_horizontal_grid(image_desc_t   *im)
 		decimals = 1;
 	    
 	    fractionals = floor(log10(range));
-	    if(fractionals < 0) /* small amplitude. */
-		sprintf(im->ygrid_scale.labfmt, "%%%d.%df", decimals - fractionals + 1, -fractionals + 1);
-	    else
-		sprintf(im->ygrid_scale.labfmt, "%%%d.1f", decimals + 1);
+	    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);
 	    if(im->ygrid_scale.gridstep == 0) /* range is one -> 0.1 is reasonable scale */
 		im->ygrid_scale.gridstep = 0.1;
@@ -1560,7 +1578,7 @@ calc_horizontal_grid(image_desc_t   *im)
 	else {
 	    for(i=0;ylab[i].grid > 0;i++){
 		pixel = im->ysize / (scaledrange / ylab[i].grid);
-		if (gridind == -1 && pixel > 5) {
+		if (pixel > 5) {
 		    gridind = i;
 		    break;
 		}
@@ -1601,24 +1619,24 @@ int draw_horizontal_grid(image_desc_t *im)
 		if (i==0 || im->symbol == ' ') {
 		    if(scaledstep < 1){
 			if(im->extra_flags & ALTYGRID) {
-			    sprintf(graph_label,im->ygrid_scale.labfmt,scaledstep*i);
+			    sprintf(graph_label,im->ygrid_scale.labfmt,scaledstep*im->viewfactor*i);
 			}
 			else {
-			    sprintf(graph_label,"%4.1f",scaledstep*i);
+			    sprintf(graph_label,"%4.1f",scaledstep*im->viewfactor*i);
 			}
 		    } else {
-			sprintf(graph_label,"%4.0f",scaledstep*i);
+			sprintf(graph_label,"%4.0f",scaledstep*im->viewfactor*i);
 		    }
 		}else {
 		    if(scaledstep < 1){
-			sprintf(graph_label,"%4.1f %c",scaledstep*i, im->symbol);
+			sprintf(graph_label,"%4.1f %c",scaledstep*im->viewfactor*i, im->symbol);
 		    } else {
-			sprintf(graph_label,"%4.0f %c",scaledstep*i, im->symbol);
+			sprintf(graph_label,"%4.0f %c",scaledstep*im->viewfactor*i, im->symbol);
 		    }
 		}
 
 	       gfx_new_text ( im->canvas,
-			      X0-im->text_prop[TEXT_PROP_AXIS].size/1.5, Y0,
+			      X0-im->text_prop[TEXT_PROP_AXIS].size, Y0,
 			      im->graph_col[GRC_FONT],
 			      im->text_prop[TEXT_PROP_AXIS].font,
 			      im->text_prop[TEXT_PROP_AXIS].size,
@@ -1712,7 +1730,7 @@ horizontal_log_grid(image_desc_t   *im)
 	   
 	   sprintf(graph_label,"%3.0e",value * yloglab[majoridx][i]);
 	   gfx_new_text ( im->canvas,
-			  X0-im->text_prop[TEXT_PROP_AXIS].size/1.5, Y0,
+			  X0-im->text_prop[TEXT_PROP_AXIS].size, Y0,
 			  im->graph_col[GRC_FONT],
 			  im->text_prop[TEXT_PROP_AXIS].font,
 			  im->text_prop[TEXT_PROP_AXIS].size,
@@ -1819,7 +1837,7 @@ vertical_grid(
 # error "your libc has no strftime I guess we'll abort the exercise here."
 #endif
        gfx_new_text ( im->canvas,
-		      xtr(im,tilab), Y0+im->text_prop[TEXT_PROP_AXIS].size/1.5,
+		      xtr(im,tilab), Y0+im->text_prop[TEXT_PROP_AXIS].size,
 		      im->graph_col[GRC_FONT],
 		      im->text_prop[TEXT_PROP_AXIS].font,
 		      im->text_prop[TEXT_PROP_AXIS].size,
@@ -2101,16 +2119,16 @@ graph_size_location(image_desc_t *im, int elements
     */
     int Xvertical=0,	Yvertical=0,
 	Xtitle   =0,	Ytitle   =0,
-	Xylabel  =0,	Yylabel  =0,
+	Xylabel  =0,	
 	Xmain    =0,	Ymain    =0,
 #ifdef WITH_PIECHART
 	Xpie     =0,	Ypie     =0,
 #endif
-	Xxlabel  =0,	Yxlabel  =0,
+		        Yxlabel  =0,
 #if 0
 	Xlegend  =0,	Ylegend  =0,
 #endif
-        Xspacing =10,  Yspacing =10;
+        Xspacing =15,  Yspacing =15;
 
     if (im->extra_flags & ONLY_GRAPH) {
 	im->xorigin =0;
@@ -2146,12 +2164,14 @@ graph_size_location(image_desc_t *im, int elements
 	Xmain=im->xsize;
 	Ymain=im->ysize;
 	if (im->draw_x_grid) {
-	    Xxlabel=Xmain;
 	    Yxlabel=im->text_prop[TEXT_PROP_AXIS].size *2.5;
 	}
 	if (im->draw_y_grid) {
-	    Xylabel=im->text_prop[TEXT_PROP_AXIS].size *6;
-	    Yylabel=Ymain;
+	    Xylabel=gfx_get_text_width(im->canvas, 0,
+	                im->text_prop[TEXT_PROP_AXIS].font,
+        	        im->text_prop[TEXT_PROP_AXIS].size,
+                	im->tabwidth,
+                	"0", 0) * im->unitslength + im->text_prop[TEXT_PROP_AXIS].size * 2;
 	}
     }
 
@@ -2728,7 +2748,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;
@@ -2740,6 +2762,9 @@ rrd_graph_init(image_desc_t *im)
     im->minval = DNAN;
     im->maxval = DNAN;    
     im->unitsexponent= 9999;
+    im->unitslength= 5; 
+    im->symbol = ' ';
+    im->viewfactor = 1.0;
     im->extra_flags= 0;
     im->rigid = 0;
     im->gridfit = 1;
@@ -2775,6 +2800,7 @@ rrd_graph_init(image_desc_t *im)
                             strncpy(text_prop[i].font,rrd_win_default_font,sizeof(text_prop[i].font)-1);
                             text_prop[i].font[sizeof(text_prop[i].font)-1] = '\0';
                      }
+             }
     }
 #endif
     {
@@ -2837,17 +2863,18 @@ rrd_graph_options(int argc, char *argv[],image_desc_t *im)
             {"no-minor",   no_argument,       0,  'I'},
 	    {"alt-autoscale", no_argument,    0,  'A'},
 	    {"alt-autoscale-max", no_argument, 0, 'M'},
+            {"no-gridfit", no_argument,       0,   'N'},
 	    {"units-exponent",required_argument, 0, 'X'},
+	    {"units-length",required_argument, 0, 'L'},
 	    {"step",       required_argument, 0,    'S'},
             {"tabwidth",   required_argument, 0,    'T'},            
-	    {"no-gridfit", no_argument,       0,   'N'},
 	    {0,0,0,0}};
 	int option_index = 0;
 	int opt;
         int col_start,col_end;
 
 	opt = getopt_long(argc, argv, 
-			 "s:e:x:y:v:w:h:iu:l:rb:oc:n:m:t:f:a:I:zgjFYAMX:S:NT:",
+			 "s:e:x:y:v:w:h:iu:l:rb:oc:n:m:t:f:a:I:zgjFYAMX:L:S:T:N",
 			  long_options, &option_index);
 
 	if (opt == EOF)
@@ -2878,13 +2905,16 @@ rrd_graph_options(int argc, char *argv[],image_desc_t *im)
 	case 'X':
 	    im->unitsexponent = atoi(optarg);
 	    break;
+	case 'L':
+	    im->unitslength = atoi(optarg);
+	    break;
 	case 'T':
 	    im->tabwidth = atof(optarg);
 	    break;
 	case 'S':
 	    im->step =  atoi(optarg);
 	    break;
-	case 262:
+	case 'N':
 	    im->gridfit = 0;
 	    break;
 	case 's':