X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_graph.c;h=f1e1fe7e3db3ca1a900f48d0c226ada899e4901c;hb=58d4c1353da772a7e07d65094216aa5cfe3c892b;hp=2fd703eb34ca7e78b8216bc3c664cc623de4da9a;hpb=600d3bed47fa7cde815d16f642f0b383738395d1;p=rrdtool.git

diff --git a/src/rrd_graph.c b/src/rrd_graph.c
index 2fd703e..f1e1fe7 100644
--- a/src/rrd_graph.c
+++ b/src/rrd_graph.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * RRDtool 1.2rc8  Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2.3  Copyright by Tobi Oetiker, 1997-2005
  ****************************************************************************
  * rrd__graph.c  produce graphs from data in rrdfiles
  ****************************************************************************/
@@ -30,13 +30,13 @@
 
 #ifndef RRD_DEFAULT_FONT
 /* there is special code later to pick Cour.ttf when running on windows */
-#define RRD_DEFAULT_FONT "VeraMono.ttf"
+#define RRD_DEFAULT_FONT "DejaVuSansMono-Roman.ttf"
 #endif
 
 text_prop_t text_prop[] = {   
      { 8.0, RRD_DEFAULT_FONT }, /* default */
      { 9.0, RRD_DEFAULT_FONT }, /* title */
-     { 8.0,  RRD_DEFAULT_FONT }, /* axis */
+     { 7.0,  RRD_DEFAULT_FONT }, /* axis */
      { 8.0, RRD_DEFAULT_FONT }, /* unit */
      { 8.0, RRD_DEFAULT_FONT }  /* legend */
 };
@@ -151,9 +151,9 @@ ytr(image_desc_t *im, double value){
     if (! im->rigid) {
       /* keep yval as-is */
     } else if (yval > im->yorigin) {
-      yval = im->yorigin+2;
+      yval = im->yorigin;
     } else if (yval < im->yorigin - im->ysize){
-      yval = im->yorigin - im->ysize - 2;
+      yval = im->yorigin - im->ysize;
     } 
     return yval;
 }
