X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_graph.c;h=a4f250c9b6ddffb773d5149c0a8c628d42552cae;hb=3895c7d3d1089bcf68d89390189d96497392df23;hp=2d08b10f18fd957ed819aa74ed00dc85c7d1bb3e;hpb=38a4b58a9749f17e19303b05b8919b5c1b73b59f;p=rrdtool.git diff --git a/src/rrd_graph.c b/src/rrd_graph.c index 2d08b10..a4f250c 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.2.11 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,42 +27,40 @@ /* some constant definitions */ -#ifdef WIN32 -char rrd_win_default_font[80]; -#endif #ifndef RRD_DEFAULT_FONT -#ifndef WIN32 -#define RRD_DEFAULT_FONT "/usr/share/fonts/truetype/openoffice/ariosor.ttf" -/* #define RRD_DEFAULT_FONT "/usr/share/fonts/truetype/Arial.ttf" */ -#endif +/* there is special code later to pick Cour.ttf when running on windows */ +#define RRD_DEFAULT_FONT "DejaVuSansMono-Roman.ttf" #endif text_prop_t text_prop[] = { - { 10.0, RRD_DEFAULT_FONT }, /* default */ - { 12.0, RRD_DEFAULT_FONT }, /* title */ - { 8.0, RRD_DEFAULT_FONT }, /* axis */ - { 10.0, RRD_DEFAULT_FONT }, /* unit */ - { 10.0, RRD_DEFAULT_FONT } /* legend */ + { 8.0, RRD_DEFAULT_FONT }, /* default */ + { 9.0, RRD_DEFAULT_FONT }, /* title */ + { 7.0, RRD_DEFAULT_FONT }, /* axis */ + { 8.0, RRD_DEFAULT_FONT }, /* unit */ + { 8.0, RRD_DEFAULT_FONT } /* legend */ }; xlab_t xlab[] = { - {0, TMT_SECOND,30, TMT_MINUTE,5, TMT_MINUTE,5, 0,"%H:%M"}, - {2, TMT_MINUTE,1, TMT_MINUTE,5, TMT_MINUTE,5, 0,"%H:%M"}, - {5, TMT_MINUTE,2, TMT_MINUTE,10, TMT_MINUTE,10, 0,"%H:%M"}, - {10, TMT_MINUTE,5, TMT_MINUTE,20, TMT_MINUTE,20, 0,"%H:%M"}, - {30, TMT_MINUTE,10, TMT_HOUR,1, TMT_HOUR,1, 0,"%H:%M"}, - {60, TMT_MINUTE,30, TMT_HOUR,2, TMT_HOUR,2, 0,"%H:%M"}, - {180, TMT_HOUR,1, TMT_HOUR,6, TMT_HOUR,6, 0,"%H:%M"}, - /*{300, TMT_HOUR,3, TMT_HOUR,12, TMT_HOUR,12, 12*3600,"%a %p"}, this looks silly*/ - {600, TMT_HOUR,6, TMT_DAY,1, TMT_DAY,1, 24*3600,"%a"}, - {1800, TMT_HOUR,12, TMT_DAY,1, TMT_DAY,2, 24*3600,"%a"}, - {3600, TMT_DAY,1, TMT_WEEK,1, TMT_WEEK,1, 7*24*3600,"Week %V"}, - {3*3600, TMT_WEEK,1, TMT_MONTH,1, TMT_WEEK,2, 7*24*3600,"Week %V"}, - {6*3600, TMT_MONTH,1, TMT_MONTH,1, TMT_MONTH,1, 30*24*3600,"%b"}, - {48*3600, TMT_MONTH,1, TMT_MONTH,3, TMT_MONTH,3, 30*24*3600,"%b"}, - {10*24*3600, TMT_YEAR,1, TMT_YEAR,1, TMT_YEAR,1, 365*24*3600,"%y"}, - {-1,TMT_MONTH,0,TMT_MONTH,0,TMT_MONTH,0,0,""} + {0, 0, TMT_SECOND,30, TMT_MINUTE,5, TMT_MINUTE,5, 0,"%H:%M"}, + {2, 0, TMT_MINUTE,1, TMT_MINUTE,5, TMT_MINUTE,5, 0,"%H:%M"}, + {5, 0, TMT_MINUTE,2, TMT_MINUTE,10, TMT_MINUTE,10, 0,"%H:%M"}, + {10, 0, TMT_MINUTE,5, TMT_MINUTE,20, TMT_MINUTE,20, 0,"%H:%M"}, + {30, 0, TMT_MINUTE,10, TMT_HOUR,1, TMT_HOUR,1, 0,"%H:%M"}, + {60, 0, TMT_MINUTE,30, TMT_HOUR,2, TMT_HOUR,2, 0,"%H:%M"}, + {180, 0, TMT_HOUR,1, TMT_HOUR,6, TMT_HOUR,6, 0,"%H:%M"}, + {180, 1*24*3600, TMT_HOUR,1, TMT_HOUR,6, TMT_HOUR,6, 0,"%a %H:%M"}, + /*{300, 0, TMT_HOUR,3, TMT_HOUR,12, TMT_HOUR,12, 12*3600,"%a %p"}, this looks silly*/ + {600, 0, TMT_HOUR,6, TMT_DAY,1, TMT_DAY,1, 24*3600,"%a"}, + {600, 1*24*3600, TMT_HOUR,6, TMT_DAY,1, TMT_DAY,1, 24*3600,"%a %d"}, + {1800, 0, TMT_HOUR,12, TMT_DAY,1, TMT_DAY,2, 24*3600,"%a"}, + {1800, 1*24*3600, TMT_HOUR,12, TMT_DAY,1, TMT_DAY,2, 24*3600,"%a %d"}, + {3600, 0, TMT_DAY,1, TMT_WEEK,1, TMT_WEEK,1, 7*24*3600,"Week %V"}, + {3*3600, 0, TMT_WEEK,1, TMT_MONTH,1, TMT_WEEK,2, 7*24*3600,"Week %V"}, + {6*3600, 0, TMT_MONTH,1, TMT_MONTH,1, TMT_MONTH,1, 30*24*3600,"%b"}, + {48*3600, 0, TMT_MONTH,1, TMT_MONTH,3, TMT_MONTH,3, 30*24*3600,"%b"}, + {10*24*3600, 0, TMT_YEAR,1, TMT_YEAR,1, TMT_YEAR,1, 365*24*3600,"%y"}, + {-1,0,TMT_MONTH,0,TMT_MONTH,0,TMT_MONTH,0,0,""} }; /* sensible logarithmic y label intervals ... @@ -101,12 +99,13 @@ 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 */ -}; + 0x802020FF, /* arrow */ + 0x202020FF, /* axis */ + 0x000000FF /* frame */ +}; /* #define DEBUG */ @@ -156,9 +155,9 @@ ytr(image_desc_t *im, double value){ if (! im->rigid) { /* keep yval as-is */ } else if (yval > im->yorigin) { - yval = im->yorigin+2; + yval = im->yorigin +0.00001; } else if (yval < im->yorigin - im->ysize){ - yval = im->yorigin - im->ysize - 2; + yval = im->yorigin - im->ysize - 0.00001; } return yval; } @@ -185,8 +184,11 @@ 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) return (-1); } @@ -222,8 +224,9 @@ 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) + conv_if(FRAME,GRC_FRAME) return -1; } @@ -331,25 +334,30 @@ si_unit( 'E'};/* 10e18 Exa */ int symbcenter = 6; - double digits; + double digits,viewdigits=0; + digits = floor( log( max( fabs(im->minval),fabs(im->maxval)))/log((double)im->base)); + if (im->unitsexponent != 9999) { /* unitsexponent = 9, 6, 3, 0, -3, -6, -9, etc */ - digits = floor(im->unitsexponent / 3); + viewdigits = floor(im->unitsexponent / 3); } else { - digits = floor( log( max( fabs(im->minval),fabs(im->maxval)))/log((double)im->base)); + viewdigits = digits; } - im->magfact = pow((double)im->base , digits); + im->magfact = pow((double)im->base , digits); + #ifdef DEBUG printf("digits %6.3f im->magfact %6.3f\n",digits,im->magfact); #endif - if ( ((digits+symbcenter) < sizeof(symbol)) && - ((digits+symbcenter) >= 0) ) - im->symbol = symbol[(int)digits+symbcenter]; + im->viewfactor = im->magfact / pow((double)im->base , viewdigits); + + if ( ((viewdigits+symbcenter) < sizeof(symbol)) && + ((viewdigits+symbcenter) >= 0) ) + im->symbol = symbol[(int)viewdigits+symbcenter]; else - im->symbol = ' '; + im->symbol = '?'; } /* move min and max values around to become sensible */ @@ -387,7 +395,7 @@ expand_range(image_desc_t *im) delt = im->maxval - im->minval; adj = delt * 0.1; fact = 2.0 * pow(10.0, - floor(log10(max(fabs(im->minval), fabs(im->maxval)))) - 2); + floor(log10(max(fabs(im->minval), fabs(im->maxval))/im->magfact)) - 2); if (delt < fact) { adj = (fact - delt) * 0.55; #ifdef DEBUG @@ -464,7 +472,7 @@ apply_gridfit(image_desc_t *im) double new_log10_range = factor * log10_range; double new_ymax_log10 = log10(im->minval) + new_log10_range; im->maxval = pow(10, new_ymax_log10); - ytr(im, DNAN); /* reset precalc */ + ytr(im,DNAN); /* reset precalc */ log10_range = log10(im->maxval) - log10(im->minval); } /* make sure first y=10^x gridline is located on @@ -476,7 +484,7 @@ apply_gridfit(image_desc_t *im) double yfrac = ypixfrac / im->ysize; im->minval = pow(10, log10(im->minval) - yfrac * log10_range); im->maxval = pow(10, log10(im->maxval) - yfrac * log10_range); - ytr(im, DNAN); /* reset precalc */ + ytr(im,DNAN); /* reset precalc */ } } else { /* Make sure we have an integer pixel distance between @@ -489,7 +497,7 @@ apply_gridfit(image_desc_t *im) double gridstep = im->ygrid_scale.gridstep; double minor_y, minor_y_px, minor_y_px_frac; im->maxval = im->minval + new_range; - ytr(im, DNAN); /* reset precalc */ + ytr(im,DNAN); /* reset precalc */ /* make sure first minor gridline is on integer pixel y coord */ minor_y = gridstep * floor(im->minval / gridstep); while (minor_y < im->minval) @@ -501,7 +509,7 @@ apply_gridfit(image_desc_t *im) double range = im->maxval - im->minval; im->minval = im->minval - yfrac * range; im->maxval = im->maxval - yfrac * range; - ytr(im, DNAN); /* reset precalc */ + ytr(im,DNAN); /* reset precalc */ } calc_horizontal_grid(im); /* recalc with changed im->maxval */ } @@ -600,7 +608,7 @@ printf("row_cnt after: %lu\n",row_cnt); ** into one interval for the destination. */ - for (dst_row=0;row_cnt>=reduce_factor;dst_row++) { + for (dst_row=0;(long int)row_cnt>=reduce_factor;dst_row++) { for (col=0;col<(*ds_cnt);col++) { rrd_value_t newval=DNAN; unsigned long validval=0; @@ -680,11 +688,11 @@ for (col=0;colgdes_c;i++){ + /* pull the data from the rrd files ... */ + for (i=0;i< (int)im->gdes_c;i++){ /* only GF_DEF elements fetch data */ if (im->gdes[i].gf != GF_DEF) continue; @@ -696,9 +704,10 @@ data_fetch(image_desc_t *im ) continue; if ((strcmp(im->gdes[i].rrd, im->gdes[ii].rrd) == 0) && (im->gdes[i].cf == im->gdes[ii].cf) - && (im->gdes[i].start == im->gdes[ii].start) - && (im->gdes[i].end == im->gdes[ii].end) - && (im->gdes[i].step == im->gdes[ii].step)) { + && (im->gdes[i].cf_reduce == im->gdes[ii].cf_reduce) + && (im->gdes[i].start_orig == im->gdes[ii].start_orig) + && (im->gdes[i].end_orig == im->gdes[ii].end_orig) + && (im->gdes[i].step_orig == im->gdes[ii].step_orig)) { /* OK, the data is already there. ** Just copy the header portion */ @@ -728,9 +737,10 @@ data_fetch(image_desc_t *im ) return -1; } im->gdes[i].data_first = 1; + im->gdes[i].step = im->step; if (ft_step < im->gdes[i].step) { - reduce_data(im->gdes[i].cf, + reduce_data(im->gdes[i].cf_reduce, ft_step, &im->gdes[i].start, &im->gdes[i].end, @@ -742,8 +752,8 @@ data_fetch(image_desc_t *im ) } } - /* lets see if the required data source is realy there */ - for(ii=0;iigdes[i].ds_cnt;ii++){ + /* lets see if the required data source is really there */ + for(ii=0;ii<(int)im->gdes[i].ds_cnt;ii++){ if(strcmp(im->gdes[i].ds_namv[ii],im->gdes[i].ds_nam) == 0){ im->gdes[i].ds=ii; } } @@ -821,6 +831,28 @@ data_calc( image_desc_t *im){ switch (im->gdes[gdi].gf) { case GF_XPORT: break; + case GF_SHIFT: { + graph_desc_t *vdp = &im->gdes[im->gdes[gdi].vidx]; + + /* remove current shift */ + vdp->start -= vdp->shift; + vdp->end -= vdp->shift; + + /* vdef */ + if (im->gdes[gdi].shidx >= 0) + vdp->shift = im->gdes[im->gdes[gdi].shidx].vf.val; + /* constant */ + else + vdp->shift = im->gdes[gdi].shval; + + /* normalize shift to multiple of consolidated step */ + vdp->shift = (vdp->shift / (long)vdp->step) * (long)vdp->step; + + /* apply shift */ + vdp->start += vdp->shift; + vdp->end += vdp->shift; + break; + } case GF_VDEF: /* A VDEF has no DS. This also signals other parts * of rrdtool that this is a VDEF value, not a CDEF. @@ -853,26 +885,29 @@ data_calc( image_desc_t *im){ * and the resulting number is the step size for the * resulting data source. */ - for(rpi=0;im->gdes[gdi].rpnp[rpi].op != OP_END;rpi++){ - if(im->gdes[gdi].rpnp[rpi].op == OP_VARIABLE || - im->gdes[gdi].rpnp[rpi].op == OP_PREV_OTHER){ - long ptr = im->gdes[gdi].rpnp[rpi].ptr; - if (im->gdes[ptr].ds_cnt == 0) { + for(rpi=0;im->gdes[gdi].rpnp[rpi].op != OP_END;rpi++){ + if(im->gdes[gdi].rpnp[rpi].op == OP_VARIABLE || + im->gdes[gdi].rpnp[rpi].op == OP_PREV_OTHER){ + long ptr = im->gdes[gdi].rpnp[rpi].ptr; + if (im->gdes[ptr].ds_cnt == 0) { /* this is a VDEF data source */ #if 0 - printf("DEBUG: inside CDEF '%s' processing VDEF '%s'\n", - im->gdes[gdi].vname, - im->gdes[ptr].vname); - printf("DEBUG: value from vdef is %f\n",im->gdes[ptr].vf.val); + printf("DEBUG: inside CDEF '%s' processing VDEF '%s'\n", + im->gdes[gdi].vname, + im->gdes[ptr].vname); + printf("DEBUG: value from vdef is %f\n",im->gdes[ptr].vf.val); #endif im->gdes[gdi].rpnp[rpi].val = im->gdes[ptr].vf.val; im->gdes[gdi].rpnp[rpi].op = OP_NUMBER; - } else { - if ((steparray = + } else { /* normal variables and PREF(variables) */ + + /* add one entry to the array that keeps track of the step sizes of the + * data sources going into the CDEF. */ + if ((steparray = rrd_realloc(steparray, (++stepcnt+1)*sizeof(*steparray)))==NULL){ - rrd_set_error("realloc steparray"); - rpnstack_free(&rpnstack); - return -1; + rrd_set_error("realloc steparray"); + rpnstack_free(&rpnstack); + return -1; }; steparray[stepcnt-1] = im->gdes[ptr].step; @@ -882,6 +917,7 @@ data_calc( image_desc_t *im){ * to the earliest endpoint of any of the * rras involved (ptr) */ + if(im->gdes[gdi].start < im->gdes[ptr].start) im->gdes[gdi].start = im->gdes[ptr].start; @@ -894,8 +930,8 @@ data_calc( image_desc_t *im){ * further save step size and data source * count of this rra */ - 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].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; /* backoff the *.data ptr; this is done so @@ -908,15 +944,15 @@ data_calc( image_desc_t *im){ /* 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 || - im->gdes[gdi].rpnp[rpi].op == OP_PREV_OTHER){ - 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(im->gdes[gdi].rpnp[rpi].op == OP_VARIABLE || + im->gdes[gdi].rpnp[rpi].op == OP_PREV_OTHER){ + long ptr = im->gdes[gdi].rpnp[rpi].ptr; + long diff = im->gdes[gdi].start - im->gdes[ptr].start; + + if(diff > 0) + im->gdes[gdi].rpnp[rpi].data += (diff / im->gdes[ptr].step) * im->gdes[ptr].ds_cnt; } } - if(steparray == NULL){ rrd_set_error("rpn expressions without DEF" @@ -1014,8 +1050,10 @@ data_proc( image_desc_t *im ){ ** the time of the graph. Beware. */ vidx = im->gdes[ii].vidx; - if ( (gr_time >= im->gdes[vidx].start) && - (gr_time <= im->gdes[vidx].end) ) { + if (im->gdes[vidx].gf == GF_VDEF) { + value = im->gdes[vidx].vf.val; + } else if (((long int)gr_time >= (long int)im->gdes[vidx].start) && + ((long int)gr_time <= (long int)im->gdes[vidx].end) ) { value = im->gdes[vidx].data[ (unsigned long) floor( (double)(gr_time - im->gdes[vidx].start) @@ -1071,6 +1109,11 @@ data_proc( image_desc_t *im ){ else im->maxval = maxval; } + /* make sure min is smaller than max */ + if (im->minval > im->maxval) { + im->minval = 0.99 * im->maxval; + } + /* make sure min and max are not equal */ if (im->minval == im->maxval) { im->maxval *= 1.01; @@ -1256,14 +1299,16 @@ print_calc(image_desc_t *im, char ***prdata) if (!strcmp(im->gdes[i].format,"%c")) { /* VDEF time print */ char ctime_buf[128]; /* PS: for ctime_r, must be >= 26 chars */ + int iii=0; + ctime_r(&printtime,ctime_buf); + while(isprint(ctime_buf[iii])){iii++;} + ctime_buf[iii]='\0'; if (im->gdes[i].gf == GF_PRINT){ (*prdata)[prlines-2] = malloc((FMT_LEG_LEN+2)*sizeof(char)); - sprintf((*prdata)[prlines-2],"%s (%lu)", - ctime_r(&printtime,ctime_buf),printtime); + sprintf((*prdata)[prlines-2],"%s (%lu)",ctime_buf,printtime); (*prdata)[prlines-1] = NULL; } else { - sprintf(im->gdes[i].legend,"%s (%lu)", - ctime_r(&printtime,ctime_buf),printtime); + sprintf(im->gdes[i].legend,"%s (%lu)",ctime_buf,printtime); graphelement = 1; } } else { @@ -1289,7 +1334,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 @@ -1301,7 +1346,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 @@ -1325,7 +1370,10 @@ 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; } @@ -1340,7 +1388,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; @@ -1351,7 +1398,7 @@ leg_place(image_desc_t *im) char prt_fctn; /*special printfunctions */ int *legspace; - if( !(im->extra_flags & NOLEGEND) ) { + if( !(im->extra_flags & NOLEGEND) & !(im->extra_flags & ONLY_GRAPH) ) { if ((legspace = malloc(im->gdes_c*sizeof(int)))==NULL){ rrd_set_error("malloc for legspace"); return -1; @@ -1362,18 +1409,21 @@ leg_place(image_desc_t *im) /* hid legends for rules which are not displayed */ - if (im->gdes[i].gf == GF_HRULE && - (im->gdes[i].yrule < im->minval || im->gdes[i].yrule > im->maxval)) - im->gdes[i].legend[0] = '\0'; - - if (im->gdes[i].gf == GF_VRULE && - (im->gdes[i].xrule < im->start || im->gdes[i].xrule > im->end)) - im->gdes[i].legend[0] = '\0'; + if(!(im->extra_flags & FORCE_RULES_LEGEND)) { + if (im->gdes[i].gf == GF_HRULE && + (im->gdes[i].yrule < im->minval || im->gdes[i].yrule > im->maxval)) + im->gdes[i].legend[0] = '\0'; + + if (im->gdes[i].gf == GF_VRULE && + (im->gdes[i].xrule < im->start || im->gdes[i].xrule > im->end)) + im->gdes[i].legend[0] = '\0'; + } 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'; @@ -1394,15 +1444,11 @@ 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, im->tabwidth, - im->gdes[i].legend); + im->gdes[i].legend, 0); leg_c++; } else { legspace[i]=0; @@ -1430,7 +1476,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); @@ -1442,7 +1488,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 += @@ -1450,15 +1496,12 @@ leg_place(image_desc_t *im) im->text_prop[TEXT_PROP_LEGEND].font, im->text_prop[TEXT_PROP_LEGEND].size, im->tabwidth, - im->gdes[ii].legend) + 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.8; + if (prt_fctn == 's') leg_y -= im->text_prop[TEXT_PROP_LEGEND].size; fill = 0; leg_c = 0; mark = ii; @@ -1503,16 +1546,12 @@ calc_horizontal_grid(image_desc_t *im) if(isnan(im->ygridstep)){ if(im->extra_flags & ALTYGRID) { /* find the value with max number of digits. Get number of digits */ - decimals = ceil(log10(max(fabs(im->maxval), fabs(im->minval)))); + decimals = ceil(log10(max(fabs(im->maxval), fabs(im->minval))*im->viewfactor/im->magfact)); if(decimals <= 0) /* everything is small. make place for zero */ decimals = 1; - fractionals = floor(log10(range)); - if(fractionals < 0) /* small amplitude. */ - sprintf(im->ygrid_scale.labfmt, "%%%d.%df", decimals - fractionals + 1, -fractionals + 1); - else - sprintf(im->ygrid_scale.labfmt, "%%%d.1f", decimals + 1); - im->ygrid_scale.gridstep = pow((double)10, (double)fractionals); + im->ygrid_scale.gridstep = pow((double)10, floor(log10(range*im->viewfactor/im->magfact)))/im->viewfactor*im->magfact; + if(im->ygrid_scale.gridstep == 0) /* range is one -> 0.1 is reasonable scale */ im->ygrid_scale.gridstep = 0.1; /* should have at least 5 lines but no more then 15 */ @@ -1529,18 +1568,28 @@ calc_horizontal_grid(image_desc_t *im) im->ygrid_scale.gridstep /= 5; im->ygrid_scale.labfact = 5; } + fractionals = floor(log10(im->ygrid_scale.gridstep*(double)im->ygrid_scale.labfact*im->viewfactor/im->magfact)); + if(fractionals < 0) { /* small amplitude. */ + int len = decimals - fractionals + 1; + if (im->unitslength < len+2) im->unitslength = len+2; + sprintf(im->ygrid_scale.labfmt, "%%%d.%df%s", len, -fractionals,(im->symbol != ' ' ? " %c" : "")); + } else { + int len = decimals + 1; + if (im->unitslength < len+2) im->unitslength = len+2; + sprintf(im->ygrid_scale.labfmt, "%%%d.0f%s", len, ( im->symbol != ' ' ? " %c" : "" )); + } } else { for(i=0;ylab[i].grid > 0;i++){ pixel = im->ysize / (scaledrange / ylab[i].grid); - if (gridind == -1 && pixel > 5) { + if (pixel > 7) { gridind = i; break; } } for(i=0; i<4;i++) { - if (pixel * ylab[gridind].lfac[i] >= 2 * im->text_prop[TEXT_PROP_AXIS].size) { + if (pixel * ylab[gridind].lfac[i] >= 2.5 * im->text_prop[TEXT_PROP_AXIS].size) { im->ygrid_scale.labfact = ylab[gridind].lfac[i]; break; } @@ -1565,33 +1614,39 @@ int draw_horizontal_grid(image_desc_t *im) int sgrid = (int)( im->minval / im->ygrid_scale.gridstep - 1); int egrid = (int)( im->maxval / im->ygrid_scale.gridstep + 1); - scaledstep = im->ygrid_scale.gridstep/im->magfact; + double MaxY; + scaledstep = im->ygrid_scale.gridstep/(double)im->magfact*(double)im->viewfactor; + MaxY = scaledstep*(double)egrid; for (i = sgrid; i <= egrid; i++){ double Y0=ytr(im,im->ygrid_scale.gridstep*i); if ( Y0 >= im->yorigin-im->ysize && Y0 <= im->yorigin){ if(i % im->ygrid_scale.labfact == 0){ - if (i==0 || im->symbol == ' ') { - if(scaledstep < 1){ - if(im->extra_flags & ALTYGRID) { - sprintf(graph_label,im->ygrid_scale.labfmt,scaledstep*i); - } - else { - sprintf(graph_label,"%4.1f",scaledstep*i); - } - } else { - sprintf(graph_label,"%4.0f",scaledstep*i); - } + if (im->symbol == ' ') { + if(im->extra_flags & ALTYGRID) { + sprintf(graph_label,im->ygrid_scale.labfmt,scaledstep*(double)i); + } else { + if(MaxY < 10) { + sprintf(graph_label,"%4.1f",scaledstep*(double)i); + } else { + sprintf(graph_label,"%4.0f",scaledstep*(double)i); + } + } }else { - if(scaledstep < 1){ - sprintf(graph_label,"%4.1f %c",scaledstep*i, im->symbol); - } else { - sprintf(graph_label,"%4.0f %c",scaledstep*i, im->symbol); - } + char sisym = ( i == 0 ? ' ' : im->symbol); + if(im->extra_flags & ALTYGRID) { + sprintf(graph_label,im->ygrid_scale.labfmt,scaledstep*(double)i,sisym); + } else { + if(MaxY < 10){ + sprintf(graph_label,"%4.1f %c",scaledstep*(double)i, sisym); + } else { + sprintf(graph_label,"%4.0f %c",scaledstep*(double)i, sisym); + } + } } gfx_new_text ( im->canvas, - X0-im->text_prop[TEXT_PROP_AXIS].size/1.5, Y0, + X0-im->text_prop[TEXT_PROP_AXIS].size, Y0, im->graph_col[GRC_FONT], im->text_prop[TEXT_PROP_AXIS].font, im->text_prop[TEXT_PROP_AXIS].size, @@ -1685,7 +1740,7 @@ horizontal_log_grid(image_desc_t *im) sprintf(graph_label,"%3.0e",value * yloglab[majoridx][i]); gfx_new_text ( im->canvas, - X0-im->text_prop[TEXT_PROP_AXIS].size/1.5, Y0, + X0-im->text_prop[TEXT_PROP_AXIS].size, Y0, im->graph_col[GRC_FONT], im->text_prop[TEXT_PROP_AXIS].font, im->text_prop[TEXT_PROP_AXIS].size, @@ -1716,7 +1771,9 @@ vertical_grid( factor=(im->end - im->start)/im->xsize; xlab_sel=0; while ( xlab[xlab_sel+1].minsec != -1 - && xlab[xlab_sel+1].minsec <= factor){ xlab_sel++; } + && xlab[xlab_sel+1].minsec <= factor) { xlab_sel++; } /* pick the last one */ + while ( xlab[xlab_sel-1].minsec == xlab[xlab_sel].minsec + && xlab[xlab_sel].length > (im->end - im->start)) { xlab_sel--; } /* go back to the smallest size */ im->xlab_user.gridtm = xlab[xlab_sel].gridtm; im->xlab_user.gridst = xlab[xlab_sel].gridst; im->xlab_user.mgridtm = xlab[xlab_sel].mgridtm; @@ -1775,15 +1832,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); @@ -1792,11 +1849,11 @@ vertical_grid( # error "your libc has no strftime I guess we'll abort the exercise here." #endif gfx_new_text ( im->canvas, - xtr(im,tilab), Y0+im->text_prop[TEXT_PROP_AXIS].size/1.5, + xtr(im,tilab), Y0+im->text_prop[TEXT_PROP_AXIS].size*1.4+5, 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_CENTER, GFX_V_TOP, + im->tabwidth, 0.0, GFX_H_CENTER, GFX_V_BOTTOM, graph_label ); } @@ -1810,32 +1867,36 @@ 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 */ + /* arrow for X and Y axis direction */ 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->xorigin+im->xsize+2, im->yorigin-2, + im->xorigin+im->xsize+2, im->yorigin+3, + im->xorigin+im->xsize+7, im->yorigin+0.5, /* LINEOFFSET */ im->graph_col[GRC_ARROW]); - - - + + gfx_new_area ( im->canvas, + im->xorigin-2, im->yorigin-im->ysize-2, + im->xorigin+3, im->yorigin-im->ysize-2, + im->xorigin+0.5, im->yorigin-im->ysize-7, /* LINEOFFSET */ + im->graph_col[GRC_ARROW]); + } void @@ -1874,7 +1935,7 @@ grid_paint(image_desc_t *im) } else { res = draw_horizontal_grid(im); } - + /* dont draw horizontal grid if there is no min and max val */ if (! res ) { char *nodata = "No Data found"; @@ -1887,86 +1948,86 @@ grid_paint(image_desc_t *im) } } - /* yaxis description */ - 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); - } - } - } - + /* yaxis unit description */ + gfx_new_text( im->canvas, + 10, (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.3+4, 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); - + /* rrdtool 'logo' */ + gfx_new_text( im->canvas, + im->ximg-7, 7, + ( im->graph_col[GRC_FONT] & 0xffffff00 ) | 0x00000044, + im->text_prop[TEXT_PROP_AXIS].font, + 5.5, im->tabwidth, 270, + GFX_H_RIGHT, GFX_V_TOP, + "RRDTOOL / TOBI OETIKER"); + /* graph labels */ - if( !(im->extra_flags & NOLEGEND) ) { - 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") * 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, + 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; + 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,"o", 0) * 1.2; + boxV = boxH*1.1; + + /* make sure transparent colors show up the same way as in the graph */ + node = gfx_new_area(im->canvas, + X0,Y0-boxV, + X0,Y0, + X0+boxH,Y0, + im->graph_col[GRC_BACK]); + 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.0,im->graph_col[GRC_FRAME]); + gfx_add_point(node,X0+boxH,Y0); + gfx_add_point(node,X0+boxH,Y0-boxV); + gfx_close_path(node); + } + } + } +} /***************************************************** @@ -1999,6 +2060,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, @@ -2045,8 +2107,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 @@ -2068,53 +2138,69 @@ graph_size_location(image_desc_t *im, int elements, int piechart ) ** | |..............legends......................| ** +-+-------------------------------------------+ */ - int Xvertical=0, Yvertical=0, - Xtitle =0, Ytitle =0, - Xylabel =0, Yylabel =0, + int Xvertical=0, + Ytitle =0, + Xylabel =0, Xmain =0, Ymain =0, +#ifdef WITH_PIECHART Xpie =0, Ypie =0, - Xxlabel =0, Yxlabel =0, +#endif + Yxlabel =0, #if 0 Xlegend =0, Ylegend =0, #endif - Xspacing =10, Yspacing =10; + Xspacing =15, Yspacing =15; + + if (im->extra_flags & ONLY_GRAPH) { + im->xorigin =0; + im->ximg = im->xsize; + im->yimg = im->ysize; + im->yorigin = im->ysize; + ytr(im,DNAN); + return 0; + } - 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); + if (im->ylegend[0] != '\0' ) { + Xvertical = im->text_prop[TEXT_PROP_UNIT].size *2; } + if (im->title[0] != '\0') { /* The title is placed "inbetween" two text lines so it ** automatically has some vertical spacing. The horizontal ** spacing is added here, on each side. */ - Xtitle = gfx_get_text_width(im->canvas, 0, + /* don't care for the with of the title + Xtitle = gfx_get_text_width(im->canvas, 0, im->text_prop[TEXT_PROP_TITLE].font, im->text_prop[TEXT_PROP_TITLE].size, im->tabwidth, - im->title) + 2*Xspacing; - Ytitle = im->text_prop[TEXT_PROP_TITLE].size*2; + im->title, 0) + 2*Xspacing; */ + Ytitle = im->text_prop[TEXT_PROP_TITLE].size*2.6+10; } if (elements) { Xmain=im->xsize; 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; - Yylabel=Ymain; + Xylabel=gfx_get_text_width(im->canvas, 0, + im->text_prop[TEXT_PROP_AXIS].font, + im->text_prop[TEXT_PROP_AXIS].size, + im->tabwidth, + "0", 0) * im->unitslength; } } +#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 @@ -2127,12 +2213,23 @@ 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 = Xylabel + Xmain + Xpie + Xspacing; + im->ximg = Xylabel + Xmain + 2 * Xspacing; + +#ifdef WITH_PIECHART + im->ximg += Xpie; +#endif + if (Xmain) im->ximg += Xspacing; +#ifdef WITH_PIECHART if (Xpie) im->ximg += Xspacing; +#endif + im->xorigin = Xspacing + Xylabel; - if (Xtitle > im->ximg) im->ximg = Xtitle; - if (Xvertical) { + + /* the length of the title should not influence with width of the graph + if (Xtitle > im->ximg) im->ximg = Xtitle; */ + + if (Xvertical) { /* unit description */ im->ximg += Xvertical; im->xorigin += Xvertical; } @@ -2148,29 +2245,32 @@ graph_size_location(image_desc_t *im, int elements, int piechart ) */ /* reserve space for main and/or pie */ + im->yimg = Ymain + Yxlabel; + +#ifdef WITH_PIECHART if (im->yimg < Ypie) im->yimg = Ypie; +#endif + im->yorigin = im->yimg - Yxlabel; + /* reserve space for the title *or* some padding above the graph */ if (Ytitle) { im->yimg += Ytitle; im->yorigin += Ytitle; } else { - im->yimg += Yspacing; - im->yorigin += Yspacing; + im->yimg += 1.5*Yspacing; + im->yorigin += 1.5*Yspacing; } /* reserve space for padding below the graph */ im->yimg += Yspacing; - ytr(im,DNAN); - + /* Determine where to place the legends onto the image. ** Adjust im->yimg to match the space requirements. */ if(leg_place(im)==-1) return -1; - /* last of three steps: check total height of image */ - if (im->yimg < Yvertical) im->yimg = Yvertical; #if 0 if (Xlegend > im->ximg) { @@ -2179,6 +2279,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. @@ -2190,6 +2291,41 @@ 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 + + ytr(im,DNAN); + return 0; +} + +/* from http://www.cygnus-software.com/papers/comparingfloats/comparingfloats.htm */ +/* yes we are loosing precision by doing tos with floats instead of doubles + but it seems more stable this way. */ + +static int AlmostEqual2sComplement (float A, float B, int maxUlps) +{ + + int aInt = *(int*)&A; + int bInt = *(int*)&B; + int intDiff; + /* Make sure maxUlps is non-negative and small enough that the + default NAN won't compare as equal to anything. */ + + /* assert(maxUlps > 0 && maxUlps < 4 * 1024 * 1024); */ + + /* Make aInt lexicographically ordered as a twos-complement int */ + + if (aInt < 0) + aInt = 0x80000000l - aInt; + + /* Make bInt lexicographically ordered as a twos-complement int */ + + if (bInt < 0) + bInt = 0x80000000l - bInt; + + intDiff = abs(aInt - bInt); + + if (intDiff <= maxUlps) + return 1; return 0; } @@ -2200,8 +2336,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; @@ -2220,7 +2358,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) { @@ -2228,6 +2367,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 @@ -2236,10 +2376,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) @@ -2253,14 +2399,20 @@ graph_paint(image_desc_t *im, char ***calcpr) if (!calc_horizontal_grid(im)) return -1; + if (im->gridfit) apply_gridfit(im); + /************************************************************** *** 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 @@ -2268,13 +2420,15 @@ graph_paint(image_desc_t *im, char ***calcpr) node=gfx_new_area ( im->canvas, 0, 0, - im->ximg, 0, - im->ximg, im->yimg, + 0, im->yimg, + im->ximg, im->yimg, im->graph_col[GRC_BACK]); - gfx_add_point(node,0, im->yimg); + gfx_add_point(node,im->ximg, 0); +#ifdef WITH_PIECHART if (piechart != 2) { +#endif node=gfx_new_area ( im->canvas, im->xorigin, im->yorigin, im->xorigin + im->xsize, im->yorigin, @@ -2287,13 +2441,15 @@ graph_paint(image_desc_t *im, char ***calcpr) areazero = im->minval; if (im->maxval < 0.0) areazero = im->maxval; - - 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){ @@ -2306,6 +2462,7 @@ graph_paint(image_desc_t *im, char ***calcpr) case GF_HRULE: case GF_VRULE: case GF_XPORT: + case GF_SHIFT: break; case GF_TICK: for (ii = 0; ii < im->xsize; ii++) @@ -2338,89 +2495,151 @@ graph_paint(image_desc_t *im, char ***calcpr) } } /* for */ - - if (im->gdes[i].col != 0x0){ + + /* ******************************************************* + a ___. (a,t) + | | ___ + ____| | | | + | |___| + -------|--t-1--t-------------------------------- + + if we know the value 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 ){ + double last_y=0.0; 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, + if (isnan(im->gdes[i].p_data[ii]) || (im->slopemode==1 && isnan(im->gdes[i].p_data[ii-1]))){ + node = NULL; + continue; + } + if ( node == NULL ) { + last_y = ytr(im,im->gdes[i].p_data[ii]); + if ( im->slopemode == 0 ){ + node = gfx_new_line(im->canvas, + ii-1+im->xorigin,last_y, + ii+im->xorigin,last_y, + im->gdes[i].linewidth, + im->gdes[i].col); + } else { + node = gfx_new_line(im->canvas, ii-1+im->xorigin,ytr(im,im->gdes[i].p_data[ii-1]), - ii+im->xorigin,ytr(im,im->gdes[i].p_data[ii]), + ii+im->xorigin,last_y, 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 { + double new_y = ytr(im,im->gdes[i].p_data[ii]); + if ( im->slopemode==0 && ! AlmostEqual2sComplement(new_y,last_y,4)){ + gfx_add_point(node,ii-1+im->xorigin,new_y); + }; + last_y = new_y; + gfx_add_point(node,ii+im->xorigin,new_y); + }; + } } 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])); - } + int idxI=-1; + double *foreY=malloc(sizeof(double)*im->xsize*2); + double *foreX=malloc(sizeof(double)*im->xsize*2); + double *backY=malloc(sizeof(double)*im->xsize*2); + double *backX=malloc(sizeof(double)*im->xsize*2); + int drawem = 0; + for(ii=0;ii<=im->xsize;ii++){ + double ybase,ytop; + if ( idxI > 0 && ( drawem != 0 || ii==im->xsize)){ + int cntI=1; + int lastI=0; + while (cntI < idxI && AlmostEqual2sComplement(foreY[lastI],foreY[cntI],4) && AlmostEqual2sComplement(foreY[lastI],foreY[cntI+1],4)){cntI++;} + node = gfx_new_area(im->canvas, + backX[0],backY[0], + foreX[0],foreY[0], + foreX[cntI],foreY[cntI], im->gdes[i].col); + while (cntI < idxI) { + lastI = cntI; + cntI++; + while ( cntI < idxI && AlmostEqual2sComplement(foreY[lastI],foreY[cntI],4) && AlmostEqual2sComplement(foreY[lastI],foreY[cntI+1],4)){cntI++;} + gfx_add_point(node,foreX[cntI],foreY[cntI]); + } + gfx_add_point(node,backX[idxI],backY[idxI]); + while (idxI > 1){ + lastI = idxI; + idxI--; + while ( idxI > 1 && AlmostEqual2sComplement(backY[lastI], backY[idxI],4) && AlmostEqual2sComplement(backY[lastI],backY[idxI-1],4)){idxI--;} + gfx_add_point(node,backX[idxI],backY[idxI]); + } + idxI=-1; + drawem = 0; } + if (drawem != 0){ + drawem = 0; + idxI=-1; + } + if (ii == im->xsize) break; + + /* keep things simple for now, just draw these bars + do not try to build a big and complex area */ - 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 ( im->slopemode == 0 && ii==0){ + continue; + } + if ( isnan(im->gdes[i].p_data[ii]) ) { + drawem = 1; + continue; + } + ytop = ytr(im,im->gdes[i].p_data[ii]); + if ( lastgdes && im->gdes[i].stack ) { + ybase = ytr(im,lastgdes->p_data[ii]); + } else { + ybase = ytr(im,areazero); + } + if ( ybase == ytop ){ + drawem = 1; + continue; + } + /* every area has to be wound clock-wise, + so we have to make sur base remains base */ + if (ybase > ytop){ + double extra = ytop; + ytop = ybase; + ybase = extra; + } + if ( im->slopemode == 0 ){ + backY[++idxI] = ybase-0.2; + backX[idxI] = ii+im->xorigin-1; + foreY[idxI] = ytop+0.2; + foreX[idxI] = ii+im->xorigin-1; + } + backY[++idxI] = ybase-0.2; + backX[idxI] = ii+im->xorigin; + foreY[idxI] = ytop+0.2; + foreX[idxI] = ii+im->xorigin; + } + /* close up any remaining area */ + free(foreY); + free(foreX); + free(backY); + free(backX); } /* 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); + im->gdes[i].p_data[ii] = areazero; } } } 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; @@ -2433,14 +2652,25 @@ 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 + + /* grid_paint also does the text */ - grid_paint(im); + if( !(im->extra_flags & ONLY_GRAPH) ) + grid_paint(im); + + + if( !(im->extra_flags & ONLY_GRAPH) ) + axis_paint(im); /* the RULES are the last thing to paint ... */ for(i=0;igdes_c;i++){ @@ -2475,11 +2705,11 @@ graph_paint(image_desc_t *im, char ***calcpr) if (strcmp(im->graphfile,"-")==0) { -#ifdef WIN32 + fo = im->graphhandle ? im->graphhandle : stdout; +#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) /* Change translation mode for stdout to BINARY */ - _setmode( _fileno( stdout ), O_BINARY ); + _setmode( _fileno( fo ), O_BINARY ); #endif - fo = stdout; } else { if ((fo = fopen(im->graphfile,"wb")) == NULL) { rrd_set_error("Opening '%s' for write: %s",im->graphfile, @@ -2487,7 +2717,7 @@ graph_paint(image_desc_t *im, char ***calcpr) return (-1); } } - gfx_render (im->canvas,im->ximg,im->yimg,0x0,fo); + gfx_render (im->canvas,im->ximg,im->yimg,0x00000000,fo); if (strcmp(im->graphfile,"-") != 0) fclose(fo); return 0; @@ -2501,13 +2731,7 @@ graph_paint(image_desc_t *im, char ***calcpr) int gdes_alloc(image_desc_t *im){ - unsigned long def_step = (im->end-im->start)/im->xsize; - - if (im->step > def_step) /* step can be increassed ... no decreassed */ - def_step = im->step; - im->gdes_c++; - if ((im->gdes = (graph_desc_t *) rrd_realloc(im->gdes, (im->gdes_c) * sizeof(graph_desc_t)))==NULL){ rrd_set_error("realloc graph_descs"); @@ -2515,7 +2739,8 @@ gdes_alloc(image_desc_t *im){ } - im->gdes[im->gdes_c-1].step=def_step; + im->gdes[im->gdes_c-1].step=im->step; + im->gdes[im->gdes_c-1].step_orig=im->step; im->gdes[im->gdes_c-1].stack=0; im->gdes[im->gdes_c-1].debug=0; im->gdes[im->gdes_c-1].start=im->start; @@ -2526,8 +2751,10 @@ gdes_alloc(image_desc_t *im){ im->gdes[im->gdes_c-1].data_first=0; im->gdes[im->gdes_c-1].p_data=NULL; im->gdes[im->gdes_c-1].rpnp=NULL; + 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; @@ -2567,12 +2794,12 @@ 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) +rrd_graph(int argc, char **argv, char ***prdata, int *xsize, int *ysize, FILE *stream, double *ymin, double *ymax) { image_desc_t im; - rrd_graph_init(&im); - + im.graphhandle = stream; + rrd_graph_options(argc,argv,&im); if (rrd_test_error()) { im_free(&im); @@ -2587,7 +2814,7 @@ rrd_graph(int argc, char **argv, char ***prdata, int *xsize, int *ysize) strncpy(im.graphfile,argv[optind],MAXPATH-1); im.graphfile[MAXPATH-1]='\0'; - rrd_graph_script(argc,argv,&im); + rrd_graph_script(argc,argv,&im,1); if (rrd_test_error()) { im_free(&im); return -1; @@ -2607,6 +2834,8 @@ rrd_graph(int argc, char **argv, char ***prdata, int *xsize, int *ysize) *xsize=im.ximg; *ysize=im.yimg; + *ymin=im.minval; + *ymax=im.maxval; if (im.imginfo) { char *filename; if (!(*prdata)) { @@ -2644,7 +2873,9 @@ rrd_graph_init(image_desc_t *im) #ifdef HAVE_SETLOCALE setlocale(LC_TIME,""); #endif - + im->yorigin=0; + im->xorigin=0; + im->minval=0; im->xlab_user.minsec = -1; im->ximg=0; im->yimg=0; @@ -2656,11 +2887,15 @@ rrd_graph_init(image_desc_t *im) im->minval = DNAN; im->maxval = DNAN; im->unitsexponent= 9999; + im->unitslength= 6; + im->symbol = ' '; + im->viewfactor = 1.0; im->extra_flags= 0; im->rigid = 0; im->gridfit = 1; im->imginfo = NULL; im->lazy = 0; + im->slopemode = 0; im->logarithmic = 0; im->ygridstep = DNAN; im->draw_x_grid = 1; @@ -2672,25 +2907,42 @@ 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); } } @@ -2702,8 +2954,9 @@ rrd_graph_options(int argc, char *argv[],image_desc_t *im) char scan_gtm[12],scan_mtm[12],scan_ltm[12],col_nam[12]; time_t start_tmp=0,end_tmp=0; long long_tmp; - struct time_value start_tv, end_tv; + struct rrd_time_value start_tv, end_tv; gfx_color_t color; + optind = 0; opterr = 0; /* initialize getopt */ parsetime("end-24h", &start_tv); parsetime("now", &end_tv); @@ -2732,20 +2985,28 @@ rrd_graph_options(int argc, char *argv[],image_desc_t *im) {"lazy", no_argument, 0, 'z'}, {"zoom", required_argument, 0, 'm'}, {"no-legend", no_argument, 0, 'g'}, + {"force-rules-legend",no_argument,0, 'F'}, + {"only-graph", no_argument, 0, 'j'}, {"alt-y-grid", no_argument, 0, 'Y'}, {"no-minor", no_argument, 0, 'I'}, + {"slope-mode", no_argument, 0, 'E'}, {"alt-autoscale", no_argument, 0, 'A'}, {"alt-autoscale-max", no_argument, 0, 'M'}, + {"no-gridfit", no_argument, 0, 'N'}, {"units-exponent",required_argument, 0, 'X'}, + {"units-length",required_argument, 0, 'L'}, {"step", required_argument, 0, 'S'}, - {"no-gridfit", no_argument, 0, 'N'}, + {"tabwidth", required_argument, 0, 'T'}, + {"font-render-mode", required_argument, 0, 'R'}, + {"font-smoothing-threshold", required_argument, 0, 'B'}, + {"alt-y-mrtg", no_argument, 0, 1000}, /* this has no effect it is just here to save old apps from crashing when they use it */ {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:zgYAMX:S:N", + "s:e:x:y:v:w:h:iu:l:rb:oc:n:m:t:f:a:I:zgjFYAMEX:L:S:T:NR:B:", long_options, &option_index); if (opt == EOF) @@ -2764,16 +3025,28 @@ rrd_graph_options(int argc, char *argv[],image_desc_t *im) case 'M': im->extra_flags |= ALTAUTOSCALE_MAX; break; + case 'j': + im->extra_flags |= ONLY_GRAPH; + break; case 'g': im->extra_flags |= NOLEGEND; break; + case 'F': + im->extra_flags |= FORCE_RULES_LEGEND; + break; case 'X': im->unitsexponent = atoi(optarg); break; + case 'L': + im->unitslength = atoi(optarg); + break; + case 'T': + im->tabwidth = atof(optarg); + break; case 'S': im->step = atoi(optarg); break; - case 262: + case 'N': im->gridfit = 0; break; case 's': @@ -2805,13 +3078,14 @@ 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); - if((im->xlab_user.gridtm = tmt_conv(scan_gtm)) == -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; - } else if ((im->xlab_user.mgridtm = tmt_conv(scan_mtm)) == -1){ + } else if ((int)(im->xlab_user.mgridtm = tmt_conv(scan_mtm)) == -1){ rrd_set_error("unknown keyword %s",scan_mtm); return; - } else if ((im->xlab_user.labtm = tmt_conv(scan_ltm)) == -1){ + } else if ((int)(im->xlab_user.labtm = tmt_conv(scan_ltm)) == -1){ rrd_set_error("unknown keyword %s",scan_ltm); return; } @@ -2888,7 +3162,7 @@ rrd_graph_options(int argc, char *argv[],image_desc_t *im) im->imginfo = optarg; break; case 'a': - if((im->canvas->imgformat = if_conv(optarg)) == -1) { + if((int)(im->canvas->imgformat = if_conv(optarg)) == -1) { rrd_set_error("unsupported graphics format '%s'",optarg); return; } @@ -2896,6 +3170,10 @@ rrd_graph_options(int argc, char *argv[],image_desc_t *im) case 'z': im->lazy = 1; break; + case 'E': + im->slopemode = 1; + break; + case 'o': im->logarithmic = 1; if (isnan(im->minval)) @@ -2903,13 +3181,41 @@ 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 3: + color = ( + ((color & 0xF00) * 0x110000) | + ((color & 0x0F0) * 0x011000) | + ((color & 0x00F) * 0x001100) | + 0x000000FF + ); + break; + case 4: + color = ( + ((color & 0xF000) * 0x11000) | + ((color & 0x0F00) * 0x01100) | + ((color & 0x00F0) * 0x00110) | + ((color & 0x000F) * 0x00011) + ); + break; + 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"); @@ -2917,36 +3223,24 @@ 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", - prop,&size,font) == 3){ - int sindex; + "%10[A-Z]:%lf:%1000s", + prop,&size,font) >= 2){ + int sindex,propidx; 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; - } + for (propidx=sindex;propidx 0){ + im->text_prop[propidx].size=size; + } + if (strlen(font) > 0){ + strcpy(im->text_prop[propidx].font,font); + } + if (propidx==sindex && sindex != 0) break; + } } else { rrd_set_error("invalid fonttag '%s'",prop); return; @@ -2969,6 +3263,24 @@ rrd_graph_options(int argc, char *argv[],image_desc_t *im) im->title[150]='\0'; break; + case 'R': + if ( strcmp( optarg, "normal" ) == 0 ) + im->canvas->aa_type = AA_NORMAL; + else if ( strcmp( optarg, "light" ) == 0 ) + im->canvas->aa_type = AA_LIGHT; + else if ( strcmp( optarg, "mono" ) == 0 ) + im->canvas->aa_type = AA_NONE; + else + { + rrd_set_error("unknown font-render-mode '%s'", optarg ); + return; + } + break; + + case 'B': + im->canvas->font_aa_threshold = atof(optarg); + break; + case '?': if (optopt != 0) rrd_set_error("unknown option '%c'", optopt); @@ -3006,6 +3318,7 @@ rrd_graph_options(int argc, char *argv[],image_desc_t *im) im->start = start_tmp; im->end = end_tmp; + im->step = max((long)im->step, (im->end-im->start)/im->xsize); } int @@ -3058,15 +3371,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) { @@ -3119,12 +3423,12 @@ char *str; n=0; sscanf(str,"%le,%29[A-Z]%n",¶m,func,&n); - if (n==strlen(str)) { /* matched */ + if (n== (int)strlen(str)) { /* matched */ ; } else { n=0; sscanf(str,"%29[A-Z]%n",func,&n); - if (n==strlen(str)) { /* matched */ + if (n== (int)strlen(str)) { /* matched */ param=DNAN; } else { rrd_set_error("Unknown function string '%s' in VDEF '%s'" @@ -3141,6 +3445,9 @@ char *str; else if (!strcmp("TOTAL", func)) gdes->vf.op = VDEF_TOTAL; else if (!strcmp("FIRST", func)) gdes->vf.op = VDEF_FIRST; else if (!strcmp("LAST", func)) gdes->vf.op = VDEF_LAST; + else if (!strcmp("LSLSLOPE", func)) gdes->vf.op = VDEF_LSLSLOPE; + else if (!strcmp("LSLINT", func)) gdes->vf.op = VDEF_LSLINT; + else if (!strcmp("LSLCORREL",func)) gdes->vf.op = VDEF_LSLCORREL; else { rrd_set_error("Unknown function '%s' in VDEF '%s'\n" ,func @@ -3176,6 +3483,9 @@ char *str; case VDEF_TOTAL: case VDEF_FIRST: case VDEF_LAST: + case VDEF_LSLSLOPE: + case VDEF_LSLINT: + case VDEF_LSLCORREL: if (isnan(param)) { gdes->vf.param = DNAN; gdes->vf.val = DNAN; @@ -3334,6 +3644,48 @@ printf("DEBUG: %3li:%10.2f %c\n",step,array[step],step==field?'*':' '); dst->vf.when = src->start + (step+1)*src->step; } break; + case VDEF_LSLSLOPE: + case VDEF_LSLINT: + case VDEF_LSLCORREL:{ + /* Bestfit line by linear least squares method */ + + int cnt=0; + double SUMx, SUMy, SUMxy, SUMxx, SUMyy, slope, y_intercept, correl ; + SUMx = 0; SUMy = 0; SUMxy = 0; SUMxx = 0; SUMyy = 0; + + for (step=0;stepds_cnt])) { + cnt++; + SUMx += step; + SUMxx += step * step; + SUMxy += step * data[step*src->ds_cnt]; + SUMy += data[step*src->ds_cnt]; + SUMyy += data[step*src->ds_cnt]*data[step*src->ds_cnt]; + }; + } + + slope = ( SUMx*SUMy - cnt*SUMxy ) / ( SUMx*SUMx - cnt*SUMxx ); + y_intercept = ( SUMy - slope*SUMx ) / cnt; + correl = (SUMxy - (SUMx*SUMy)/cnt) / sqrt((SUMxx - (SUMx*SUMx)/cnt)*(SUMyy - (SUMy*SUMy)/cnt)); + + if (cnt) { + if (dst->vf.op == VDEF_LSLSLOPE) { + dst->vf.val = slope; + dst->vf.when = cnt*src->step; + } else if (dst->vf.op == VDEF_LSLINT) { + dst->vf.val = y_intercept; + dst->vf.when = cnt*src->step; + } else if (dst->vf.op == VDEF_LSLCORREL) { + dst->vf.val = correl; + dst->vf.when = cnt*src->step; + }; + + } else { + dst->vf.val = DNAN; + dst->vf.when = 0; + } + } + break; } return 0; }