/****************************************************************************
- * RRDtool 1.0.33 Copyright Tobias Oetiker, 1997 - 2000
+ * RRDtool 1.1.x Copyright Tobias Oetiker, 1997 - 2002
****************************************************************************
* rrd__graph.c make creates ne rrds
****************************************************************************/
conv_if(DEF,GF_DEF)
conv_if(CDEF,GF_CDEF)
conv_if(VDEF,GF_VDEF)
+ conv_if(PART,GF_PART)
return (-1);
}
* further save step size and data source
* count of this rra
*/
- im->gdes[gdi].rpnp[rpi].data = im->gdes[ptr].data;
+ 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;
case GF_LINE:
case GF_AREA:
case GF_TICK:
+ case GF_PART:
case GF_STACK:
case GF_HRULE:
case GF_VRULE:
{
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) {
+ 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 */
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)
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: {
+ 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);
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;
};
}
break;
case 'n':{
- char *prop = "";
- double size = 1;
- char *font = "dummy";
-
- if(sscanf(optarg,
- "%10[A-Z]:%lf:%s",
- prop,&size,font) == 3){
- int sindex;
- if((sindex=text_prop_conv(prop)) != -1){
- im->text_prop[sindex].size=size;
- im->text_prop[sindex].font=font;
-
- } else {
- rrd_set_error("invalid color name '%s'",col_nam);
- }
- } else {
- rrd_set_error("invalid text property format");
- return;
- }
- break;
- }
+ /* originally this used char *prop = "" and
+ ** char *font = "dummy" however this results
+ ** in a SEG fault, at least on RH7.1
+ **
+ ** The current implementation isn't proper
+ ** either, font is never freed and prop uses
+ ** a fixed width string
+ */
+ char prop[100];
+ double size = 1;
+ char *font;
+
+ font=malloc(255);
+ if(sscanf(optarg,
+ "%10[A-Z]:%lf:%s",
+ prop,&size,font) == 3){
+ int sindex;
+ if((sindex=text_prop_conv(prop)) != -1){
+ im->text_prop[sindex].size=size;
+ im->text_prop[sindex].font=font;
+ if (sindex==0) { /* the default */
+ im->text_prop[TEXT_PROP_TITLE].size=size;
+ im->text_prop[TEXT_PROP_TITLE].font=font;
+ im->text_prop[TEXT_PROP_AXIS].size=size;
+ im->text_prop[TEXT_PROP_AXIS].font=font;
+ im->text_prop[TEXT_PROP_UNIT].size=size;
+ im->text_prop[TEXT_PROP_UNIT].font=font;
+ im->text_prop[TEXT_PROP_LEGEND].size=size;
+ im->text_prop[TEXT_PROP_LEGEND].font=font;
+ }
+ } else {
+ rrd_set_error("invalid fonttag '%s'",prop);
+ return;
+ }
+ } else {
+ rrd_set_error("invalid text property format");
+ return;
+ }
+ break;
+ }
case 'm':
im->zoom= atof(optarg);
if (im->zoom <= 0.0) {
/* 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;
projects / rrdtool.git / blobdiff