X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_graph.c;h=67fce90cb304134558c3ffb80c348ad71323d852;hp=85984b3e46adcf0d63615256387636ea2d567a6a;hb=aa4b49144558b7683f39bc7e803d69427ff3993e;hpb=b13e83720c268c2624b9bd7a8e09a0355366c0cc diff --git a/src/rrd_graph.c b/src/rrd_graph.c index 85984b3..67fce90 100644 --- a/src/rrd_graph.c +++ b/src/rrd_graph.c @@ -1,7 +1,7 @@ /**************************************************************************** - * RRDtool 1.1.x Copyright Tobias Oetiker, 1997 - 2002 + * RRDtool 1.2rc5 Copyright by Tobi Oetiker, 1997-2005 **************************************************************************** - * rrd__graph.c make creates ne rrds + * rrd__graph.c produce graphs from data in rrdfiles ****************************************************************************/ @@ -9,7 +9,7 @@ #include "rrd_tool.h" -#ifdef WIN32 +#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) #include #include #endif @@ -27,24 +27,18 @@ /* some constant definitions */ -#ifdef WIN32 -char rrd_win_default_font[80]; -#endif #ifndef RRD_DEFAULT_FONT -#ifndef WIN32 +/* there is special code later to pick Cour.ttf when running on windows */ #define RRD_DEFAULT_FONT "VeraMono.ttf" -/* #define RRD_DEFAULT_FONT "/usr/share/fonts/truetype/openoffice/ariosor.ttf" */ -/* #define RRD_DEFAULT_FONT "/usr/share/fonts/truetype/Arial.ttf" */ -#endif #endif text_prop_t text_prop[] = { - { 10.0, RRD_DEFAULT_FONT }, /* default */ - { 10.0, RRD_DEFAULT_FONT }, /* title */ - { 8.0, RRD_DEFAULT_FONT }, /* axis */ - { 10.0, RRD_DEFAULT_FONT }, /* unit */ - { 10.0, RRD_DEFAULT_FONT } /* legend */ + { 9.0, RRD_DEFAULT_FONT }, /* default */ + { 11.0, RRD_DEFAULT_FONT }, /* title */ + { 8.0, RRD_DEFAULT_FONT }, /* axis */ + { 9.0, RRD_DEFAULT_FONT }, /* unit */ + { 9.0, RRD_DEFAULT_FONT } /* legend */ }; xlab_t xlab[] = { @@ -102,11 +96,11 @@ gfx_color_t graph_col[] = /* default colors */ 0xF0F0F0FF, /* background */ 0xD0D0D0FF, /* shade A */ 0xA0A0A0FF, /* shade B */ - 0x909090FF, /* grid */ - 0xE05050FF, /* major grid */ + 0x90909080, /* grid */ + 0xE0505080, /* major grid */ 0x000000FF, /* font */ - 0x000000FF, /* frame */ - 0xFF0000FF /* arrow */ + 0xFF0000FF, /* arrow */ + 0x404040FF /* axis */ }; @@ -186,7 +180,9 @@ enum gf_en gf_conv(char *string){ conv_if(DEF,GF_DEF) conv_if(CDEF,GF_CDEF) conv_if(VDEF,GF_VDEF) +#ifdef WITH_PIECHART conv_if(PART,GF_PART) +#endif conv_if(XPORT,GF_XPORT) conv_if(SHIFT,GF_SHIFT) @@ -224,8 +220,8 @@ enum grc_en grc_conv(char *string){ conv_if(GRID,GRC_GRID) conv_if(MGRID,GRC_MGRID) conv_if(FONT,GRC_FONT) - conv_if(FRAME,GRC_FRAME) conv_if(ARROW,GRC_ARROW) + conv_if(AXIS,GRC_AXIS) return -1; } @@ -1322,7 +1318,7 @@ print_calc(image_desc_t *im, char ***prdata) (*prdata)[prlines-2] = malloc((FMT_LEG_LEN+2)*sizeof(char)); (*prdata)[prlines-1] = NULL; if (bad_format(im->gdes[i].format)) { - rrd_set_error("bad format for [G]PRINT in '%s'", im->gdes[i].format); + rrd_set_error("bad format for PRINT in '%s'", im->gdes[i].format); return -1; } #ifdef HAVE_SNPRINTF @@ -1334,7 +1330,7 @@ print_calc(image_desc_t *im, char ***prdata) /* GF_GPRINT */ if (bad_format(im->gdes[i].format)) { - rrd_set_error("bad format for [G]PRINT in '%s'", im->gdes[i].format); + rrd_set_error("bad format for GPRINT in '%s'", im->gdes[i].format); return -1; } #ifdef HAVE_SNPRINTF @@ -1358,7 +1354,9 @@ print_calc(image_desc_t *im, char ***prdata) case GF_DEF: case GF_CDEF: case GF_VDEF: +#ifdef WITH_PIECHART case GF_PART: +#endif case GF_SHIFT: case GF_XPORT: break; @@ -1374,7 +1372,6 @@ leg_place(image_desc_t *im) { /* graph labels */ int interleg = im->text_prop[TEXT_PROP_LEGEND].size*2.0; - int box =im->text_prop[TEXT_PROP_LEGEND].size*1.5; int border = im->text_prop[TEXT_PROP_LEGEND].size*2.0; int fill=0, fill_last; int leg_c = 0; @@ -1409,7 +1406,8 @@ leg_place(image_desc_t *im) leg_cc = strlen(im->gdes[i].legend); /* is there a controle code ant the end of the legend string ? */ - if (leg_cc >= 2 && im->gdes[i].legend[leg_cc-2] == '\\') { + /* and it is not a tab \\t */ + if (leg_cc >= 2 && im->gdes[i].legend[leg_cc-2] == '\\' && im->gdes[i].legend[leg_cc-1] != 't') { prt_fctn = im->gdes[i].legend[leg_cc-1]; leg_cc -= 2; im->gdes[i].legend[leg_cc] = '\0'; @@ -1430,10 +1428,6 @@ leg_place(image_desc_t *im) /* no interleg space if string ends in \g */ fill += legspace[i]; } - if (im->gdes[i].gf != GF_GPRINT && - im->gdes[i].gf != GF_COMMENT) { - fill += box; - } fill += gfx_get_text_width(im->canvas, fill+border, im->text_prop[TEXT_PROP_LEGEND].font, im->text_prop[TEXT_PROP_LEGEND].size, @@ -1466,7 +1460,7 @@ leg_place(image_desc_t *im) } - if (prt_fctn != '\0'){ + if (prt_fctn != '\0'){ leg_x = border; if (leg_c >= 2 && prt_fctn == 'j') { glue = (im->ximg - fill - 2* border) / (leg_c-1); @@ -1478,7 +1472,7 @@ leg_place(image_desc_t *im) for(ii=mark;ii<=i;ii++){ if(im->gdes[ii].legend[0]=='\0') - continue; + continue; /* skip empty legends */ im->gdes[ii].leg_x = leg_x; im->gdes[ii].leg_y = leg_y; leg_x += @@ -1489,12 +1483,9 @@ leg_place(image_desc_t *im) im->gdes[ii].legend, 0) + legspace[ii] + glue; - if (im->gdes[ii].gf != GF_GPRINT && - im->gdes[ii].gf != GF_COMMENT) - leg_x += box; - } - leg_y = leg_y + im->text_prop[TEXT_PROP_LEGEND].size*1.2; - if (prt_fctn == 's') leg_y -= im->text_prop[TEXT_PROP_LEGEND].size*1.2; + } + leg_y += im->text_prop[TEXT_PROP_LEGEND].size*1.7; + if (prt_fctn == 's') leg_y -= im->text_prop[TEXT_PROP_LEGEND].size; fill = 0; leg_c = 0; mark = ii; @@ -1811,15 +1802,15 @@ vertical_grid( } /* paint the labels below the graph */ - for(ti = find_first_time(im->start, + for(ti = find_first_time(im->start - im->xlab_user.precis/2, im->xlab_user.labtm, im->xlab_user.labst); - ti <= im->end; + ti <= im->end - im->xlab_user.precis/2; 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 (tilab < im->start || tilab > im->end) continue; #if HAVE_STRFTIME localtime_r(&tilab, &tm); @@ -1846,21 +1837,21 @@ axis_paint( ) { /* draw x and y axis */ - gfx_new_line ( im->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]); + GRIDWIDTH, im->graph_col[GRC_AXIS]); 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]); + GRIDWIDTH, im->graph_col[GRC_AXIS]); */ gfx_new_line ( im->canvas, im->xorigin-4,im->yorigin, im->xorigin+im->xsize+4,im->yorigin, - MGRIDWIDTH, im->graph_col[GRC_GRID]); + MGRIDWIDTH, im->graph_col[GRC_AXIS]); gfx_new_line ( im->canvas, im->xorigin,im->yorigin+4, im->xorigin,im->yorigin-im->ysize-4, - MGRIDWIDTH, im->graph_col[GRC_GRID]); + MGRIDWIDTH, im->graph_col[GRC_AXIS]); /* arrow for X axis direction */ @@ -1869,9 +1860,7 @@ axis_paint( im->xorigin+im->xsize+3, im->yorigin+4, im->xorigin+im->xsize+8, im->yorigin+0.5, /* LINEOFFSET */ im->graph_col[GRC_ARROW]); - - - + } void @@ -1923,87 +1912,77 @@ grid_paint(image_desc_t *im) } } - /* yaxis description */ -/* if (im->canvas->imgformat != IF_PNG) {*/ - if (1) { - 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, - RRDGRAPH_YLEGEND_ANGLE, - GFX_H_LEFT, GFX_V_CENTER, - im->ylegend); - } else { - /* horrible hack until we can actually print vertically */ - { - int n; - char s[2]; - for (n=0;n< (int)strlen(im->ylegend);n++) { - s[0]=im->ylegend[n]; - s[1]='\0'; - gfx_new_text(im->canvas,7,im->text_prop[TEXT_PROP_AXIS].size*(n+1), - 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); - } - } - } - + /* yaxis unit description */ + gfx_new_text( im->canvas, + 7, (im->yorigin - im->ysize/2), + im->graph_col[GRC_FONT], + im->text_prop[TEXT_PROP_UNIT].font, + im->text_prop[TEXT_PROP_UNIT].size, im->tabwidth, + RRDGRAPH_YLEGEND_ANGLE, + GFX_H_LEFT, GFX_V_CENTER, + im->ylegend); + /* graph title */ gfx_new_text( im->canvas, - im->ximg/2, im->text_prop[TEXT_PROP_TITLE].size, + im->ximg/2, im->text_prop[TEXT_PROP_TITLE].size*1.2, 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) & !(im->extra_flags & ONLY_GRAPH) ) { - for(i=0;igdes_c;i++){ - if(im->gdes[i].legend[0] =='\0') - continue; - - /* 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", 0) * 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, + for(i=0;igdes_c;i++){ + if(im->gdes[i].legend[0] =='\0') + continue; + + /* im->gdes[i].leg_y is the bottom of the legend */ + X0 = im->gdes[i].leg_x; + Y0 = im->gdes[i].leg_y; + 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->text_prop[TEXT_PROP_LEGEND].font, + im->text_prop[TEXT_PROP_LEGEND].size, im->tabwidth,0.0, GFX_H_LEFT, GFX_V_BOTTOM, im->gdes[i].legend ); - } - } - } + /* The legend for GRAPH items starts with "M " to have + enough space for the box */ + if ( im->gdes[i].gf != GF_PRINT && + 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_LEGEND].font, + im->text_prop[TEXT_PROP_LEGEND].size, + im->tabwidth,"M", 0)*1.2; + boxV = boxH; + + /* make sure transparent colors show up all the same */ + node = gfx_new_area(im->canvas, + X0,Y0-boxV, + X0,Y0, + X0+boxH,Y0, + im->graph_col[GRC_CANVAS]); + gfx_add_point ( node, X0+boxH, Y0-boxV ); + + 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,im->graph_col[GRC_FONT]); + gfx_add_point(node,X0+boxH,Y0); + gfx_add_point(node,X0+boxH,Y0-boxV); + gfx_close_path(node); + } + } + } +} /***************************************************** @@ -2036,6 +2015,7 @@ int lazy_check(image_desc_t *im){ return size; } +#ifdef WITH_PIECHART void pie_part(image_desc_t *im, gfx_color_t color, double PieCenterX, double PieCenterY, double Radius, @@ -2082,8 +2062,16 @@ pie_part(image_desc_t *im, gfx_color_t color, } } +#endif + int -graph_size_location(image_desc_t *im, int elements, int piechart ) +graph_size_location(image_desc_t *im, int elements + +#ifdef WITH_PIECHART +, int piechart +#endif + + ) { /* The actual size of the image to draw is determined from ** several sources. The size given on the command line is @@ -2109,7 +2097,9 @@ graph_size_location(image_desc_t *im, int elements, int piechart ) Xtitle =0, Ytitle =0, Xylabel =0, Yylabel =0, Xmain =0, Ymain =0, +#ifdef WITH_PIECHART Xpie =0, Ypie =0, +#endif Xxlabel =0, Yxlabel =0, #if 0 Xlegend =0, Ylegend =0, @@ -2117,19 +2107,22 @@ graph_size_location(image_desc_t *im, int elements, int piechart ) Xspacing =10, Yspacing =10; if (im->extra_flags & ONLY_GRAPH) { - if ( im->ysize > 32 ) { - rrd_set_error("height > 32 is not possible with --only-graph option"); - return -1; - } - Xspacing =0; - Yspacing =0; - } else { - if (im->ylegend[0] != '\0') { - Xvertical = im->text_prop[TEXT_PROP_LEGEND].size *2; - Yvertical = im->text_prop[TEXT_PROP_LEGEND].size * (strlen(im->ylegend)+1); - } + im->xorigin =0; + im->ximg = im->xsize; + im->yimg = im->ysize; + im->yorigin = im->ysize; + return 0; } + if (im->ylegend[0] != '\0' ) { + Xvertical = im->text_prop[TEXT_PROP_UNIT].size *2; + Yvertical = gfx_get_text_width(im->canvas, 0, + im->text_prop[TEXT_PROP_UNIT].font, + im->text_prop[TEXT_PROP_UNIT].size, + im->tabwidth,im->ylegend, 0); + } + + if (im->title[0] != '\0') { /* The title is placed "inbetween" two text lines so it ** automatically has some vertical spacing. The horizontal @@ -2140,7 +2133,7 @@ graph_size_location(image_desc_t *im, int elements, int piechart ) im->text_prop[TEXT_PROP_TITLE].size, im->tabwidth, im->title, 0) + 2*Xspacing; - Ytitle = im->text_prop[TEXT_PROP_TITLE].size*2; + Ytitle = im->text_prop[TEXT_PROP_TITLE].size*2.5; } if (elements) { @@ -2148,19 +2141,21 @@ graph_size_location(image_desc_t *im, int elements, int piechart ) Ymain=im->ysize; if (im->draw_x_grid) { Xxlabel=Xmain; - Yxlabel=im->text_prop[TEXT_PROP_LEGEND].size *2; + Yxlabel=im->text_prop[TEXT_PROP_AXIS].size *2.5; } if (im->draw_y_grid) { - Xylabel=im->text_prop[TEXT_PROP_LEGEND].size *6; + Xylabel=im->text_prop[TEXT_PROP_AXIS].size *6; Yylabel=Ymain; } } +#ifdef WITH_PIECHART if (piechart) { im->piesize=im->xsizeysize?im->xsize:im->ysize; Xpie=im->piesize; Ypie=im->piesize; } +#endif /* Now calculate the total size. Insert some spacing where desired. im->xorigin and im->yorigin need to correspond @@ -2173,23 +2168,22 @@ graph_size_location(image_desc_t *im, int elements, int piechart ) ** forget about it at all; the legend will have to fit in the ** size already allocated. */ - im->ximg = Xmain; + im->ximg = Xylabel + Xmain + 2 * Xspacing; - if ( !(im->extra_flags & ONLY_GRAPH) ) { - im->ximg = Xylabel + Xmain + Xpie + Xspacing; - } +#ifdef WITH_PIECHART + im->ximg += Xpie; +#endif if (Xmain) im->ximg += Xspacing; +#ifdef WITH_PIECHART if (Xpie) im->ximg += Xspacing; +#endif - if (im->extra_flags & ONLY_GRAPH) { - im->xorigin = 0; - } else { - im->xorigin = Xspacing + Xylabel; - } + im->xorigin = Xspacing + Xylabel; if (Xtitle > im->ximg) im->ximg = Xtitle; - if (Xvertical) { + + if (Xvertical) { /* unit description */ im->ximg += Xvertical; im->xorigin += Xvertical; } @@ -2206,19 +2200,13 @@ graph_size_location(image_desc_t *im, int elements, int piechart ) /* reserve space for main and/or pie */ - if (im->extra_flags & ONLY_GRAPH) { - im->yimg = Ymain; - } else { - im->yimg = Ymain + Yxlabel; - } + im->yimg = Ymain + Yxlabel; +#ifdef WITH_PIECHART if (im->yimg < Ypie) im->yimg = Ypie; +#endif - if (im->extra_flags & ONLY_GRAPH) { - im->yorigin = im->yimg; - } else { - im->yorigin = im->yimg - Yxlabel; - } + im->yorigin = im->yimg - Yxlabel; /* reserve space for the title *or* some padding above the graph */ if (Ytitle) { @@ -2248,6 +2236,7 @@ graph_size_location(image_desc_t *im, int elements, int piechart ) } #endif +#ifdef WITH_PIECHART /* The pie is placed in the upper right hand corner, ** just below the title (if any) and with sufficient ** padding. @@ -2259,6 +2248,7 @@ graph_size_location(image_desc_t *im, int elements, int piechart ) im->pie_x = im->ximg/2; im->pie_y = im->yorigin-Ypie/2; } +#endif return 0; } @@ -2269,8 +2259,10 @@ graph_paint(image_desc_t *im, char ***calcpr) { int i,ii; int lazy = lazy_check(im); +#ifdef WITH_PIECHART int piechart = 0; double PieStart=0.0; +#endif FILE *fo; gfx_node_t *node; @@ -2289,7 +2281,8 @@ graph_paint(image_desc_t *im, char ***calcpr) /* evaluate VDEF and CDEF operations ... */ if(data_calc(im)==-1) return -1; - + +#ifdef WITH_PIECHART /* check if we need to draw a piechart */ for(i=0;igdes_c;i++){ if (im->gdes[i].gf == GF_PART) { @@ -2297,6 +2290,7 @@ graph_paint(image_desc_t *im, char ***calcpr) break; } } +#endif /* calculate and PRINT and GPRINT definitions. We have to do it at * this point because it will affect the length of the legends @@ -2305,10 +2299,16 @@ graph_paint(image_desc_t *im, char ***calcpr) */ i=print_calc(im,calcpr); if(i<0) return -1; - if(((i==0)&&(piechart==0)) || lazy) return 0; + if(((i==0) +#ifdef WITH_PIECHART +&&(piechart==0) +#endif +) || lazy) return 0; +#ifdef WITH_PIECHART /* If there's only the pie chart to draw, signal this */ if (i==0) piechart=2; +#endif /* get actual drawing data and find min and max values*/ if(data_proc(im)==-1) @@ -2331,7 +2331,11 @@ graph_paint(image_desc_t *im, char ***calcpr) *** Calculating sizes and locations became a bit confusing *** *** so I moved this into a separate function. *** **************************************************************/ - if(graph_size_location(im,i,piechart)==-1) + if(graph_size_location(im,i +#ifdef WITH_PIECHART +,piechart +#endif +)==-1) return -1; /* the actual graph is created by going through the individual @@ -2345,7 +2349,9 @@ graph_paint(image_desc_t *im, char ***calcpr) gfx_add_point(node,0, im->yimg); +#ifdef WITH_PIECHART if (piechart != 2) { +#endif node=gfx_new_area ( im->canvas, im->xorigin, im->yorigin, im->xorigin + im->xsize, im->yorigin, @@ -2358,13 +2364,15 @@ graph_paint(image_desc_t *im, char ***calcpr) areazero = im->minval; if (im->maxval < 0.0) areazero = im->maxval; - if( !(im->extra_flags & ONLY_GRAPH) ) - axis_paint(im); - } +#ifdef WITH_PIECHART + } +#endif +#ifdef WITH_PIECHART if (piechart) { pie_part(im,im->graph_col[GRC_CANVAS],im->pie_x,im->pie_y,im->piesize*0.5,0,2*M_PI); } +#endif for(i=0;igdes_c;i++){ switch(im->gdes[i].gf){ @@ -2410,81 +2418,69 @@ graph_paint(image_desc_t *im, char ***calcpr) } } /* for */ - - if (im->gdes[i].col != 0x0){ + + /* ******************************************************* + ___ + | | ___ + ____| | | | + | |___| + -------|--------------------------------------- + + if we know the value of y at time t was a then + we draw a square from t-1 to t with the value a. + + ********************************************************* */ + if (im->gdes[i].col != 0x0){ /* GF_LINE and friend */ if(stack_gf == GF_LINE ){ node = NULL; for(ii=1;iixsize;ii++){ - if ( ! isnan(im->gdes[i].p_data[ii-1]) - && ! isnan(im->gdes[i].p_data[ii])){ - if (node == NULL){ - node = gfx_new_line(im->canvas, - ii-1+im->xorigin,ytr(im,im->gdes[i].p_data[ii-1]), + if (isnan(im->gdes[i].p_data[ii])){ + node = NULL; + continue; + } + if ( node == NULL ) { + node = gfx_new_line(im->canvas, + ii-1+im->xorigin,ytr(im,im->gdes[i].p_data[ii]), ii+im->xorigin,ytr(im,im->gdes[i].p_data[ii]), im->gdes[i].linewidth, im->gdes[i].col); - } else { - gfx_add_point(node,ii+im->xorigin,ytr(im,im->gdes[i].p_data[ii])); - } - } else { - node = NULL; - } + } else { + gfx_add_point(node,ii-1+im->xorigin,ytr(im,im->gdes[i].p_data[ii])); + gfx_add_point(node,ii+im->xorigin,ytr(im,im->gdes[i].p_data[ii])); + }; + } } else { - int area_start=-1; - node = NULL; for(ii=1;iixsize;ii++){ - /* open an area */ - if ( ! isnan(im->gdes[i].p_data[ii-1]) - && ! isnan(im->gdes[i].p_data[ii])){ - if (node == NULL){ - float ybase = 0.0; -/* - if (im->gdes[i].gf == GF_STACK) { -*/ - if ( (im->gdes[i].gf == GF_STACK) - || (im->gdes[i].stack) ) { - - ybase = ytr(im,lastgdes->p_data[ii-1]); - } else { - ybase = ytr(im,areazero); - } - area_start = ii-1; - node = gfx_new_area(im->canvas, - ii-1+im->xorigin,ybase, - ii-1+im->xorigin,ytr(im,im->gdes[i].p_data[ii-1]), - ii+im->xorigin,ytr(im,im->gdes[i].p_data[ii]), - im->gdes[i].col - ); - } else { - gfx_add_point(node,ii+im->xorigin,ytr(im,im->gdes[i].p_data[ii])); - } + /* keep things simple for now, just draw these bars + do not try to build a big and complex area */ + float ybase; + if ( isnan(im->gdes[i].p_data[ii]) ) { + continue; + } + if ( im->gdes[i].stack ) { + ybase = ytr(im,lastgdes->p_data[ii]); + } else { + ybase = ytr(im,areazero); } - - if ( node != NULL && (ii+1==im->xsize || isnan(im->gdes[i].p_data[ii]) )){ - /* GF_AREA STACK type*/ -/* - if (im->gdes[i].gf == GF_STACK ) { -*/ - if ( (im->gdes[i].gf == GF_STACK) - || (im->gdes[i].stack) ) { - int iii; - for (iii=ii-1;iii>area_start;iii--){ - gfx_add_point(node,iii+im->xorigin,ytr(im,lastgdes->p_data[iii])); - } - } else { - gfx_add_point(node,ii+im->xorigin,ytr(im,areazero)); - }; - node=NULL; - }; + if ( ybase == im->gdes[i].p_data[ii] ){ + continue; + } + node = gfx_new_area(im->canvas, + ii-1+im->xorigin,ybase, + ii-1+im->xorigin,ytr(im,im->gdes[i].p_data[ii]), + ii+im->xorigin,ytr(im,im->gdes[i].p_data[ii]), + im->gdes[i].col + ); + gfx_add_point(node,ii+im->xorigin,ybase); } } /* else GF_LINE */ } /* if color != 0x0 */ /* make sure we do not run into trouble when stacking on NaN */ for(ii=0;iixsize;ii++){ if (isnan(im->gdes[i].p_data[ii])) { - if (lastgdes && (im->gdes[i].gf == GF_STACK)) { + if (lastgdes && (im->gdes[i].stack)) { im->gdes[i].p_data[ii] = lastgdes->p_data[ii]; } else { im->gdes[i].p_data[ii] = ytr(im,areazero); @@ -2493,6 +2489,7 @@ graph_paint(image_desc_t *im, char ***calcpr) } lastgdes = &(im->gdes[i]); break; +#ifdef WITH_PIECHART case GF_PART: if(isnan(im->gdes[i].yrule)) /* fetch variable */ im->gdes[i].yrule = im->gdes[im->gdes[i].vidx].vf.val; @@ -2505,12 +2502,20 @@ graph_paint(image_desc_t *im, char ***calcpr) PieStart += im->gdes[i].yrule; } break; +#endif + } /* switch */ } +#ifdef WITH_PIECHART if (piechart==2) { im->draw_x_grid=0; im->draw_y_grid=0; } +#endif + + if( !(im->extra_flags & ONLY_GRAPH) ) + axis_paint(im); + /* grid_paint also does the text */ if( !(im->extra_flags & ONLY_GRAPH) ) grid_paint(im); @@ -2549,7 +2554,7 @@ graph_paint(image_desc_t *im, char ***calcpr) if (strcmp(im->graphfile,"-")==0) { fo = im->graphhandle ? im->graphhandle : stdout; -#ifdef WIN32 +#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) /* Change translation mode for stdout to BINARY */ _setmode( _fileno( fo ), O_BINARY ); #endif @@ -2596,6 +2601,7 @@ gdes_alloc(image_desc_t *im){ im->gdes[im->gdes_c-1].shift=0; im->gdes[im->gdes_c-1].col = 0x0; im->gdes[im->gdes_c-1].legend[0]='\0'; + im->gdes[im->gdes_c-1].format[0]='\0'; im->gdes[im->gdes_c-1].rrd[0]='\0'; im->gdes[im->gdes_c-1].ds=-1; im->gdes[im->gdes_c-1].p_data=NULL; @@ -2635,7 +2641,7 @@ scan_for_col(char *input, int len, char *output) ** - script parsing now in rrd_graph_script() */ int -rrd_graph(int argc, char **argv, char ***prdata, int *xsize, int *ysize, FILE *stream) +rrd_graph(int argc, char **argv, char ***prdata, int *xsize, int *ysize, FILE *stream, double *ymin, double *ymax) { image_desc_t im; @@ -2676,6 +2682,8 @@ rrd_graph(int argc, char **argv, char ***prdata, int *xsize, int *ysize, FILE *s *xsize=im.ximg; *ysize=im.yimg; + *ymin=im.minval; + *ymax=im.maxval; if (im.imginfo) { char *filename; if (!(*prdata)) { @@ -2741,25 +2749,41 @@ rrd_graph_init(image_desc_t *im) im->canvas = gfx_new_canvas(); im->grid_dash_on = 1; im->grid_dash_off = 1; - + im->tabwidth = 40.0; + for(i=0;igraph_col[i]=graph_col[i]; -#ifdef WIN32 + +#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) { - char *windir; - windir = getenv("windir"); - /* %windir% is something like D:\windows or C:\winnt */ - if (windir != NULL) { - strcpy(rrd_win_default_font,windir); - strcat(rrd_win_default_font,"\\fonts\\cour.ttf"); - for(i=0;itext_prop[i].size = text_prop[i].size; - im->text_prop[i].font = text_prop[i].font; + strcpy(im->text_prop[i].font,text_prop[i].font); } } @@ -2809,14 +2833,15 @@ rrd_graph_options(int argc, char *argv[],image_desc_t *im) {"alt-autoscale-max", no_argument, 0, 'M'}, {"units-exponent",required_argument, 0, 'X'}, {"step", required_argument, 0, 'S'}, + {"tabwidth", required_argument, 0, 'T'}, {"no-gridfit", no_argument, 0, 'N'}, {0,0,0,0}}; int option_index = 0; int opt; - + int col_start,col_end; opt = getopt_long(argc, argv, - "s:e:x:y:v:w:h:iu:l:rb:oc:n:m:t:f:a:I:zgjFYAMX:S:N", + "s:e:x:y:v:w:h:iu:l:rb:oc:n:m:t:f:a:I:zgjFYAMX:S:NT:", long_options, &option_index); if (opt == EOF) @@ -2835,7 +2860,7 @@ rrd_graph_options(int argc, char *argv[],image_desc_t *im) case 'M': im->extra_flags |= ALTAUTOSCALE_MAX; break; - case 'j': + case 'j': im->extra_flags |= ONLY_GRAPH; break; case 'g': @@ -2847,6 +2872,9 @@ rrd_graph_options(int argc, char *argv[],image_desc_t *im) case 'X': im->unitsexponent = atoi(optarg); break; + case 'T': + im->tabwidth = atof(optarg); + break; case 'S': im->step = atoi(optarg); break; @@ -2882,6 +2910,7 @@ rrd_graph_options(int argc, char *argv[],image_desc_t *im) &im->xlab_user.precis, &stroff) == 7 && stroff != 0){ strncpy(im->xlab_form, optarg+stroff, sizeof(im->xlab_form) - 1); + im->xlab_form[sizeof(im->xlab_form)-1] = '\0'; if((int)(im->xlab_user.gridtm = tmt_conv(scan_gtm)) == -1){ rrd_set_error("unknown keyword %s",scan_gtm); return; @@ -2980,13 +3009,25 @@ rrd_graph_options(int argc, char *argv[],image_desc_t *im) break; case 'c': if(sscanf(optarg, - "%10[A-Z]#%8lx", - col_nam,&color) == 2){ + "%10[A-Z]#%n%8lx%n", + col_nam,&col_start,&color,&col_end) == 2){ int ci; + int col_len = col_end - col_start; + switch (col_len){ + case 6: + color = (color << 8) + 0xff /* shift left by 8 */; + break; + case 8: + break; + default: + rrd_set_error("the color format is #RRGGBB[AA]"); + return; + } if((ci=grc_conv(col_nam)) != -1){ im->graph_col[ci]=color; } else { rrd_set_error("invalid color name '%s'",col_nam); + return; } } else { rrd_set_error("invalid color def format"); @@ -2994,35 +3035,26 @@ rrd_graph_options(int argc, char *argv[],image_desc_t *im) } break; case 'n':{ - /* 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]; + char prop[15]; double size = 1; - char *font; + char font[1024]; - font=malloc(255); if(sscanf(optarg, - "%10[A-Z]:%lf:%s", + "%10[A-Z]:%lf:%1000s", 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; + strcpy(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; + strcpy(im->text_prop[TEXT_PROP_TITLE].font,font); im->text_prop[TEXT_PROP_AXIS].size=size; - im->text_prop[TEXT_PROP_AXIS].font=font; + strcpy(im->text_prop[TEXT_PROP_AXIS].font,font); im->text_prop[TEXT_PROP_UNIT].size=size; - im->text_prop[TEXT_PROP_UNIT].font=font; + strcpy(im->text_prop[TEXT_PROP_UNIT].font,font); im->text_prop[TEXT_PROP_LEGEND].size=size; - im->text_prop[TEXT_PROP_LEGEND].font=font; + strcpy(im->text_prop[TEXT_PROP_LEGEND].font,font); } } else { rrd_set_error("invalid fonttag '%s'",prop); @@ -3136,15 +3168,6 @@ rrd_graph_color(image_desc_t *im, char *var, char *err, int optional) return n; } } -int -rrd_graph_legend(graph_desc_t *gdp, char *line) -{ - int i; - - i=scan_for_col(line,FMT_LEG_LEN,gdp->legend); - - return (strlen(&line[i])==0); -} int bad_format(char *fmt) {