X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_graph.c;h=2e9e0091117fb4500a96b77af3cde8003ff8e5f4;hb=77377ff6ac43512ee216af115a3e62c57a2484a3;hp=ea7ed0d2f6474a5ed389da6b6e4059efef951c3a;hpb=01399dbbb2b67d6fbe8d22eac1a1482f8efee461;p=rrdtool.git

diff --git a/src/rrd_graph.c b/src/rrd_graph.c
index ea7ed0d..2e9e009 100644
--- a/src/rrd_graph.c
+++ b/src/rrd_graph.c
@@ -181,7 +181,6 @@ enum gf_en gf_conv(char *string){
 
 enum if_en if_conv(char *string){
     
-    conv_if(GIF,IF_GIF)
     conv_if(PNG,IF_PNG)
 
     return (-1);
@@ -816,6 +815,17 @@ printf("DEBUG: value from vdef is %f\n",im->gdes[ptr].vf.val);
 		    } /* if OP_VARIABLE */
 		} /* loop through all rpi */
 
+                /* 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){
+                        long ptr = im->gdes[gdi].rpnp[rpi].ptr;
+                        if(im->gdes[gdi].start > im->gdes[ptr].start) {
+                            im->gdes[gdi].rpnp[rpi].data += im->gdes[gdi].rpnp[rpi].ds_cnt;
+                        }
+                     }
+                }
+        
+
 		if(steparray == NULL){
 		    rrd_set_error("rpn expressions without DEF"
 				" or CDEF variables are not supported");
@@ -1713,17 +1723,22 @@ grid_paint(
     
 
     /* draw 3d border */
-    node = gfx_new_area (canvas, 0,im->ygif, 0,0, im->xgif, 0,im->graph_col[GRC_SHADEA]);
+    node = gfx_new_area (canvas, 0,im->ygif,
+                                 2,im->ygif-2,
+                                 2,2,im->graph_col[GRC_SHADEA]);
     gfx_add_point( node , im->xgif - 2, 2 );
-    gfx_add_point( node , 2,2 );
-    gfx_add_point( node , 2,im->ygif-2 );
-    gfx_add_point( node , 0,im->ygif );
+    gfx_add_point( node , im->xgif, 0 );
+    gfx_add_point( node , 0,0 );
+/*    gfx_add_point( node , 0,im->ygif ); */
    
-    node =  gfx_new_area (canvas, 0,im->ygif, im->xgif,im->ygif, im->xgif,0,im->graph_col[GRC_SHADEB]);
-    gfx_add_point( node , im->xgif - 2, 2 );
-    gfx_add_point( node , im->xgif-2,im->ygif-2 );
-    gfx_add_point( node , 2,im->ygif-2 );
-    gfx_add_point( node , 0,im->ygif );
+    node =  gfx_new_area (canvas, 2,im->ygif-2,
+                                  im->xgif-2,im->ygif-2,
+                                  im->xgif - 2, 2,
+                                 im->graph_col[GRC_SHADEB]);
+    gfx_add_point( node ,   im->xgif,0);
+    gfx_add_point( node ,   im->xgif,im->ygif);
+    gfx_add_point( node ,   0,im->ygif);
+/*    gfx_add_point( node , 0,im->ygif ); */
    
    
     if (im->draw_x_grid == 1 )
