X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_graph.c;h=d7ff2b003b3e4e4546a82a043f122c6098fc6f6d;hb=ad994d046d175fec8f67cc3b7cddf3cb77d341be;hp=95e3ed670628b1f91cb589fa0bad885b2481d34e;hpb=f8b321ed9be936455166a5e9297199e84b048526;p=rrdtool.git

diff --git a/src/rrd_graph.c b/src/rrd_graph.c
index 95e3ed6..d7ff2b0 100644
--- a/src/rrd_graph.c
+++ b/src/rrd_graph.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * RRDtool 1.2rc7  Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2.0  Copyright by Tobi Oetiker, 1997-2005
  ****************************************************************************
  * rrd__graph.c  produce graphs from data in rrdfiles
  ****************************************************************************/
@@ -34,11 +34,11 @@
 #endif
 
 text_prop_t text_prop[] = {   
-     { 9.0, RRD_DEFAULT_FONT }, /* default */
-     { 11.0, RRD_DEFAULT_FONT }, /* title */
-     { 8.0,  RRD_DEFAULT_FONT }, /* axis */
-     { 9.0, RRD_DEFAULT_FONT }, /* unit */
-     { 9.0, RRD_DEFAULT_FONT }  /* legend */
+     { 8.0, RRD_DEFAULT_FONT }, /* default */
+     { 9.0, RRD_DEFAULT_FONT }, /* title */
+     { 7.0,  RRD_DEFAULT_FONT }, /* axis */
+     { 8.0, RRD_DEFAULT_FONT }, /* unit */
+     { 8.0, RRD_DEFAULT_FONT }  /* legend */
 };
 
 xlab_t xlab[] = {
@@ -329,23 +329,30 @@ 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);
     
 #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 = '?';
  }
@@ -1289,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 {
@@ -1488,7 +1497,7 @@ leg_place(image_desc_t *im)
 		   + legspace[ii]
 		   + glue;
 	    }	                
-	    leg_y += im->text_prop[TEXT_PROP_LEGEND].size*1.7;
+	    leg_y += im->text_prop[TEXT_PROP_LEGEND].size*1.8;
 	    if (prt_fctn == 's') leg_y -=  im->text_prop[TEXT_PROP_LEGEND].size;	   
 	    fill = 0;
 	    leg_c = 0;
@@ -1610,19 +1619,19 @@ 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);
 		    }
 		}
 
@@ -2109,7 +2118,7 @@ graph_size_location(image_desc_t *im, int elements
     ** +-+-------------------------------------------+
     */
     int Xvertical=0,	Yvertical=0,
-	Xtitle   =0,	Ytitle   =0,
+			Ytitle   =0,
 	Xylabel  =0,	
 	Xmain    =0,	Ymain    =0,
 #ifdef WITH_PIECHART
@@ -2143,11 +2152,12 @@ graph_size_location(image_desc_t *im, int elements
 	** automatically has some vertical spacing.  The horizontal
 	** spacing is added here, on each side.
 	*/
-	Xtitle = gfx_get_text_width(im->canvas, 0,
+	/* don't care for the with of the title
+		Xtitle = gfx_get_text_width(im->canvas, 0,
 		im->text_prop[TEXT_PROP_TITLE].font,
 		im->text_prop[TEXT_PROP_TITLE].size,
 		im->tabwidth,
-		im->title, 0) + 2*Xspacing;
+		im->title, 0) + 2*Xspacing; */
 	Ytitle = im->text_prop[TEXT_PROP_TITLE].size*2.5;
     }
 
@@ -2198,7 +2208,8 @@ graph_size_location(image_desc_t *im, int elements
 
     im->xorigin = Xspacing + Xylabel;
 
-    if (Xtitle > im->ximg) im->ximg = Xtitle;
+    /* the length of the title should not influence with width of the graph
+       if (Xtitle > im->ximg) im->ximg = Xtitle; */
 
     if (Xvertical) { /* unit description */
 	im->ximg += Xvertical;
@@ -2531,12 +2542,14 @@ graph_paint(image_desc_t *im, char ***calcpr)
   }
 #endif
 
-  if( !(im->extra_flags & ONLY_GRAPH) )  
-      axis_paint(im);
 
   /* grid_paint also does the text */
   if( !(im->extra_flags & ONLY_GRAPH) )  
     grid_paint(im);
+
+  
+  if( !(im->extra_flags & ONLY_GRAPH) )  
+      axis_paint(im);
   
   /* the RULES are the last thing to paint ... */
   for(i=0;i<im->gdes_c;i++){    
@@ -2662,7 +2675,6 @@ int
 rrd_graph(int argc, char **argv, char ***prdata, int *xsize, int *ysize, FILE *stream, double *ymin, double *ymax)
 {
     image_desc_t   im;
-            
     rrd_graph_init(&im);
     im.graphhandle = stream;
     
@@ -2753,7 +2765,9 @@ rrd_graph_init(image_desc_t *im)
     im->minval = DNAN;
     im->maxval = DNAN;    
     im->unitsexponent= 9999;
-    im->unitslength= 5; 
+    im->unitslength= 6; 
+    im->symbol = ' ';
+    im->viewfactor = 1.0;
     im->extra_flags= 0;
     im->rigid = 0;
     im->gridfit = 1;
@@ -2784,11 +2798,13 @@ rrd_graph_init(image_desc_t *im)
             if (windir != NULL) {
                     strncpy(rrd_win_default_font,windir,999);
                     rrd_win_default_font[999] = '\0';
-                    strcat(rrd_win_default_font,"\\fonts\\cour.ttf");
+                    strcat(rrd_win_default_font,"\\fonts\\");
+	            strcat(rrd_win_default_font,RRD_DEFAULT_FONT);         
                     for(i=0;i<DIM(text_prop);i++){
                             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
     {
@@ -2817,6 +2833,7 @@ rrd_graph_options(int argc, char *argv[],image_desc_t *im)
     long		long_tmp;
     struct rrd_time_value	start_tv, end_tv;
     gfx_color_t         color;
+    optind = 0; opterr = 0;  /* initialize getopt */
 
     parsetime("end-24h", &start_tv);
     parsetime("now", &end_tv);