conv_if(DEF,GF_DEF)
conv_if(CDEF,GF_CDEF)
conv_if(VDEF,GF_VDEF)
+ conv_if(PART,GF_PART)
return (-1);
}
case GF_DEF:
case GF_CDEF:
case GF_VDEF:
+ case GF_PART:
break;
}
}
case GF_LINE:
case GF_AREA:
case GF_TICK:
+ case GF_PART:
case GF_STACK:
case GF_HRULE:
case GF_VRULE:
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,
{
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;
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) {
+ /* allocate enough space for the piechart itself (PieSize), 20%
+ ** more for the background and an additional 50 pixels spacing.
+ */
+ if (im->xsize < im->ysize)
+ PieSize = im->xsize;
+ else
+ PieSize = im->ysize;
+ im->xgif += PieSize*1.2 + 50;
+
+ PieCenterX = im->xorigin + im->xsize + 50 + PieSize*0.6;
+ PieCenterY = im->yorigin - PieSize*0.5;
+ }
/* determine where to place the legends onto the graphics.
and set im->ygif to match space requirements for text */
gfx_add_point(node,im->xorigin, im->yorigin - im->ysize);
-
+ if (piechart) {
+#if 1
+ node=gfx_arc_sect (canvas,
+ PieCenterX,PieCenterY,
+ PieSize*0.6, PieSize*0.6, /* 20% more as background */
+ 0,M_PI*2,
+ im->graph_col[GRC_CANVAS]);
+#else
+ node=gfx_new_area ( canvas,
+ PieCenterX-0.6*PieSize, PieCenterY-0.6*PieSize,
+ PieCenterX+0.6*PieSize, PieCenterY-0.6*PieSize,
+ PieCenterX+0.6*PieSize, PieCenterY+0.6*PieSize,
+ im->graph_col[GRC_CANVAS]);
+ gfx_add_point(node,
+ PieCenterX-0.6*PieSize, PieCenterY+0.6*PieSize);
+#endif
+ }
+
if (im->minval > 0.0)
areazero = im->minval;
if (im->maxval < 0.0)
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:
}
lastgdes = &(im->gdes[i]);
break;
+ case GF_PART:
+ 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)) { /* even the fetched var can be NaN */
+ node=gfx_arc_sect(canvas,
+ PieCenterX, PieCenterY,
+ PieSize/2,PieSize/2,
+ M_PI*2.0*PieStart/100.0,
+ M_PI*2.0*(PieStart+im->gdes[i].yrule)/100.0,
+ im->gdes[i].col);
+ PieStart += im->gdes[i].yrule;
+ }
+ break;
} /* switch */
}
grid_paint(im,canvas);
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;
};
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 */
/* 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
*/
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;