@@ -1775,15 +1790,15 @@ grid_paint(
 	 if(im->gdes[i].gf != GF_GPRINT && im->gdes[i].gf != GF_COMMENT){
 	    x0 = im->gdes[i].leg_x;
 	    y0 = im->gdes[i].leg_y+1.0;
-	    x1 = x0+boxH;
+	    x1 = x0;
 	    x2 = x0+boxH;
-	    x3 = x0;
-	    y1 = y0;
+	    x3 = x0+boxH;
+	    y1 = y0+boxV;
 	    y2 = y0+boxV;
-	    y3 = y0+boxV;
+	    y3 = y0;
 	    node = gfx_new_area(canvas, x0,y0,x1,y1,x2,y2 ,im->gdes[i].col);
 	    gfx_add_point ( node, x3, y3 );
-	    gfx_add_point ( node, x0, y0 );
+/*	    gfx_add_point ( node, x0, y0 ); */
 	    node = gfx_new_line(canvas, x0,y0,x1,y1 ,GRIDWIDTH, im->graph_col[GRC_FRAME]);
 	    gfx_add_point ( node, x2, y2 );
 	    gfx_add_point ( node, x3, y3 );
@@ -1833,9 +1848,6 @@ int lazy_check(image_desc_t *im){
     if ((fd = fopen(im->graphfile,"rb")) == NULL) 
       return 0; /* the file does not exist */
     switch (im->imgformat) {
-    case IF_GIF:
-	   size = GifSize(fd,&(im->xgif),&(im->ygif));
-	   break;
     case IF_PNG:
 	   size = PngSize(fd,&(im->xgif),&(im->ygif));
 	   break;
@@ -1844,6 +1856,51 @@ int lazy_check(image_desc_t *im){
     return size;
 }
 
+void
+pie_part(gfx_canvas_t *canvas, gfx_color_t color,
+	    double PieCenterX, double PieCenterY, double Radius,
+	    double startangle, double endangle)
+{
+    gfx_node_t *node;
+    double angle;
+    double step=M_PI/50; /* Number of iterations for the circle;
+			 ** 10 is definitely too low, more than
+			 ** 50 seems to be overkill
+			 */
+
+    /* Strange but true: we have to work clockwise or else
+    ** anti aliasing nor transparency don't work.
+    **
+    ** This test is here to make sure we do it right, also
+    ** this makes the for...next loop more easy to implement.
+    ** The return will occur if the user enters a negative number
+    ** (which shouldn't be done according to the specs) or if the
+    ** programmers do something wrong (which, as we all know, never
+    ** happens anyway :)
+    */
+    if (endangle<startangle) return;
+
+    /* Hidden feature: Radius decreases each full circle */
+    angle=startangle;
+    while (angle>=2*M_PI) {
+	angle  -= 2*M_PI;
+	Radius *= 0.8;
+    }
+
+    node=gfx_new_area(canvas,
+		PieCenterX+sin(startangle)*Radius,
+		PieCenterY-cos(startangle)*Radius,
+		PieCenterX,
+		PieCenterY,
+		PieCenterX+sin(endangle)*Radius,
+		PieCenterY-cos(endangle)*Radius,
+		color);
+    for (angle=endangle;angle-startangle>=step;angle-=step) {
+	gfx_add_point(node,
+		PieCenterX+sin(angle)*Radius,
+		PieCenterY-cos(angle)*Radius );
+    }
+}
 
 /* draw that picture thing ... */
 int
@@ -1852,7 +1909,7 @@ graph_paint(image_desc_t *im, char ***calcpr)
   int i,ii;
   int lazy =     lazy_check(im);
   int piechart = 0;
-  double PieStart=0.0, PieSize, PieCenterX, PieCenterY;
+  double PieStart=0.0, PieSize=0.0, PieCenterX=0.0, PieCenterY=0.0;
   FILE  *fo;
   gfx_canvas_t *canvas;
   gfx_node_t *node;
@@ -1973,42 +2030,52 @@ graph_paint(image_desc_t *im, char ***calcpr)
 			im->graph_col[GRC_CANVAS]);
   gfx_add_point(node,0,im->ygif);
 
-  node=gfx_new_line (canvas,
-		0,		im->ygif-100,
-		im->xgif-3,	im->ygif-100,
-		1.0,
-		0xFF0000FF);
-  gfx_add_point(node,im->xgif-3,im->ygif-3);
-  gfx_add_point(node,2,im->ygif-3);
-  gfx_add_point(node,2,im->ygif-100);
-
-
-#if 0
-  node=gfx_new_area ( canvas,
-			1,		im->ygif-99,
-			im->xgif-1,	im->ygif-99,
-			im->xgif-1,	im->ygif-1,
-			im->graph_col[GRC_CANVAS]);
-  gfx_add_point(node,1,im->ygif-1);
-#endif
-
+  /* Four areas:
+  ** top left:     current way, solid color
+  ** top right:    proper way,  solid color
+  ** bottom left:  current way, alpha=0x80, partially overlapping
+  ** bottom right: proper way,  alpha=0x80, partially overlapping
+  */
+  {
+    double x,y,x1,y1,x2,y2,x3,y3,x4,y4;
+
+    x=(im->xgif-40)/6;
+    y=     (100-40)/6;
+    x1=    20;   y1=im->ygif-100+20;
+    x2=3*x+20;   y2=im->ygif-100+20;
+    x3=  x+20;   y3=im->ygif-100+20+2*y;
+    x4=4*x+20;   y4=im->ygif-100+20+2*y;
+
+    node=gfx_new_area(canvas,
+			x1,y1,
+			x1+3*x,y1,
+			x1+3*x,y1+3*y,
+			0xFF0000FF);
+    gfx_add_point(node,x1,y1+3*y);
+    node=gfx_new_area(canvas,
+			x2,y2,
+			x2,y2+3*y,
+			x2+3*x,y2+3*y,
+			0xFFFF00FF);
+    gfx_add_point(node,x2+3*x,y2);
+    node=gfx_new_area(canvas,
+			x3,y3,
+			x3+2*x,y3,
+			x3+2*x,y3+3*y,
+			0x00FF007F);
+    gfx_add_point(node,x3,y3+3*y);
+    node=gfx_new_area(canvas,
+			x4,y4,
+			x4,y4+3*y,
+			x4+2*x,y4+3*y,
+			0x0000FF7F);
+    gfx_add_point(node,x4+2*x,y4);
+  }
+			
 #endif
 
   if (piechart) {
-	int n;
-
-	node=gfx_new_area(canvas,
-		PieCenterX,PieCenterY-PieSize*0.6,
-		PieCenterX,PieCenterY,
-		PieCenterX,PieCenterY-PieSize*0.6,
-		im->graph_col[GRC_CANVAS]);
-	for (n=1;n<500;n++) {
-		double angle;
-		angle=M_PI*2.0*n/500.0;
-		gfx_add_point(node,
-		PieCenterX+sin(angle)*PieSize*0.6,
-		PieCenterY-cos(angle)*PieSize*0.6 );
-	}
+    pie_part(canvas,im->graph_col[GRC_CANVAS],PieCenterX,PieCenterY,PieSize*0.6,0,2*M_PI);
   }
 
   if (im->minval > 0.0)
@@ -2143,25 +2210,10 @@ graph_paint(image_desc_t *im, char ***calcpr)
 	im->gdes[i].yrule = im->gdes[im->gdes[i].vidx].vf.val;
      
       if (finite(im->gdes[i].yrule)) {	/* even the fetched var can be NaN */
-	double angle,endangle;
-	int n;
-
-	angle=M_PI*2.0*PieStart/100.0;
-	endangle=M_PI*2.0*(PieStart+im->gdes[i].yrule)/100.0;
-	node=gfx_new_area(canvas,
-		PieCenterX+sin(endangle)*PieSize/2,
-		PieCenterY-cos(endangle)*PieSize/2,
-		PieCenterX,
-		PieCenterY,
-		PieCenterX+sin(angle)*PieSize/2,
-		PieCenterY-cos(angle)*PieSize/2,
-		im->gdes[i].col);
-	for (n=1;n<100;n++) {
-		angle=M_PI*2.0*(PieStart+n/100.0*im->gdes[i].yrule)/100.0;
-		gfx_add_point(node,
-		PieCenterX+sin(angle)*PieSize/2,
-		PieCenterY-cos(angle)*PieSize/2 );
-	}
+	pie_part(canvas,im->gdes[i].col,
+		PieCenterX,PieCenterY,PieSize/2,
+		M_PI*2.0*PieStart/100.0,
+		M_PI*2.0*(PieStart+im->gdes[i].yrule)/100.0);
 	PieStart += im->gdes[i].yrule;
       }
       break;
@@ -2215,8 +2267,6 @@ graph_paint(image_desc_t *im, char ***calcpr)
     }
   }
   switch (im->imgformat) {
-  case IF_GIF:
-    break;
   case IF_PNG:
     gfx_render_png (canvas,im->xgif,im->ygif,im->zoom,0x0,fo);
     break;
@@ -2388,7 +2438,7 @@ rrd_graph_init(image_desc_t *im)
     im->gdes_c = 0;
     im->gdes = NULL;
     im->zoom = 1.0;
-    im->imgformat = IF_GIF; /* we default to GIF output */
+    im->imgformat = IF_PNG; /* we default to PNG output */
 
     for(i=0;i<DIM(graph_col);i++)
         im->graph_col[i]=graph_col[i];