Pie chart support added to rrdtool graph

git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk@88 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/program/doc/rrdgraph_graph.src b/program/doc/rrdgraph_graph.src
index 46a5152c1e7ea7b3d6ac4347fd0fe988d5215186..732e03b1d39cc0c54c39d4ad0b3dd12a82ab3423 100644 (file)
--- a/program/doc/rrdgraph_graph.src
+++ b/program/doc/rrdgraph_graph.src
@@ -17,11 +17,11 @@ I<(soon) available commands>
 [B<VRULE:>I<vname>B<#>I<rrggbbaa>[B<:>I<legend>]]
 [B<LINE>{I<width>}B<:>I<vname>[B<#>I<rrggbbaa>[B<:>I<legend>]]][B<:STACK>]
 [B<AREA:>I<vname>[B<#>I<rrggbbaa>[B<:>I<legend>]]][B<:STACK>]
+[B<PART:>I<vname>B<#>I<rrggbbaa>[B<:>I<legend>]]
 
 I<to be implemented commands>
 
 [B<SHIFT:>I<vname>]
-[B<PART:>I<vname>B<#>I<rrggbbaa>[B<:>I<legend>]]
 
 =head1 DESCRIPTION
 
@@ -190,6 +190,19 @@ graph this stacked variable anyway you need to make sure that the
 B<LINEx> or B<AREA> it gets stacked on is not unknown. Use a CDEF
 instruction with B<IF> and B<UN> to do so.
 
+B<PART:>I<vname>B<#>I<rrggbbaa>[B<:>I<legend>]
+
+B<RRDtool> has now support for B<pie charts>. If you include the
+B<PART> command, the canvas is extended to make room for a chart
+The size of the canvas is determined by the lesser of
+L<width and height|rrdgraph/item_Size>.
+
+Pie parts will be concatenated, the first one will start at the
+top and parts will be created clockwise.  The size of the part
+is defined by the value part of the L<VDEF|rrdgraph_data/VDEF>
+function.  It should return a number between 0 and 100, being a
+percentage.  Providing wrong input will produce undefined results.
+
 B<THE NEXT STUFF IS NOT YET IMPLEMENTED>
 
 B<SHIFT:>I<offset in seconds>
@@ -203,19 +216,4 @@ can have an offset of zero to restore normal graphing.
 As with the other grapher elements, you can specify a number or
 a variable here.
 
-B<RRDtool> has now support for B<pie charts>. If you include the
-B<PART> command, the canvas is extended to make room for a chart
-(or, if no other graph elements are used, the canvas is solely
-used for the pie chart). The size of the canvas is determined by
-the lesser of L<width and height|rrdgraph/item_Size>.
-
-B<PART:>I<vname>B<#>I<rrggbbaa>[B<:>I<legend>]
-
-Draw a part of pie. Pie parts will be concatenated, the first one
-will start at the top and parts will be created clockwise.
-The size of the part is defined by the value part of
-the L<VDEF|rrdgraph_data/VDEF> function.  It should return
-a number between 0 and 100, being a percentage.
-Providing wrong input will produce undefined results.
-
 =include see_also

diff --git a/program/src/rrd_graph.c b/program/src/rrd_graph.c
index 5597c496b6a53cf2584a49527ba8445dcdd70e6c..abbfcdb020c36218b47a0372cced40d7c95a6ce3 100644 (file)
--- a/program/src/rrd_graph.c
+++ b/program/src/rrd_graph.c
@@ -174,6 +174,7 @@ enum gf_en gf_conv(char *string){
     conv_if(DEF,GF_DEF)
     conv_if(CDEF,GF_CDEF)
     conv_if(VDEF,GF_VDEF)
+    conv_if(PART,GF_PART)
     
     return (-1);
 }
@@ -1209,6 +1210,7 @@ print_calc(image_desc_t *im, char ***prdata)
        case GF_LINE:
        case GF_AREA:
        case GF_TICK:
+       case GF_PART:
        case GF_STACK:
        case GF_HRULE:
        case GF_VRULE:
@@ -1324,9 +1326,6 @@ leg_place(image_desc_t *im)
                    continue;
                im->gdes[ii].leg_x = leg_x;
                im->gdes[ii].leg_y = leg_y;
-printf("DEBUG: using font %s with width %lf\n",
-       im->text_prop[TEXT_PROP_LEGEND].font,
-       im->text_prop[TEXT_PROP_LEGEND].size);
                leg_x += 
                 gfx_get_text_width(leg_x,im->text_prop[TEXT_PROP_LEGEND].font,
                                      im->text_prop[TEXT_PROP_LEGEND].size,
@@ -1851,6 +1850,8 @@ graph_paint(image_desc_t *im, char ***calcpr)
 {
   int i,ii;
   int lazy =     lazy_check(im);
+  int piechart = 0, PieSize, PieCenterX, PieCenterY;
+  double PieStart=0.0;
   FILE  *fo;
   gfx_canvas_t *canvas;
   gfx_node_t *node;
@@ -1907,8 +1908,27 @@ graph_paint(image_desc_t *im, char ***calcpr)
   if(im->title[0] != '\0')
     im->yorigin += im->text_prop[TEXT_PROP_TITLE].size*3+4;
   
-  im->xgif=20+im->xsize + im->xorigin;
+  im->xgif= 20 +im->xsize + im->xorigin;
   im->ygif= im->yorigin+2* im->text_prop[TEXT_PROP_LEGEND].size;
+
+  /* check if we need to draw a piechart */
+  for(i=0;i<im->gdes_c;i++){
+    if (im->gdes[i].gf == GF_PART) {
+      piechart=1;
+      break;
+    }
+  }
+
+  if (piechart) {
+    if (im->xsize < im->ysize)
+       PieSize = im->xsize;
+    else
+       PieSize = im->ysize;
+    im->xgif += PieSize + 50;
+
+    PieCenterX = im->xorigin + im->xsize + 50 + PieSize/2;
+    PieCenterY = im->yorigin - PieSize/2;
+  }
   
   /* determine where to place the legends onto the graphics.
      and set im->ygif to match space requirements for text */
@@ -1936,7 +1956,15 @@ graph_paint(image_desc_t *im, char ***calcpr)
   
   gfx_add_point(node,im->xorigin, im->yorigin - im->ysize);
 
-  
+  if (piechart) {
+    node=gfx_new_area ( canvas,
+               im->xorigin + im->xsize + 50,           im->yorigin,
+               im->xorigin + im->xsize + 50 + PieSize, im->yorigin,
+               im->xorigin + im->xsize + 50 + PieSize, im->yorigin - PieSize,
+               im->graph_col[GRC_CANVAS]);
+    gfx_add_point(node,im->xorigin+im->xsize+50, im->yorigin - PieSize);
+  }
+
   if (im->minval > 0.0)
     areazero = im->minval;
   if (im->maxval < 0.0)
@@ -1945,7 +1973,7 @@ graph_paint(image_desc_t *im, char ***calcpr)
   axis_paint(im,canvas);
 
 
-  for(i=0;i<im->gdes_c;i++){    
+  for(i=0;i<im->gdes_c;i++){
     switch(im->gdes[i].gf){
     case GF_CDEF:
     case GF_VDEF:
@@ -2064,6 +2092,48 @@ graph_paint(image_desc_t *im, char ***calcpr)
       } 
       lastgdes = &(im->gdes[i]);                         
       break;
+    case GF_PART: {
+      int x,y , counter;
+      double d1,d2,d3,d4;
+
+      /* This probably is not the most efficient algorithm...
+      ** If you know how to help, please do!
+      **
+      ** If you change this routine be aware that I optimized
+      ** the following algorithm:
+      **
+      ** Full circle == 100
+      **    relative X-position is sin(2*pi * position/100)
+      **    relative Y-position is cos(2*pi * position/100)
+      **
+      ** Position is incremented from start to end in a number
+      ** of steps.  This number of steps corresponds with the
+      ** size of the pie canvas, each step being 1/PieSize.
+      */
+
+      if(isnan(im->gdes[i].yrule)) /* fetch variable */
+       im->gdes[i].yrule = im->gdes[im->gdes[i].vidx].vf.val;
+     
+      if (finite(im->gdes[i].yrule)) {
+       d1 = 2 * M_PI / 100;
+       d2 = im->gdes[i].yrule / PieSize;
+       d3 = PieSize/2;
+
+       for (counter=0;counter<=PieSize;counter++) {
+         d4 = d1 * (PieStart + d2 * counter);
+         x=sin(d4) * d3;
+         y=cos(d4) * d3;
+
+         gfx_new_line(canvas,
+           PieCenterX,PieCenterY ,
+           PieCenterX+x,PieCenterY-y,
+           1.0,
+           im->gdes[i].col);
+        }
+        PieStart += im->gdes[i].yrule;
+      }
+      break;
+      } /* GF_PART */
     } /* switch */
   }
   grid_paint(im,canvas);
@@ -2073,7 +2143,6 @@ graph_paint(image_desc_t *im, char ***calcpr)
     
     switch(im->gdes[i].gf){
     case GF_HRULE:
-      printf("DEBUG: HRULE at %f\n",im->gdes[i].yrule);
       if(isnan(im->gdes[i].yrule)) { /* fetch variable */
         im->gdes[i].yrule = im->gdes[im->gdes[i].vidx].vf.val;
       };
@@ -2532,8 +2601,6 @@ rrd_graph_options(int argc, char *argv[],image_desc_t *im)
                                prop,&size,font) == 3){
                int sindex;
                if((sindex=text_prop_conv(prop)) != -1){
-printf("DEBUG: setting all to the default of font %s with width %lf\n",
-font,size);
                    im->text_prop[sindex].size=size;              
                    im->text_prop[sindex].font=font;
                    if (sindex==0) { /* the default */
@@ -2636,7 +2703,7 @@ rrd_graph_script(int argc, char *argv[], image_desc_t *im)
        /* function:newvname=string[:ds-name:CF]        for xDEF
        ** function:vname[#color[:string]]              for LINEx,AREA,STACK
        ** function:vname#color[:num[:string]]          for TICK
-       ** function:vname-or-num#color[:string]         for xRULE
+       ** function:vname-or-num#color[:string]         for xRULE,PART
        ** function:vname:CF:string                     for xPRINT
        ** function:string                              for COMMENT
        */
@@ -2665,6 +2732,7 @@ rrd_graph_script(int argc, char *argv[], image_desc_t *im)
                if (rrd_graph_legend(gdp,&line[argstart])==0)
                    rrd_set_error("Cannot parse comment in line: %s",line);
                break;
+           case GF_PART:
            case GF_VRULE:
            case GF_HRULE:
                j=k=l=m=0;

diff --git a/program/src/rrd_graph.h b/program/src/rrd_graph.h
index 2854ed6331391575b1b7dc7b033418898b48f13f..e127179a4897f4e8108103a16f51f3bddb5df606 100644 (file)
--- a/program/src/rrd_graph.h
+++ b/program/src/rrd_graph.h
@@ -22,7 +22,8 @@ enum grc_en {GRC_CANVAS=0,GRC_BACK,GRC_SHADEA,GRC_SHADEB,
 
 enum gf_en {GF_PRINT=0,GF_GPRINT,GF_COMMENT,GF_HRULE,GF_VRULE,GF_LINE,
            GF_AREA,GF_STACK,GF_TICK,
-           GF_DEF, GF_CDEF, GF_VDEF};
+           GF_DEF, GF_CDEF, GF_VDEF,
+           GF_PART};
 
 enum if_en {IF_GIF=0,IF_PNG=1};