X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_graph.c;h=5f5ab2740a06d61f031f04e36c911be4657fc5ec;hp=0f6f588ebdf0a8fda09052587b97b5ab1762817a;hb=0fe03275068c0e55d01a7cc2308fa12fdee569cf;hpb=285da1fa16e80919db972b1d7021c0b4705bedb1 diff --git a/src/rrd_graph.c b/src/rrd_graph.c index 0f6f588..5f5ab27 100644 --- a/src/rrd_graph.c +++ b/src/rrd_graph.c @@ -174,14 +174,15 @@ 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); } -enum if_en if_conv(char *string){ +enum gfx_if_en if_conv(char *string){ - conv_if(GIF,IF_GIF) conv_if(PNG,IF_PNG) + conv_if(SVG,IF_SVG) return (-1); } @@ -247,6 +248,7 @@ im_free(image_desc_t *im) free (im->gdes[i].rpnp); } free(im->gdes); + gfx_destroy(im->canvas); return 0; } @@ -803,7 +805,7 @@ printf("DEBUG: value from vdef is %f\n",im->gdes[ptr].vf.val); * 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; @@ -815,6 +817,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"); @@ -937,6 +950,7 @@ data_proc( image_desc_t *im ){ case GF_DEF: case GF_CDEF: case GF_VDEF: + case GF_PART: break; } } @@ -1205,7 +1219,6 @@ print_calc(image_desc_t *im, char ***prdata) } } break; - case GF_COMMENT: case GF_LINE: case GF_AREA: case GF_TICK: @@ -1214,9 +1227,11 @@ print_calc(image_desc_t *im, char ***prdata) case GF_VRULE: graphelement = 1; break; + case GF_COMMENT: case GF_DEF: case GF_CDEF: case GF_VDEF: + case GF_PART: break; } } @@ -1234,7 +1249,7 @@ leg_place(image_desc_t *im) int border = im->text_prop[TEXT_PROP_LEGEND].size*2.0; int fill=0, fill_last; int leg_c = 0; - int leg_x = border, leg_y = im->ygif; + int leg_x = border, leg_y = im->yimg; int leg_cc; int glue = 0; int i,ii, mark = 0; @@ -1267,7 +1282,7 @@ leg_place(image_desc_t *im) leg_cc--; im->gdes[i].legend[leg_cc]='\0'; } - if (leg_cc != 0 ){ + if (leg_cc != 0 ){ legspace[i]=(prt_fctn=='g' ? 0 : interleg); if (fill > 0){ @@ -1278,7 +1293,8 @@ leg_place(image_desc_t *im) im->gdes[i].gf != GF_COMMENT) { fill += box; } - fill += gfx_get_text_width(fill+border,im->text_prop[TEXT_PROP_LEGEND].font, + fill += gfx_get_text_width(im->canvas, fill+border, + im->text_prop[TEXT_PROP_LEGEND].font, im->text_prop[TEXT_PROP_LEGEND].size, im->tabwidth, im->gdes[i].legend); @@ -1294,7 +1310,7 @@ leg_place(image_desc_t *im) if (i == im->gdes_c -1 ) prt_fctn ='l'; /* is it time to place the legends ? */ - if (fill > im->xgif - 2*border){ + if (fill > im->ximg - 2*border){ if (leg_c > 1) { /* go back one */ i--; @@ -1312,12 +1328,12 @@ leg_place(image_desc_t *im) if (prt_fctn != '\0'){ leg_x = border; if (leg_c >= 2 && prt_fctn == 'j') { - glue = (im->xgif - fill - 2* border) / (leg_c-1); + glue = (im->ximg - fill - 2* border) / (leg_c-1); } else { glue = 0; } - if (prt_fctn =='c') leg_x = (im->xgif - fill) / 2.0; - if (prt_fctn =='r') leg_x = im->xgif - fill - border; + if (prt_fctn =='c') leg_x = (im->ximg - fill) / 2.0; + if (prt_fctn =='r') leg_x = im->ximg - fill - border; for(ii=mark;ii<=i;ii++){ if(im->gdes[ii].legend[0]=='\0') @@ -1325,7 +1341,8 @@ leg_place(image_desc_t *im) im->gdes[ii].leg_x = leg_x; im->gdes[ii].leg_y = leg_y; leg_x += - gfx_get_text_width(leg_x,im->text_prop[TEXT_PROP_LEGEND].font, + gfx_get_text_width(im->canvas, leg_x, + im->text_prop[TEXT_PROP_LEGEND].font, im->text_prop[TEXT_PROP_LEGEND].size, im->tabwidth, im->gdes[ii].legend) @@ -1342,7 +1359,7 @@ leg_place(image_desc_t *im) mark = ii; } } - im->ygif = leg_y+6; + im->yimg = leg_y; free(legspace); } return 0; @@ -1357,7 +1374,7 @@ leg_place(image_desc_t *im) int -horizontal_grid(gfx_canvas_t *canvas, image_desc_t *im) +horizontal_grid(image_desc_t *im) { double range; double scaledrange; @@ -1366,7 +1383,7 @@ horizontal_grid(gfx_canvas_t *canvas, image_desc_t *im) double gridstep; double scaledstep; char graph_label[100]; - double x0,x1,y0,y1; + double X0,X1,Y0; int labfact,gridind; int decimals, fractionals; char labfmt[64]; @@ -1437,16 +1454,16 @@ horizontal_grid(gfx_canvas_t *canvas, image_desc_t *im) labfact = im->ylabfact; } - x0=im->xorigin; - x1=im->xorigin+im->xsize; + X0=im->xorigin; + X1=im->xorigin+im->xsize; sgrid = (int)( im->minval / gridstep - 1); egrid = (int)( im->maxval / gridstep + 1); scaledstep = gridstep/im->magfact; for (i = sgrid; i <= egrid; i++){ - y0=ytr(im,gridstep*i); - if ( y0 >= im->yorigin-im->ysize - && y0 <= im->yorigin){ + Y0=ytr(im,gridstep*i); + if ( Y0 >= im->yorigin-im->ysize + && Y0 <= im->yorigin){ if(i % labfact == 0){ if (i==0 || im->symbol == ' ') { if(scaledstep < 1){ @@ -1467,22 +1484,22 @@ horizontal_grid(gfx_canvas_t *canvas, image_desc_t *im) } } - gfx_new_text ( canvas, - x0-im->text_prop[TEXT_PROP_AXIS].size/1.5, y0, + gfx_new_text ( im->canvas, + X0-im->text_prop[TEXT_PROP_AXIS].size/1.5, Y0, im->graph_col[GRC_FONT], im->text_prop[TEXT_PROP_AXIS].font, im->text_prop[TEXT_PROP_AXIS].size, im->tabwidth, 0.0, GFX_H_RIGHT, GFX_V_CENTER, graph_label ); - gfx_new_line ( canvas, - x0-2,y0, - x1+2,y0, + gfx_new_line ( im->canvas, + X0-2,Y0, + X1+2,Y0, MGRIDWIDTH, im->graph_col[GRC_MGRID] ); } else { - gfx_new_line ( canvas, - x0-1,y0, - x1+1,y0, + gfx_new_line ( im->canvas, + X0-1,Y0, + X1+1,Y0, GRIDWIDTH, im->graph_col[GRC_GRID] ); } @@ -1493,13 +1510,13 @@ horizontal_grid(gfx_canvas_t *canvas, image_desc_t *im) /* logaritmic horizontal grid */ int -horizontal_log_grid(gfx_canvas_t *canvas, image_desc_t *im) +horizontal_log_grid(image_desc_t *im) { double pixpex; int ii,i; int minoridx=0, majoridx=0; char graph_label[100]; - double x0,x1,y0,y1; + double X0,X1,Y0; double value, pixperstep, minstep; /* find grid spaceing */ @@ -1522,8 +1539,8 @@ horizontal_log_grid(gfx_canvas_t *canvas, image_desc_t *im) if(pixperstep > 2 * im->text_prop[TEXT_PROP_LEGEND].size){majoridx = i;} } - x0=im->xorigin; - x1=im->xorigin+im->xsize; + X0=im->xorigin; + X1=im->xorigin+im->xsize; /* paint minor grid */ for (value = pow((double)10, log10(im->minval) - fmod(log10(im->minval),log10(yloglab[minoridx][0]))); @@ -1532,11 +1549,11 @@ horizontal_log_grid(gfx_canvas_t *canvas, image_desc_t *im) if (value < im->minval) continue; i=0; while(yloglab[minoridx][++i] > 0){ - y0 = ytr(im,value * yloglab[minoridx][i]); - if (y0 <= im->yorigin - im->ysize) break; - gfx_new_line ( canvas, - x0-1,y0, - x1+1,y0, + Y0 = ytr(im,value * yloglab[minoridx][i]); + if (Y0 <= im->yorigin - im->ysize) break; + gfx_new_line ( im->canvas, + X0-1,Y0, + X1+1,Y0, GRIDWIDTH, im->graph_col[GRC_GRID] ); } } @@ -1549,16 +1566,16 @@ horizontal_log_grid(gfx_canvas_t *canvas, image_desc_t *im) if (value < im->minval) continue; i=0; while(yloglab[majoridx][++i] > 0){ - y0 = ytr(im,value * yloglab[majoridx][i]); - if (y0 <= im->yorigin - im->ysize) break; - gfx_new_line ( canvas, - x0-2,y0, - x1+2,y0, + Y0 = ytr(im,value * yloglab[majoridx][i]); + if (Y0 <= im->yorigin - im->ysize) break; + gfx_new_line ( im->canvas, + X0-2,Y0, + X1+2,Y0, MGRIDWIDTH, im->graph_col[GRC_MGRID] ); sprintf(graph_label,"%3.0e",value * yloglab[majoridx][i]); - gfx_new_text ( canvas, - x0-im->text_prop[TEXT_PROP_AXIS].size/1.5, y0, + gfx_new_text ( im->canvas, + X0-im->text_prop[TEXT_PROP_AXIS].size/1.5, Y0, im->graph_col[GRC_FONT], im->text_prop[TEXT_PROP_AXIS].font, im->text_prop[TEXT_PROP_AXIS].size, @@ -1572,14 +1589,13 @@ horizontal_log_grid(gfx_canvas_t *canvas, image_desc_t *im) void vertical_grid( - gfx_canvas_t *canvas, image_desc_t *im ) { int xlab_sel; /* which sort of label and grid ? */ time_t ti, tilab; long factor; char graph_label[100]; - double x0,y0,y1; /* points for filled graph and more*/ + double X0,Y0,Y1; /* points for filled graph and more*/ /* the type of time grid is determined by finding @@ -1602,8 +1618,8 @@ vertical_grid( } /* y coords are the same for every line ... */ - y0 = im->yorigin; - y1 = im->yorigin-im->ysize; + Y0 = im->yorigin; + Y1 = im->yorigin-im->ysize; /* paint the minor grid */ @@ -1615,8 +1631,8 @@ vertical_grid( ){ /* are we inside the graph ? */ if (ti < im->start || ti > im->end) continue; - x0 = xtr(im,ti); - gfx_new_line(canvas,x0,y0+1, x0,y1-1,GRIDWIDTH, im->graph_col[GRC_GRID]); + X0 = xtr(im,ti); + gfx_new_line(im->canvas,X0,Y0+1, X0,Y1-1,GRIDWIDTH, im->graph_col[GRC_GRID]); } @@ -1629,8 +1645,8 @@ vertical_grid( ){ /* are we inside the graph ? */ if (ti < im->start || ti > im->end) continue; - x0 = xtr(im,ti); - gfx_new_line(canvas,x0,y0+2, x0,y1-2,MGRIDWIDTH, im->graph_col[GRC_MGRID]); + X0 = xtr(im,ti); + gfx_new_line(im->canvas,X0,Y0+2, X0,Y1-2,MGRIDWIDTH, im->graph_col[GRC_MGRID]); } /* paint the labels below the graph */ @@ -1641,14 +1657,16 @@ vertical_grid( ti = find_next_time(ti,im->xlab_user.labtm,im->xlab_user.labst) ){ tilab= ti + im->xlab_user.precis/2; /* correct time for the label */ + /* are we inside the graph ? */ + if (ti < im->start || ti > im->end) continue; #if HAVE_STRFTIME strftime(graph_label,99,im->xlab_user.stst,localtime(&tilab)); #else # error "your libc has no strftime I guess we'll abort the exercise here." #endif - gfx_new_text ( canvas, - xtr(im,tilab), y0+im->text_prop[TEXT_PROP_AXIS].size/1.5, + gfx_new_text ( im->canvas, + xtr(im,tilab), Y0+im->text_prop[TEXT_PROP_AXIS].size/1.5, im->graph_col[GRC_FONT], im->text_prop[TEXT_PROP_AXIS].font, im->text_prop[TEXT_PROP_AXIS].size, @@ -1662,33 +1680,32 @@ vertical_grid( void axis_paint( - image_desc_t *im, - gfx_canvas_t *canvas + image_desc_t *im ) { /* draw x and y axis */ - gfx_new_line ( canvas, im->xorigin+im->xsize,im->yorigin, + gfx_new_line ( im->canvas, im->xorigin+im->xsize,im->yorigin, im->xorigin+im->xsize,im->yorigin-im->ysize, GRIDWIDTH, im->graph_col[GRC_GRID]); - gfx_new_line ( canvas, im->xorigin,im->yorigin-im->ysize, + gfx_new_line ( im->canvas, im->xorigin,im->yorigin-im->ysize, im->xorigin+im->xsize,im->yorigin-im->ysize, GRIDWIDTH, im->graph_col[GRC_GRID]); - gfx_new_line ( canvas, im->xorigin-4,im->yorigin, + gfx_new_line ( im->canvas, im->xorigin-4,im->yorigin, im->xorigin+im->xsize+4,im->yorigin, MGRIDWIDTH, im->graph_col[GRC_GRID]); - gfx_new_line ( canvas, im->xorigin,im->yorigin+4, + gfx_new_line ( im->canvas, im->xorigin,im->yorigin+4, im->xorigin,im->yorigin-im->ysize-4, MGRIDWIDTH, im->graph_col[GRC_GRID]); /* arrow for X axis direction */ - gfx_new_area ( canvas, - im->xorigin+im->xsize+4, im->yorigin-3, - im->xorigin+im->xsize+4, im->yorigin+3, - im->xorigin+im->xsize+9, im->yorigin, + gfx_new_area ( im->canvas, + im->xorigin+im->xsize+3, im->yorigin-3, + im->xorigin+im->xsize+3, im->yorigin+4, + im->xorigin+im->xsize+8, im->yorigin+0.5, /* LINEOFFSET */ im->graph_col[GRC_ARROW]); @@ -1696,47 +1713,46 @@ axis_paint( } void -grid_paint( - image_desc_t *im, - gfx_canvas_t *canvas - - ) +grid_paint(image_desc_t *im) { long i; - int boxH=8, boxV=8; int res=0; - double x0,x1,x2,x3,y0,y1,y2,y3; /* points for filled graph and more*/ + double X0,Y0; /* points for filled graph and more*/ gfx_node_t *node; - /* draw 3d border */ - node = gfx_new_area (canvas, 0,im->ygif, 0,0, im->xgif, 0,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 ); + node = gfx_new_area (im->canvas, 0,im->yimg, + 2,im->yimg-2, + 2,2,im->graph_col[GRC_SHADEA]); + gfx_add_point( node , im->ximg - 2, 2 ); + gfx_add_point( node , im->ximg, 0 ); + gfx_add_point( node , 0,0 ); +/* gfx_add_point( node , 0,im->yimg ); */ - 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 (im->canvas, 2,im->yimg-2, + im->ximg-2,im->yimg-2, + im->ximg - 2, 2, + im->graph_col[GRC_SHADEB]); + gfx_add_point( node , im->ximg,0); + gfx_add_point( node , im->ximg,im->yimg); + gfx_add_point( node , 0,im->yimg); +/* gfx_add_point( node , 0,im->yimg ); */ if (im->draw_x_grid == 1 ) - vertical_grid(canvas, im); + vertical_grid(im); if (im->draw_y_grid == 1){ if(im->logarithmic){ - res = horizontal_log_grid(canvas,im); + res = horizontal_log_grid(im); } else { - res = horizontal_grid(canvas,im); + res = horizontal_grid(im); } /* dont draw horizontal grid if there is no min and max val */ if (! res ) { char *nodata = "No Data found"; - gfx_new_text(canvas,im->xgif/2, (2*im->yorigin-im->ysize) / 2, + gfx_new_text(im->canvas,im->ximg/2, (2*im->yorigin-im->ysize) / 2, im->graph_col[GRC_FONT], im->text_prop[TEXT_PROP_AXIS].font, im->text_prop[TEXT_PROP_AXIS].size, @@ -1746,68 +1762,85 @@ grid_paint( } /* yaxis description */ - gfx_new_text( canvas, - 7, (im->yorigin - im->ysize/2), - im->graph_col[GRC_FONT], - im->text_prop[TEXT_PROP_AXIS].font, - im->text_prop[TEXT_PROP_AXIS].size, im->tabwidth, 270.0, - GFX_H_CENTER, GFX_V_CENTER, - im->ylegend); + if (im->canvas->imgformat != IF_PNG) { + gfx_new_text( im->canvas, + 7, (im->yorigin - im->ysize/2), + im->graph_col[GRC_FONT], + im->text_prop[TEXT_PROP_AXIS].font, + im->text_prop[TEXT_PROP_AXIS].size, im->tabwidth, 270.0, + GFX_H_CENTER, GFX_V_CENTER, + im->ylegend); + } else { + /* horrible hack until we can actually print vertically */ + { + int n; + int l=strlen(im->ylegend); + char s[2]; + for (n=0;nylegend);n++) { + s[0]=im->ylegend[n]; + s[1]='\0'; + gfx_new_text(im->canvas,7,im->text_prop[TEXT_PROP_AXIS].size*(l-n), + im->graph_col[GRC_FONT], + im->text_prop[TEXT_PROP_AXIS].font, + im->text_prop[TEXT_PROP_AXIS].size, im->tabwidth, 270.0, + GFX_H_CENTER, GFX_V_CENTER, + s); + } + } + } /* graph title */ - gfx_new_text( canvas, - im->xgif/2, im->text_prop[TEXT_PROP_TITLE].size*1.5, + gfx_new_text( im->canvas, + im->ximg/2, im->text_prop[TEXT_PROP_TITLE].size, 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); - /* graph labels */ - if( !(im->extra_flags & NOLEGEND) ) { + /* graph labels */ + if( !(im->extra_flags & NOLEGEND) ) { for(i=0;igdes_c;i++){ - if(im->gdes[i].legend[0] =='\0') - continue; + if(im->gdes[i].legend[0] =='\0') + continue; - 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; - x2 = x0+boxH; - x3 = x0; - y1 = y0; - y2 = y0+boxV; - y3 = y0+boxV; - 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 ); - 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 ); - gfx_add_point ( node, x0, y0 ); - - gfx_new_text ( canvas, x0+boxH+6, (y0+y2) / 2.0, - im->graph_col[GRC_FONT], - im->text_prop[TEXT_PROP_AXIS].font, - im->text_prop[TEXT_PROP_AXIS].size, - im->tabwidth,0.0, GFX_H_LEFT, GFX_V_CENTER, - im->gdes[i].legend ); - - } else { - x0 = im->gdes[i].leg_x; - y0 = im->gdes[i].leg_y; - - gfx_new_text ( canvas, x0, (y0+y2) / 2.0, - im->graph_col[GRC_FONT], - im->text_prop[TEXT_PROP_AXIS].font, - im->text_prop[TEXT_PROP_AXIS].size, - im->tabwidth,0.0, GFX_H_LEFT, GFX_V_BOTTOM, - im->gdes[i].legend ); - - } - } - } -} + /* im->gdes[i].leg_y is the bottom of the legend */ + X0 = im->gdes[i].leg_x; + Y0 = im->gdes[i].leg_y; + /* Box needed? */ + if ( im->gdes[i].gf != GF_GPRINT + && im->gdes[i].gf != GF_COMMENT) { + int boxH, boxV; + + boxH = gfx_get_text_width(im->canvas, 0, + im->text_prop[TEXT_PROP_AXIS].font, + im->text_prop[TEXT_PROP_AXIS].size, + im->tabwidth,"M") * 1.25; + boxV = boxH; + + node = gfx_new_area(im->canvas, + X0,Y0-boxV, + X0,Y0, + X0+boxH,Y0, + im->gdes[i].col); + gfx_add_point ( node, X0+boxH, Y0-boxV ); + node = gfx_new_line(im->canvas, + X0,Y0-boxV, X0,Y0, + 1,0x000000FF); + gfx_add_point(node,X0+boxH,Y0); + gfx_add_point(node,X0+boxH,Y0-boxV); + gfx_close_path(node); + X0 += boxH / 1.25 * 2; + } + gfx_new_text ( im->canvas, X0, Y0, + im->graph_col[GRC_FONT], + im->text_prop[TEXT_PROP_AXIS].font, + im->text_prop[TEXT_PROP_AXIS].size, + im->tabwidth,0.0, GFX_H_LEFT, GFX_V_BOTTOM, + im->gdes[i].legend ); + } + } + } /***************************************************** @@ -1817,30 +1850,222 @@ grid_paint( int lazy_check(image_desc_t *im){ FILE *fd = NULL; int size = 1; - struct stat gifstat; + struct stat imgstat; if (im->lazy == 0) return 0; /* no lazy option */ - if (stat(im->graphfile,&gifstat) != 0) + if (stat(im->graphfile,&imgstat) != 0) return 0; /* can't stat */ /* one pixel in the existing graph is more then what we would change here ... */ - if (time(NULL) - gifstat.st_mtime > + if (time(NULL) - imgstat.st_mtime > (im->end - im->start) / im->xsize) return 0; 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; + switch (im->canvas->imgformat) { case IF_PNG: - size = PngSize(fd,&(im->xgif),&(im->ygif)); + size = PngSize(fd,&(im->ximg),&(im->yimg)); break; + default: + size = 1; } fclose(fd); return size; } +void +pie_part(image_desc_t *im, 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