@@ -886,26 +886,29 @@ data_calc( image_desc_t *im){
 		 *   and the resulting number is the step size for the
 		 *   resulting data source.
 		 */
-		for(rpi=0;im->gdes[gdi].rpnp[rpi].op != OP_END;rpi++){
-		if(im->gdes[gdi].rpnp[rpi].op == OP_VARIABLE ||
-		   im->gdes[gdi].rpnp[rpi].op == OP_PREV_OTHER){
-			long ptr = im->gdes[gdi].rpnp[rpi].ptr;
-			if (im->gdes[ptr].ds_cnt == 0) {
+	        for(rpi=0;im->gdes[gdi].rpnp[rpi].op != OP_END;rpi++){
+	            if(im->gdes[gdi].rpnp[rpi].op == OP_VARIABLE  ||
+		        im->gdes[gdi].rpnp[rpi].op == OP_PREV_OTHER){
+		        long ptr = im->gdes[gdi].rpnp[rpi].ptr;
+		        if (im->gdes[ptr].ds_cnt == 0) { /* this is a VDEF data source */
 #if 0
-			printf("DEBUG: inside CDEF '%s' processing VDEF '%s'\n",
-	im->gdes[gdi].vname,
-	im->gdes[ptr].vname);
-			printf("DEBUG: value from vdef is %f\n",im->gdes[ptr].vf.val);
+			    printf("DEBUG: inside CDEF '%s' processing VDEF '%s'\n",
+			       im->gdes[gdi].vname,
+			       im->gdes[ptr].vname);
+			    printf("DEBUG: value from vdef is %f\n",im->gdes[ptr].vf.val);
 #endif
 			    im->gdes[gdi].rpnp[rpi].val = im->gdes[ptr].vf.val;
 			    im->gdes[gdi].rpnp[rpi].op  = OP_NUMBER;
-			} else {
-			if ((steparray =
+			} else { /* normal variables and PREF(variables) */
+
+			    /* add one entry to the array that keeps track of the step sizes of the
+			     * data sources going into the CDEF. */
+			    if ((steparray =
 				 rrd_realloc(steparray,
 							 (++stepcnt+1)*sizeof(*steparray)))==NULL){
-				rrd_set_error("realloc steparray");
-				rpnstack_free(&rpnstack);
-				return -1;
+			 	 rrd_set_error("realloc steparray");
+			 	 rpnstack_free(&rpnstack);
+				 return -1;
 			    };
 
 			    steparray[stepcnt-1] = im->gdes[ptr].step;
@@ -915,6 +918,7 @@ data_calc( image_desc_t *im){
 			     * to the earliest endpoint of any of the
 			     * rras involved (ptr)
 			     */
+
 			    if(im->gdes[gdi].start < im->gdes[ptr].start)
 				im->gdes[gdi].start = im->gdes[ptr].start;
 
@@ -927,8 +931,8 @@ data_calc( image_desc_t *im){
 			     * further save step size and data source
 			     * count of this rra
 			     */ 
-                            im->gdes[gdi].rpnp[rpi].data =  im->gdes[ptr].data + im->gdes[ptr].ds;
-			    im->gdes[gdi].rpnp[rpi].step = im->gdes[ptr].step;
+                            im->gdes[gdi].rpnp[rpi].data   = im->gdes[ptr].data + im->gdes[ptr].ds;
+			    im->gdes[gdi].rpnp[rpi].step   = im->gdes[ptr].step;
 			    im->gdes[gdi].rpnp[rpi].ds_cnt = im->gdes[ptr].ds_cnt;
 
 			    /* backoff the *.data ptr; this is done so
@@ -941,9 +945,9 @@ data_calc( image_desc_t *im){
 
                 /* move the data pointers to the correct period */
                 for(rpi=0;im->gdes[gdi].rpnp[rpi].op != OP_END;rpi++){
-		if(im->gdes[gdi].rpnp[rpi].op == OP_VARIABLE ||
-		   im->gdes[gdi].rpnp[rpi].op == OP_PREV_OTHER){
-                        long ptr = im->gdes[gdi].rpnp[rpi].ptr;
+		    if(im->gdes[gdi].rpnp[rpi].op == OP_VARIABLE ||
+		        im->gdes[gdi].rpnp[rpi].op == OP_PREV_OTHER){
+		        long ptr  = im->gdes[gdi].rpnp[rpi].ptr;
 			long diff = im->gdes[gdi].start - im->gdes[ptr].start;
 
                         if(diff > 0)
@@ -1578,7 +1582,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 (pixel > 5) {
+		if (pixel > 7) {
 		    gridind = i;
 		    break;
 		}
@@ -1923,7 +1927,7 @@ grid_paint(image_desc_t   *im)
 	} else {
 		res = draw_horizontal_grid(im);
 	}
-
+	
 	/* dont draw horizontal grid if there is no min and max val */
 	if (! res ) {
 	  char *nodata = "No Data found";
@@ -1938,7 +1942,7 @@ grid_paint(image_desc_t   *im)
 
     /* yaxis unit description */
     gfx_new_text( im->canvas,
-                  7, (im->yorigin - im->ysize/2),
+                  12, (im->yorigin - im->ysize/2),
                   im->graph_col[GRC_FONT],
                   im->text_prop[TEXT_PROP_UNIT].font,
                   im->text_prop[TEXT_PROP_UNIT].size, im->tabwidth, 
@@ -1948,12 +1952,20 @@ grid_paint(image_desc_t   *im)
 
     /* graph title */
     gfx_new_text( im->canvas,
-		  im->ximg/2, im->text_prop[TEXT_PROP_TITLE].size*1.2,
+		  im->ximg/2, im->text_prop[TEXT_PROP_TITLE].size*1.3+4,
 		  im->graph_col[GRC_FONT],
 		  im->text_prop[TEXT_PROP_TITLE].font,
 		  im->text_prop[TEXT_PROP_TITLE].size, im->tabwidth, 0.0,
 		  GFX_H_CENTER, GFX_V_CENTER,
 		  im->title);
+    /* rrdtool 'logo' */
+    gfx_new_text( im->canvas,
+		  im->ximg-7, 7,
+		  ( im->graph_col[GRC_FONT] & 0xffffff00 ) | 0x00000066,
+		  im->text_prop[TEXT_PROP_AXIS].font,
+		  5.5, im->tabwidth, 270,
+		  GFX_H_RIGHT, GFX_V_TOP,
+		  "RRDTOOL / TOBI OETIKER");
     
     /* graph labels */
     if( !(im->extra_flags & NOLEGEND) & !(im->extra_flags & ONLY_GRAPH) ) {
@@ -2117,8 +2129,8 @@ graph_size_location(image_desc_t *im, int elements
     ** | |..............legends......................|
     ** +-+-------------------------------------------+
     */
-    int Xvertical=0,	Yvertical=0,
-	Xtitle   =0,	Ytitle   =0,
+    int Xvertical=0,	
+			Ytitle   =0,
 	Xylabel  =0,	
 	Xmain    =0,	Ymain    =0,
 #ifdef WITH_PIECHART
@@ -2139,11 +2151,7 @@ graph_size_location(image_desc_t *im, int elements
     }
 
     if (im->ylegend[0] != '\0' ) {
-           Xvertical = im->text_prop[TEXT_PROP_UNIT].size *2;
-           Yvertical = gfx_get_text_width(im->canvas, 0,
-                                          im->text_prop[TEXT_PROP_UNIT].font,
-                                          im->text_prop[TEXT_PROP_UNIT].size,
-                                          im->tabwidth,im->ylegend, 0);
+           Xvertical = im->text_prop[TEXT_PROP_UNIT].size *1.6;
     }
 
 
@@ -2152,12 +2160,13 @@ 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;
-	Ytitle = im->text_prop[TEXT_PROP_TITLE].size*2.5;
+		im->title, 0) + 2*Xspacing; */
+	Ytitle = im->text_prop[TEXT_PROP_TITLE].size*2.6+10;
     }
 
     if (elements) {
@@ -2171,7 +2180,7 @@ graph_size_location(image_desc_t *im, int elements
 	                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;
+                	"0", 0) * im->unitslength + Xspacing;
 	}
     }
 
@@ -2207,7 +2216,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;
@@ -2239,8 +2249,8 @@ graph_size_location(image_desc_t *im, int elements
 	im->yimg += Ytitle;
 	im->yorigin += Ytitle;
     } else {
-	im->yimg += Yspacing;
-	im->yorigin += Yspacing;
+	im->yimg += 1.5*Yspacing;
+	im->yorigin += 1.5*Yspacing;
     }
     /* reserve space for padding below the graph */
     im->yimg += Yspacing;
@@ -2252,8 +2262,6 @@ graph_size_location(image_desc_t *im, int elements
     if(leg_place(im)==-1)
 	return -1;
 
-    /* last of three steps: check total height of image */
-    if (im->yimg < Yvertical) im->yimg = Yvertical;
 
 #if 0
     if (Xlegend > im->ximg) {
@@ -2446,13 +2454,13 @@ graph_paint(image_desc_t *im, char ***calcpr)
       } /* for */
 
       /* *******************************************************
-                   ___ 
-		  |   |    ___
+       a           ___. (a,t) 
+  		  |   |    ___
               ____|   |   |   |
               |       |___|
-       -------|---------------------------------------      
+       -------|--t-1--t--------------------------------      
                       
-      if we know the value of y at time t was a then 
+      if we know the value at time t was a then 
       we draw a square from t-1 to t with the value a.
 
       ********************************************************* */
@@ -2460,47 +2468,80 @@ graph_paint(image_desc_t *im, char ***calcpr)
         /* GF_LINE and friend */
         if(stack_gf == GF_LINE ){
           node = NULL;
-          for(ii=1;ii<im->xsize;ii++){
-	    if (isnan(im->gdes[i].p_data[ii])){
+          for(ii=1;ii<im->xsize;ii++){	    
+	    if (isnan(im->gdes[i].p_data[ii]) || (im->slopemode==1 && isnan(im->gdes[i].p_data[ii-1]))){
 		node = NULL;
 		continue;
 	    }
             if ( node == NULL ) {
-                 node = gfx_new_line(im->canvas,
+		if ( im->slopemode == 0 ){
+                  node = gfx_new_line(im->canvas,
                                     ii-1+im->xorigin,ytr(im,im->gdes[i].p_data[ii]),
                                     ii+im->xorigin,ytr(im,im->gdes[i].p_data[ii]),
                                     im->gdes[i].linewidth,
                                     im->gdes[i].col);
+	        } else {
+                  node = gfx_new_line(im->canvas,
+                                    ii-1+im->xorigin,ytr(im,im->gdes[i].p_data[ii-1]),
+                                    ii+im->xorigin,ytr(im,im->gdes[i].p_data[ii]),
+                                    im->gdes[i].linewidth,
+                                    im->gdes[i].col);
+	        }
              } else {
-               gfx_add_point(node,ii-1+im->xorigin,ytr(im,im->gdes[i].p_data[ii]));
+	       if ( im->slopemode==0 ){
+                   gfx_add_point(node,ii-1+im->xorigin,ytr(im,im->gdes[i].p_data[ii]));
+	       };
                gfx_add_point(node,ii+im->xorigin,ytr(im,im->gdes[i].p_data[ii]));
              };
 
           }
         } else {
-          for(ii=1;ii<im->xsize;ii++){
+	  float ybase0 = DNAN,ytop0=DNAN;
+          for(ii=0;ii<im->xsize;ii++){
 	    /* keep things simple for now, just draw these bars
 	       do not try to build a big and complex area */
 	    float ybase,ytop;
+	    if ( im->slopemode == 0 && ii==0){
+		continue;
+	    }
 	    if ( isnan(im->gdes[i].p_data[ii]) ) {
+		ybase0 = DNAN;
 		continue;
 	    }
             ytop = ytr(im,im->gdes[i].p_data[ii]);
- 	    if ( im->gdes[i].stack ) {
+ 	    if ( lastgdes && im->gdes[i].stack ) {
                   ybase = ytr(im,lastgdes->p_data[ii]);
             } else {
                   ybase = ytr(im,areazero);
             }
             if ( ybase == ytop ){
-		continue;
+		ybase0 = DNAN;
+		continue;	
+	    }
+	    /* every area has to be wound clock-wise,
+	       so we have to make sur base remains base  */		
+	    if (ybase > ytop){
+		float extra = ytop;
+		ytop = ybase;
+		ybase = extra;
 	    }
-            node = gfx_new_area(im->canvas,
-                                ii-1+im->xorigin,ybase,
-                                ii-1+im->xorigin,ytop,
+	    if ( im->slopemode == 0){
+		 ybase0 = ybase;
+		 ytop0 = ytop;
+	    }
+	    if ( !isnan(ybase0) ){
+	            node = gfx_new_area(im->canvas,
+                                ii-1+im->xorigin,ybase0,
+                                ii-1+im->xorigin,ytop0,
                                 ii+im->xorigin,ytop,				
                                 im->gdes[i].col
                                );
-            gfx_add_point(node,ii+im->xorigin,ybase);
+        	    gfx_add_point(node,
+			        ii+im->xorigin,ybase
+                              );
+            }
+	    ybase0=ybase;
+	    ytop0=ytop;
           }             
         } /* else GF_LINE */
       } /* if color != 0x0 */
@@ -2540,12 +2581,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++){    
@@ -2671,7 +2714,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;
     
@@ -2762,7 +2804,7 @@ rrd_graph_init(image_desc_t *im)
     im->minval = DNAN;
     im->maxval = DNAN;    
     im->unitsexponent= 9999;
-    im->unitslength= 6; 
+    im->unitslength= 5; 
     im->symbol = ' ';
     im->viewfactor = 1.0;
     im->extra_flags= 0;
@@ -2770,6 +2812,7 @@ rrd_graph_init(image_desc_t *im)
     im->gridfit = 1;
     im->imginfo = NULL;
     im->lazy = 0;
+    im->slopemode = 0;
     im->logarithmic = 0;
     im->ygridstep = DNAN;
     im->draw_x_grid = 1;
@@ -2795,7 +2838,8 @@ 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';
@@ -2829,6 +2873,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);
@@ -2861,6 +2906,7 @@ rrd_graph_options(int argc, char *argv[],image_desc_t *im)
             {"only-graph", no_argument,       0,  'j'},
 	    {"alt-y-grid", no_argument,       0,  'Y'},
             {"no-minor",   no_argument,       0,  'I'},
+	    {"slope-mode", no_argument,	      0,  'E'},
 	    {"alt-autoscale", no_argument,    0,  'A'},
 	    {"alt-autoscale-max", no_argument, 0, 'M'},
             {"no-gridfit", no_argument,       0,   'N'},
@@ -2868,13 +2914,15 @@ rrd_graph_options(int argc, char *argv[],image_desc_t *im)
 	    {"units-length",required_argument, 0, 'L'},
 	    {"step",       required_argument, 0,    'S'},
             {"tabwidth",   required_argument, 0,    'T'},            
+	    {"font-render-mode", required_argument, 0, 'R'},
+	    {"font-smoothing-threshold", required_argument, 0, 'B'},
 	    {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:L:S:T:N",
+			 "s:e:x:y:v:w:h:iu:l:rb:oc:n:m:t:f:a:I:zgjFYAMEX:L:S:T:NR:B:",
 			  long_options, &option_index);
 
 	if (opt == EOF)
@@ -3038,6 +3086,10 @@ rrd_graph_options(int argc, char *argv[],image_desc_t *im)
 	case 'z':
 	    im->lazy = 1;
 	    break;
+	case 'E':
+	    im->slopemode = 1;
+	    break;
+
 	case 'o':
 	    im->logarithmic = 1;
 	    if (isnan(im->minval))
@@ -3114,6 +3166,24 @@ rrd_graph_options(int argc, char *argv[],image_desc_t *im)
 	    im->title[150]='\0';
 	    break;
 
+	case 'R':
+		if ( strcmp( optarg, "normal" ) == 0 )
+			im->canvas->aa_type = AA_NORMAL;
+		else if ( strcmp( optarg, "light" ) == 0 )
+			im->canvas->aa_type = AA_LIGHT;
+		else if ( strcmp( optarg, "mono" ) == 0 )
+			im->canvas->aa_type = AA_NONE;
+		else
+		{
+			rrd_set_error("unknown font-render-mode '%s'", optarg );
+			return;
+		}
+		break;
+
+	case 'B':
+	    im->canvas->font_aa_threshold = atof(optarg);
+		break;
+
 	case '?':
             if (optopt != 0)
                 rrd_set_error("unknown option '%c'", optopt);