X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_graph.c;h=0279d49d524cbee22831a1546e6528b5195e8fea;hp=27314776c0d3d9e152bd83a4f332c6818e3b341d;hb=99b9b7fd0cad0edea57c08fdf939d368c4c0ec45;hpb=e882b59504803ffe62eaeff5efaf0ff730d85744 diff --git a/src/rrd_graph.c b/src/rrd_graph.c index 2731477..0279d49 100644 --- a/src/rrd_graph.c +++ b/src/rrd_graph.c @@ -1,36 +1,49 @@ /**************************************************************************** - * RRDtool 1.0.33 Copyright Tobias Oetiker, 1997 - 2000 + * RRDtool 1.2rc2 Copyright by Tobi Oetiker, 1997-2005 **************************************************************************** - * rrd__graph.c make creates ne rrds + * rrd__graph.c produce graphs from data in rrdfiles ****************************************************************************/ -#if 0 -#include "rrd_tool.h" -#endif -#include -#include -#include #include + +#include "rrd_tool.h" + #ifdef WIN32 #include #include #endif +#ifdef HAVE_TIME_H +#include +#endif + +#ifdef HAVE_LOCALE_H +#include +#endif + #include "rrd_graph.h" -#include "rrd_graph_helper.h" -#define SmallFont gdLucidaNormal10 -#define LargeFont gdLucidaBold12 +/* some constant definitions */ -/* #define DEBUG */ -#ifdef DEBUG -# define DPRINT(x) (void)(printf x, printf("\n")) -#else -# define DPRINT(x) +#ifdef WIN32 +char rrd_win_default_font[80]; #endif +#ifndef RRD_DEFAULT_FONT +/* there is special code later to pick Cour.ttf when running on windows */ +#define RRD_DEFAULT_FONT "VeraMono.ttf" +#endif + +text_prop_t text_prop[] = { + { 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[] = { {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"}, @@ -42,8 +55,8 @@ xlab_t xlab[] = { /*{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 %W"}, - {3*3600, TMT_WEEK,1, TMT_MONTH,1, TMT_WEEK,2, 7*24*3600,"Week %W"}, + {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"}, @@ -81,24 +94,28 @@ ylab_t ylab[]= { {0.0, {0,0,0,0}}}; - -col_trip_t graph_col[] = { /* default colors */ - {255,255,255,-1}, /* canvas */ - {245,245,245,-1}, /* background */ - {200,200,200,-1}, /* shade A */ - {150,150,150,-1}, /* shade B */ - {140,140,140,-1}, /* grid */ - {130,30,30,-1}, /* major grid */ - {0,0,0,-1}, /* font */ - {0,0,0,-1}, /* frame */ - {255,0,0,-1} /*arrow*/ +gfx_color_t graph_col[] = /* default colors */ +{ 0xFFFFFFFF, /* canvas */ + 0xF0F0F0FF, /* background */ + 0xD0D0D0FF, /* shade A */ + 0xA0A0A0FF, /* shade B */ + 0x90909080, /* grid */ + 0xE0505080, /* major grid */ + 0x000000FF, /* font */ + 0xFF0000FF, /* arrow */ + 0x404040FF /* axis */ }; -/* translate time values into x coordinates */ -/*#define xtr(x) (int)((double)im->xorigin \ - + ((double) im->xsize / (double)(im->end - im->start) ) \ - * ((double)(x) - im->start)+0.5) */ +/* #define DEBUG */ + +#ifdef DEBUG +# define DPRINT(x) (void)(printf x, printf("\n")) +#else +# define DPRINT(x) +#endif + + /* initialize with xtr(im,0); */ int xtr(image_desc_t *im,time_t mytime){ @@ -112,11 +129,7 @@ xtr(image_desc_t *im,time_t mytime){ } /* translate data values into y coordinates */ - -/* #define ytr(x) (int)((double)im->yorigin \ - - ((double) im->ysize / (im->maxval - im->minval) ) \ - * ((double)(x) - im->minval)+0.5) */ -int +double ytr(image_desc_t *im, double value){ static double pixie; double yval; @@ -127,26 +140,25 @@ ytr(image_desc_t *im, double value){ pixie = (double) im->ysize / (log10(im->maxval) - log10(im->minval)); yval = im->yorigin; } else if(!im->logarithmic) { - yval = im->yorigin - pixie * (value - im->minval) + 0.5; + yval = im->yorigin - pixie * (value - im->minval); } else { if (value < im->minval) { yval = im->yorigin; } else { - yval = im->yorigin - pixie * (log10(value) - log10(im->minval)) + 0.5; + yval = im->yorigin - pixie * (log10(value) - log10(im->minval)); } } /* make sure we don't return anything too unreasonable. GD lib can get terribly slow when drawing lines outside its scope. This is especially problematic in connection with the rigid option */ if (! im->rigid) { - return (int)yval; - } else if ((int)yval > im->yorigin) { - return im->yorigin+2; - } else if ((int) yval < im->yorigin - im->ysize){ - return im->yorigin - im->ysize - 2; - } else { - return (int)yval; + /* keep yval as-is */ + } else if (yval > im->yorigin) { + yval = im->yorigin+2; + } else if (yval < im->yorigin - im->ysize){ + yval = im->yorigin - im->ysize - 2; } + return yval; } @@ -164,23 +176,28 @@ enum gf_en gf_conv(char *string){ conv_if(COMMENT,GF_COMMENT) conv_if(HRULE,GF_HRULE) conv_if(VRULE,GF_VRULE) - conv_if(LINE1,GF_LINE1) - conv_if(LINE2,GF_LINE2) - conv_if(LINE3,GF_LINE3) + conv_if(LINE,GF_LINE) conv_if(AREA,GF_AREA) conv_if(STACK,GF_STACK) - conv_if(TICK,GF_TICK) + conv_if(TICK,GF_TICK) 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); } -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) + conv_if(EPS,IF_EPS) + conv_if(PDF,IF_PDF) return (-1); } @@ -206,22 +223,32 @@ 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; } -#undef conv_if +enum text_prop_en text_prop_conv(char *string){ + + conv_if(DEFAULT,TEXT_PROP_DEFAULT) + conv_if(TITLE,TEXT_PROP_TITLE) + conv_if(AXIS,TEXT_PROP_AXIS) + conv_if(UNIT,TEXT_PROP_UNIT) + conv_if(LEGEND,TEXT_PROP_LEGEND) + return -1; +} +#undef conv_if int im_free(image_desc_t *im) { - long i,ii; + unsigned long i,ii; + if (im == NULL) return 0; - for(i=0;igdes_c;i++){ + for(i=0;i<(unsigned)im->gdes_c;i++){ if (im->gdes[i].data_first){ /* careful here, because a single pointer can occur several times */ free (im->gdes[i].data); @@ -235,6 +262,7 @@ im_free(image_desc_t *im) free (im->gdes[i].rpnp); } free(im->gdes); + gfx_destroy(im->canvas); return 0; } @@ -413,7 +441,73 @@ expand_range(image_desc_t *im) #endif } - +void +apply_gridfit(image_desc_t *im) +{ + if (isnan(im->minval) || isnan(im->maxval)) + return; + ytr(im,DNAN); + if (im->logarithmic) { + double ya, yb, ypix, ypixfrac; + double log10_range = log10(im->maxval) - log10(im->minval); + ya = pow((double)10, floor(log10(im->minval))); + while (ya < im->minval) + ya *= 10; + if (ya > im->maxval) + return; /* don't have y=10^x gridline */ + yb = ya * 10; + if (yb <= im->maxval) { + /* we have at least 2 y=10^x gridlines. + Make sure distance between them in pixels + are an integer by expanding im->maxval */ + double y_pixel_delta = ytr(im, ya) - ytr(im, yb); + double factor = y_pixel_delta / floor(y_pixel_delta); + 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 */ + log10_range = log10(im->maxval) - log10(im->minval); + } + /* make sure first y=10^x gridline is located on + integer pixel position by moving scale slightly + downwards (sub-pixel movement) */ + ypix = ytr(im, ya) + im->ysize; /* add im->ysize so it always is positive */ + ypixfrac = ypix - floor(ypix); + if (ypixfrac > 0 && ypixfrac < 1) { + 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 */ + } + } else { + /* Make sure we have an integer pixel distance between + each minor gridline */ + double ypos1 = ytr(im, im->minval); + double ypos2 = ytr(im, im->minval + im->ygrid_scale.gridstep); + double y_pixel_delta = ypos1 - ypos2; + double factor = y_pixel_delta / floor(y_pixel_delta); + double new_range = factor * (im->maxval - im->minval); + 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 */ + /* make sure first minor gridline is on integer pixel y coord */ + minor_y = gridstep * floor(im->minval / gridstep); + while (minor_y < im->minval) + minor_y += gridstep; + minor_y_px = ytr(im, minor_y) + im->ysize; /* ensure > 0 by adding ysize */ + minor_y_px_frac = minor_y_px - floor(minor_y_px); + if (minor_y_px_frac > 0 && minor_y_px_frac < 1) { + double yfrac = minor_y_px_frac / im->ysize; + double range = im->maxval - im->minval; + im->minval = im->minval - yfrac * range; + im->maxval = im->maxval - yfrac * range; + ytr(im, DNAN); /* reset precalc */ + } + calc_horizontal_grid(im); /* recalc with changed im->maxval */ + } +} + /* reduce data reimplementation by Alex */ void @@ -433,60 +527,68 @@ reduce_data( (*step) = cur_step*reduce_factor; /* set new step size for reduced data */ dstptr = *data; srcptr = *data; + row_cnt = ((*end)-(*start))/cur_step; - /* We were given one extra row at the beginning of the interval. - ** We also need to return one extra row. The extra interval is - ** the one defined by the start time in both cases. It is not - ** used when graphing but maybe we can use it while reducing the - ** data. - */ - row_cnt = ((*end)-(*start))/cur_step +1; +#ifdef DEBUG +#define DEBUG_REDUCE +#endif +#ifdef DEBUG_REDUCE +printf("Reducing %lu rows with factor %i time %lu to %lu, step %lu\n", + row_cnt,reduce_factor,*start,*end,cur_step); +for (col=0;col cur_step: skip some source rows and - ** fill one destination row with NaN + /* If there is a start offset (which cannot be more than + ** one destination row), skip the appropriate number of + ** source rows and one destination row. The appropriate + ** number is what we do know (start_offset/cur_step) of + ** the new interval (*step/cur_step aka reduce_factor). */ - if (start_offset==0) { - srcptr+=(*ds_cnt); - row_cnt--; - } else if (start_offset!=cur_step) { - skiprows=((*step)-start_offset)/cur_step+1; - srcptr += ((*ds_cnt)*skiprows); +#ifdef DEBUG_REDUCE +printf("start_offset: %lu end_offset: %lu\n",start_offset,end_offset); +printf("row_cnt before: %lu\n",row_cnt); +#endif + if (start_offset) { + (*start) = (*start)-start_offset; + skiprows=reduce_factor-start_offset/cur_step; + srcptr+=skiprows* *ds_cnt; + for (col=0;col<(*ds_cnt);col++) *dstptr++ = DNAN; row_cnt-=skiprows; - for (col=0;col<(*ds_cnt);col++) *dstptr++=DNAN; } +#ifdef DEBUG_REDUCE +printf("row_cnt between: %lu\n",row_cnt); +#endif - /* If we had to alter the endtime, there won't be - ** enough data to fill the last row. This means - ** we have to skip some rows at the end + /* At the end we have some rows that are not going to be + ** used, the amount is end_offset/cur_step */ if (end_offset) { - skiprows = ((*step)-end_offset)/cur_step; + (*end) = (*end)-end_offset+(*step); + skiprows = end_offset/cur_step; row_cnt-=skiprows; } - +#ifdef DEBUG_REDUCE +printf("row_cnt after: %lu\n",row_cnt); +#endif /* Sanity check: row_cnt should be multiple of reduce_factor */ -/* if this gets triggered, something is REALY WRONG ... we die immediately */ +/* if this gets triggered, something is REALLY WRONG ... we die immediately */ if (row_cnt%reduce_factor) { printf("SANITY CHECK: %lu rows cannot be reduced by %i \n", @@ -499,7 +601,7 @@ reduce_data( ** 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; @@ -554,11 +656,22 @@ reduce_data( srcptr+=(*ds_cnt)*reduce_factor; row_cnt-=reduce_factor; } - /* If we had to alter the endtime, we didn't have enough ** source rows to fill the last row. Fill it with NaN. */ - if (end_offset!=0) for (col=0;col<(*ds_cnt);col++) *dstptr++ = DNAN; + if (end_offset) for (col=0;col<(*ds_cnt);col++) *dstptr++ = DNAN; +#ifdef DEBUG_REDUCE + row_cnt = ((*end)-(*start))/ *step; + srcptr = *data; + printf("Done reducing. Currently %lu rows, time %lu to %lu, step %lu\n", + row_cnt,*start,*end,*step); +for (col=0;colgdes_c;i++){ + for (i=0;i< (int)im->gdes_c;i++){ /* only GF_DEF elements fetch data */ if (im->gdes[i].gf != GF_DEF) continue; skip=0; /* do we have it already ?*/ - for (ii=0;iigdes[ii].gf != GF_DEF) continue; - if((strcmp(im->gdes[i].rrd,im->gdes[ii].rrd) == 0) - && (im->gdes[i].cf == im->gdes[ii].cf)){ - /* OK the data it is here already ... - * we just copy the header portion */ + if ((strcmp(im->gdes[i].rrd, im->gdes[ii].rrd) == 0) + && (im->gdes[i].cf == im->gdes[ii].cf) + && (im->gdes[i].cf_reduce == im->gdes[ii].cf_reduce) + && (im->gdes[i].start == im->gdes[ii].start) + && (im->gdes[i].end == im->gdes[ii].end) + && (im->gdes[i].step == im->gdes[ii].step)) { + /* OK, the data is already there. + ** Just copy the header portion + */ im->gdes[i].start = im->gdes[ii].start; im->gdes[i].end = im->gdes[ii].end; im->gdes[i].step = im->gdes[ii].step; @@ -611,9 +730,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, @@ -625,8 +745,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; } } @@ -702,6 +822,30 @@ data_calc( image_desc_t *im){ * so CDEFs can use VDEFs and vice versa */ 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. @@ -728,11 +872,6 @@ data_calc( image_desc_t *im){ /* Find the variables in the expression. * - VDEF variables are substituted by their values * and the opcode is changed into OP_NUMBER. -****************** -* Note to Jake: I cannot oversee the implications for your -* COMPUTE DS stuff. Please check if VDEF and COMPUTE are -* compatible (or can be made so). -****************** * - CDEF variables are analized for their step size, * the lowest common denominator of all the step * sizes of the data sources involved is calculated @@ -740,19 +879,22 @@ data_calc( image_desc_t *im){ * resulting data source. */ for(rpi=0;im->gdes[gdi].rpnp[rpi].op != OP_END;rpi++){ - if(im->gdes[gdi].rpnp[rpi].op == OP_VARIABLE){ + 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) { #if 0 -printf("DEBUG: inside CDEF '%s' processing VDEF '%s'\n", + 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: 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 = rrd_realloc(steparray, (++stepcnt+1)*sizeof(*steparray)))==NULL){ + if ((steparray = + rrd_realloc(steparray, + (++stepcnt+1)*sizeof(*steparray)))==NULL){ rrd_set_error("realloc steparray"); rpnstack_free(&rpnstack); return -1; @@ -777,8 +919,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[ptr].ds; + 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; @@ -786,11 +927,22 @@ printf("DEBUG: value from vdef is %f\n",im->gdes[ptr].vf.val); * rpncalc() function doesn't have to treat * the first case differently */ - im->gdes[gdi].rpnp[rpi].data-=im->gdes[ptr].ds_cnt; } /* if ds_cnt != 0 */ } /* 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 || + 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" " or CDEF variables are not supported"); @@ -805,7 +957,7 @@ printf("DEBUG: value from vdef is %f\n",im->gdes[ptr].vf.val); free(steparray); if((im->gdes[gdi].data = malloc(( (im->gdes[gdi].end-im->gdes[gdi].start) - / im->gdes[gdi].step +1) + / im->gdes[gdi].step) * sizeof(double)))==NULL){ rrd_set_error("malloc im->gdes[gdi].data"); rpnstack_free(&rpnstack); @@ -815,7 +967,7 @@ printf("DEBUG: value from vdef is %f\n",im->gdes[ptr].vf.val); /* Step through the new cdef results array and * calculate the values */ - for (now = im->gdes[gdi].start; + for (now = im->gdes[gdi].start + im->gdes[gdi].step; now<=im->gdes[gdi].end; now += im->gdes[gdi].step) { @@ -854,74 +1006,73 @@ data_proc( image_desc_t *im ){ unsigned long gr_time; /* memory for the processed data */ - for(i=0;igdes_c;i++){ - if((im->gdes[i].gf==GF_LINE1) || - (im->gdes[i].gf==GF_LINE2) || - (im->gdes[i].gf==GF_LINE3) || - (im->gdes[i].gf==GF_AREA) || - (im->gdes[i].gf==GF_TICK) || - (im->gdes[i].gf==GF_STACK)){ - if((im->gdes[i].p_data = malloc((im->xsize +1) + for(i=0;igdes_c;i++) { + if((im->gdes[i].gf==GF_LINE) || + (im->gdes[i].gf==GF_AREA) || + (im->gdes[i].gf==GF_TICK) || + (im->gdes[i].gf==GF_STACK)) { + if((im->gdes[i].p_data = malloc((im->xsize +1) * sizeof(rrd_value_t)))==NULL){ - rrd_set_error("malloc data_proc"); - return -1; + rrd_set_error("malloc data_proc"); + return -1; + } } - } } - - for(i=0;ixsize;i++){ + + for (i=0;ixsize;i++) { /* for each pixel */ long vidx; - gr_time = im->start+pixstep*i; /* time of the - current step */ + gr_time = im->start+pixstep*i; /* time of the current step */ paintval=0.0; - for(ii=0;iigdes_c;ii++){ - double value; - switch(im->gdes[ii].gf){ - case GF_LINE1: - case GF_LINE2: - case GF_LINE3: - case GF_AREA: + for (ii=0;iigdes_c;ii++) { + double value; + switch (im->gdes[ii].gf) { + case GF_LINE: + case GF_AREA: case GF_TICK: - paintval = 0.0; - case GF_STACK: - vidx = im->gdes[ii].vidx; - - value = - im->gdes[vidx].data[ - ((unsigned long)floor((double) - (gr_time - im->gdes[vidx].start ) - / im->gdes[vidx].step)+1) - - /* added one because data was not being aligned properly - this fixes it. We may also be having a problem in fetch ... */ - - *im->gdes[vidx].ds_cnt - +im->gdes[vidx].ds]; - - if (! isnan(value)) { - paintval += value; - im->gdes[ii].p_data[i] = paintval; - /* GF_TICK: the data values are not relevant for min and max */ - if (finite(paintval) && im->gdes[ii].gf != GF_TICK ){ - if (isnan(minval) || paintval < minval) - minval = paintval; - if (isnan(maxval) || paintval > maxval) - maxval = paintval; - } - } else { - im->gdes[ii].p_data[i] = DNAN; - } - break; - case GF_PRINT: - case GF_GPRINT: - case GF_COMMENT: - case GF_HRULE: - case GF_VRULE: - case GF_DEF: - case GF_CDEF: - case GF_VDEF: - break; + if (!im->gdes[ii].stack) + paintval = 0.0; + case GF_STACK: + value = im->gdes[ii].yrule; + if (isnan(value) || (im->gdes[ii].gf == GF_TICK)) { + /* The time of the data doesn't necessarily match + ** the time of the graph. Beware. + */ + vidx = im->gdes[ii].vidx; + 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) + / im->gdes[vidx].step) + * im->gdes[vidx].ds_cnt + + im->gdes[vidx].ds + ]; + } else { + value = DNAN; + } + }; + + if (! isnan(value)) { + paintval += value; + im->gdes[ii].p_data[i] = paintval; + /* GF_TICK: the data values are not + ** relevant for min and max + */ + if (finite(paintval) && im->gdes[ii].gf != GF_TICK ) { + if (isnan(minval) || paintval < minval) + minval = paintval; + if (isnan(maxval) || paintval > maxval) + maxval = paintval; + } + } else { + im->gdes[ii].p_data[i] = DNAN; + } + break; + default: + break; } } } @@ -935,29 +1086,33 @@ data_proc( image_desc_t *im ){ /* adjust min and max values */ if (isnan(im->minval) - || ((!im->logarithmic && !im->rigid) /* don't adjust low-end with log scale */ - && im->minval > minval)) + /* don't adjust low-end with log scale */ + || ((!im->logarithmic && !im->rigid) && im->minval > minval) + ) im->minval = minval; if (isnan(im->maxval) - || (!im->rigid - && im->maxval < maxval)){ + || (!im->rigid && im->maxval < maxval) + ) { if (im->logarithmic) im->maxval = maxval * 1.1; 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; - if (! im->logarithmic) { - im->minval *= 0.99; - } - - /* make sure min and max are not both zero */ - if (im->maxval == 0.0) { + im->maxval *= 1.01; + if (! im->logarithmic) { + im->minval *= 0.99; + } + /* make sure min and max are not both zero */ + if (im->maxval == 0.0) { im->maxval = 1.0; - } - + } } return 0; } @@ -974,7 +1129,7 @@ find_first_time( ) { struct tm tm; - tm = *localtime(&start); + localtime_r(&start, &tm); switch(baseint){ case TMT_SECOND: tm.tm_sec -= tm.tm_sec % basestep; break; @@ -1027,7 +1182,7 @@ find_next_time( { struct tm tm; time_t madetime; - tm = *localtime(¤t); + localtime_r(¤t, &tm); do { switch(baseint){ case TMT_SECOND: @@ -1052,53 +1207,6 @@ find_next_time( } -void gator( gdImagePtr gif, int x, int y){ - -/* this function puts the name of the author and the tool into the - graph. Remove if you must, but please note, that it is here, - because I would like people who look at rrdtool generated graphs to - see what was used to do it. No obviously you can also add a credit - line to your webpage or printed document, this is fine with me. But - as I have no control over this, I added the little tag in here. -*/ - -/* the fact that the text of what gets put into the graph is not - visible in the function, has lead some to think this is for - obfuscation reasons. While this is a nice side effect (I addmit), - it is not the prime reason. The prime reason is, that the font - used, is so small, that I had to hand edit the characters to ensure - readability. I could thus not use the normal gd functions to write, - but had to embed a slightly compressed bitmap version into the code. -*/ - - int li[]={0,0,1, 0,4,5, 0,8,9, 0,12,14, 0,17,17, 0,21,21, - 0,24,24, 0,34,34, 0,40,42, 0,45,45, 0,48,49, 0,52,54, - 0,61,61, 0,64,66, 0,68,70, 0,72,74, 0,76,76, 0,78,78, - 0,80,82, 0,84,85, - 1,0,0, 1,2,2, 1,4,4, 1,6,6, 1,8,8, 1,10,10, - 1,13,13, 1,16,16, 1,18,18, 1,20,20, 1,22,22, 1,24,24, - 1,34,34, 1,41,41, 1,44,44, 1,46,46, 1,48,48, 1,50,50, - 1,53,53, 1,60,60, 1,62,62, 1,64,64, 1,69,69, 1,73,73, - 1,76,76, 1,78,78, 1,80,80, 1,84,84, 1,86,86, - 2,0,1, 2,4,5, 2,8,8, 2,10,10, 2,13,13, 2,16,16, - 2,18,18, 2,20,20, 2,22,22, 2,24,24, 2,33,33, 2,41,41, - 2,44,44, 2,46,46, 2,48,49, 2,53,53, 2,60,60, 2,62,62, - 2,64,65, 2,69,69, 2,73,73, 2,76,77, 2,80,81, 2,84,85, - 3,0,0, 3,2,2, 3,4,4, 3,6,6, 3,8,8, 3,10,10, - 3,13,13, 3,16,16, 3,18,18, 3,20,20, 3,22,22, 3,24,24, - 3,32,32, 3,41,41, 3,44,44, 3,46,46, 3,48,48, 3,50,50, - 3,53,53, 3,60,60, 3,62,62, 3,64,64, 3,69,69, 3,73,73, - 3,76,76, 3,78,78, 3,80,80, 3,84,84, 3,86,86, - 4,0,0, 4,2,2, 4,4,4, 4,6,6, 4,8,9, 4,13,13, - 4,17,17, 4,21,21, 4,24,26, 4,32,32, 4,41,41, 4,45,45, - 4,48,49, 4,52,54, 4,61,61, 4,64,66, 4,69,69, 4,72,74, - 4,76,76, 4,78,78, 4,80,82, 4,84,84}; - int i,ii; - for(i=0; igdes[i].vidx; if (im->gdes[vidx].gf==GF_VDEF) { /* simply use vals */ printval = im->gdes[vidx].vf.val; + printtime = im->gdes[vidx].vf.when; } else { /* need to calculate max,min,avg etcetera */ max_ii =((im->gdes[vidx].end - im->gdes[vidx].start) @@ -1138,8 +1248,8 @@ print_calc(image_desc_t *im, char ***prdata) * im->gdes[vidx].ds_cnt); printval = DNAN; validsteps = 0; - for(ii=im->gdes[vidx].ds+im->gdes[vidx].ds_cnt; - ii < max_ii+im->gdes[vidx].ds_cnt; + for( ii=im->gdes[vidx].ds; + ii < max_ii; ii+=im->gdes[vidx].ds_cnt){ if (! finite(im->gdes[vidx].data[ii])) continue; @@ -1176,7 +1286,19 @@ print_calc(image_desc_t *im, char ***prdata) } } /* prepare printval */ - + if (!strcmp(im->gdes[i].format,"%c")) { /* VDEF time print */ + char ctime_buf[128]; /* PS: for ctime_r, must be >= 26 chars */ + 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); + (*prdata)[prlines-1] = NULL; + } else { + sprintf(im->gdes[i].legend,"%s (%lu)", + ctime_r(&printtime,ctime_buf),printtime); + graphelement = 1; + } + } else { if ((percent_s = strstr(im->gdes[i].format,"%S")) != NULL) { /* Magfact is set to -1 upon entry to print_calc. If it * is still less than 0, then we need to run auto_scale. @@ -1197,8 +1319,9 @@ print_calc(image_desc_t *im, char ***prdata) if (im->gdes[i].gf == GF_PRINT){ (*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 @@ -1206,12 +1329,11 @@ print_calc(image_desc_t *im, char ***prdata) #else sprintf((*prdata)[prlines-2],im->gdes[i].format,printval,si_symb); #endif - (*prdata)[prlines-1] = NULL; } else { /* 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 @@ -1221,11 +1343,9 @@ print_calc(image_desc_t *im, char ***prdata) #endif graphelement = 1; } + } break; - case GF_COMMENT: - case GF_LINE1: - case GF_LINE2: - case GF_LINE3: + case GF_LINE: case GF_AREA: case GF_TICK: case GF_STACK: @@ -1233,9 +1353,15 @@ 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: +#ifdef WITH_PIECHART + case GF_PART: +#endif + case GF_SHIFT: + case GF_XPORT: break; } } @@ -1248,19 +1374,18 @@ int leg_place(image_desc_t *im) { /* graph labels */ - int interleg = SmallFont->w*2; - int box = SmallFont->h*1.2; - int border = SmallFont->w*2; + int interleg = im->text_prop[TEXT_PROP_LEGEND].size*2.0; + 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; 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; @@ -1268,11 +1393,24 @@ leg_place(image_desc_t *im) for(i=0;igdes_c;i++){ fill_last = fill; + + /* hid legends for rules which are not displayed */ + + 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'; @@ -1286,18 +1424,18 @@ 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){ /* 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 += leg_cc * SmallFont->w; + 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, 0); leg_c++; } else { legspace[i]=0; @@ -1310,7 +1448,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--; @@ -1325,38 +1463,38 @@ 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->xgif - fill - 2* border) / (leg_c-1); - /* if (glue > 2 * SmallFont->w) glue = 0; */ + 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') - continue; - im->gdes[ii].legloc.x = leg_x; - im->gdes[ii].legloc.y = leg_y; - leg_x = leg_x - + strlen(im->gdes[ii].legend)*SmallFont->w - + legspace[ii] - + glue; - if (im->gdes[ii].gf != GF_GPRINT && - im->gdes[ii].gf != GF_COMMENT) - leg_x += box; - } - leg_y = leg_y + SmallFont->h*1.2; - if (prt_fctn == 's') leg_y -= SmallFont->h *0.5; + continue; /* skip empty legends */ + im->gdes[ii].leg_x = leg_x; + im->gdes[ii].leg_y = leg_y; + leg_x += + 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, 0) + + legspace[ii] + + glue; + } + 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; } } - im->ygif = leg_y+6; + im->yimg = leg_y; free(legspace); } return 0; @@ -1371,22 +1509,15 @@ leg_place(image_desc_t *im) int -horizontal_grid(gdImagePtr gif, image_desc_t *im) +calc_horizontal_grid(image_desc_t *im) { double range; double scaledrange; int pixel,i; - int sgrid,egrid; - double gridstep; - double scaledstep; - char graph_label[100]; - gdPoint polyPoints[4]; - int labfact,gridind; - int styleMinor[2],styleMajor[2]; + int gridind; int decimals, fractionals; - char labfmt[64]; - labfact=2; + im->ygrid_scale.labfact=2; gridind=-1; range = im->maxval - im->minval; scaledrange = range / im->magfact; @@ -1397,12 +1528,6 @@ horizontal_grid(gdImagePtr gif, image_desc_t *im) return 0; } - styleMinor[0] = graph_col[GRC_GRID].i; - styleMinor[1] = gdTransparent; - - styleMajor[0] = graph_col[GRC_MGRID].i; - styleMajor[1] = gdTransparent; - /* find grid spaceing */ pixel=1; if(isnan(im->ygridstep)){ @@ -1414,25 +1539,25 @@ horizontal_grid(gdImagePtr gif, image_desc_t *im) fractionals = floor(log10(range)); if(fractionals < 0) /* small amplitude. */ - sprintf(labfmt, "%%%d.%df", decimals - fractionals + 1, -fractionals + 1); + sprintf(im->ygrid_scale.labfmt, "%%%d.%df", decimals - fractionals + 1, -fractionals + 1); else - sprintf(labfmt, "%%%d.1f", decimals + 1); - gridstep = pow((double)10, (double)fractionals); - if(gridstep == 0) /* range is one -> 0.1 is reasonable scale */ - gridstep = 0.1; + sprintf(im->ygrid_scale.labfmt, "%%%d.1f", decimals + 1); + im->ygrid_scale.gridstep = pow((double)10, (double)fractionals); + 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 */ - if(range/gridstep < 5) - gridstep /= 10; - if(range/gridstep > 15) - gridstep *= 10; - if(range/gridstep > 5) { - labfact = 1; - if(range/gridstep > 8) - labfact = 2; + if(range/im->ygrid_scale.gridstep < 5) + im->ygrid_scale.gridstep /= 10; + if(range/im->ygrid_scale.gridstep > 15) + im->ygrid_scale.gridstep *= 10; + if(range/im->ygrid_scale.gridstep > 5) { + im->ygrid_scale.labfact = 1; + if(range/im->ygrid_scale.gridstep > 8) + im->ygrid_scale.labfact = 2; } else { - gridstep /= 5; - labfact = 5; + im->ygrid_scale.gridstep /= 5; + im->ygrid_scale.labfact = 5; } } else { @@ -1445,33 +1570,41 @@ horizontal_grid(gdImagePtr gif, image_desc_t *im) } for(i=0; i<4;i++) { - if (pixel * ylab[gridind].lfac[i] >= 2 * SmallFont->h) { - labfact = ylab[gridind].lfac[i]; - break; - } + if (pixel * ylab[gridind].lfac[i] >= 2 * im->text_prop[TEXT_PROP_AXIS].size) { + im->ygrid_scale.labfact = ylab[gridind].lfac[i]; + break; + } } - gridstep = ylab[gridind].grid * im->magfact; + im->ygrid_scale.gridstep = ylab[gridind].grid * im->magfact; } } else { - gridstep = im->ygridstep; - labfact = im->ylabfact; + im->ygrid_scale.gridstep = im->ygridstep; + im->ygrid_scale.labfact = im->ylabfact; } - - polyPoints[0].x=im->xorigin; - polyPoints[1].x=im->xorigin+im->xsize; - sgrid = (int)( im->minval / gridstep - 1); - egrid = (int)( im->maxval / gridstep + 1); - scaledstep = gridstep/im->magfact; + return 1; +} + +int draw_horizontal_grid(image_desc_t *im) +{ + int i; + double scaledstep; + char graph_label[100]; + double X0=im->xorigin; + double X1=im->xorigin+im->xsize; + + 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; for (i = sgrid; i <= egrid; i++){ - polyPoints[0].y=ytr(im,gridstep*i); - if ( polyPoints[0].y >= im->yorigin-im->ysize - && polyPoints[0].y <= im->yorigin) { - if(i % labfact == 0){ + 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,labfmt,scaledstep*i); + sprintf(graph_label,im->ygrid_scale.labfmt,scaledstep*i); } else { sprintf(graph_label,"%4.1f",scaledstep*i); @@ -1487,48 +1620,41 @@ horizontal_grid(gdImagePtr gif, image_desc_t *im) } } - gdImageString(gif, SmallFont, - (polyPoints[0].x - (strlen(graph_label) * - SmallFont->w)-7), - polyPoints[0].y - SmallFont->h/2+1, - (unsigned char *)graph_label, graph_col[GRC_FONT].i); - - gdImageSetStyle(gif, styleMajor, 2); - - gdImageLine(gif, polyPoints[0].x-2,polyPoints[0].y, - polyPoints[0].x+2,polyPoints[0].y,graph_col[GRC_MGRID].i); - gdImageLine(gif, polyPoints[1].x-2,polyPoints[0].y, - polyPoints[1].x+2,polyPoints[0].y,graph_col[GRC_MGRID].i); - } else { - gdImageSetStyle(gif, styleMinor, 2); - gdImageLine(gif, polyPoints[0].x-1,polyPoints[0].y, - polyPoints[0].x+1,polyPoints[0].y,graph_col[GRC_GRID].i); - gdImageLine(gif, polyPoints[1].x-1,polyPoints[0].y, - polyPoints[1].x+1,polyPoints[0].y,graph_col[GRC_GRID].i); + 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_dashed_line ( im->canvas, + X0-2,Y0, + X1+2,Y0, + MGRIDWIDTH, im->graph_col[GRC_MGRID], + im->grid_dash_on, im->grid_dash_off); + + } else if (!(im->extra_flags & NOMINOR)) { + gfx_new_dashed_line ( im->canvas, + X0-1,Y0, + X1+1,Y0, + GRIDWIDTH, im->graph_col[GRC_GRID], + im->grid_dash_on, im->grid_dash_off); + } - gdImageLine(gif, polyPoints[0].x,polyPoints[0].y, - polyPoints[1].x,polyPoints[0].y,gdStyled); } } -/* if(im->minval * im->maxval < 0){ - polyPoints[0].y=ytr(0); - gdImageLine(gif, polyPoints[0].x,polyPoints[0].y, - polyPoints[1].x,polyPoints[0].y,graph_col[GRC_MGRID].i); - } */ - return 1; } /* logaritmic horizontal grid */ int -horizontal_log_grid(gdImagePtr gif, 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]; - gdPoint polyPoints[4]; - int styleMinor[2],styleMajor[2]; + double X0,X1,Y0; double value, pixperstep, minstep; /* find grid spaceing */ @@ -1548,17 +1674,11 @@ horizontal_log_grid(gdImagePtr gif, image_desc_t *im) } pixperstep = pixpex * minstep; if(pixperstep > 5){minoridx = i;} - if(pixperstep > 2 * SmallFont->h){majoridx = i;} + if(pixperstep > 2 * im->text_prop[TEXT_PROP_LEGEND].size){majoridx = i;} } - styleMinor[0] = graph_col[GRC_GRID].i; - styleMinor[1] = gdTransparent; - - styleMajor[0] = graph_col[GRC_MGRID].i; - styleMajor[1] = gdTransparent; - - polyPoints[0].x=im->xorigin; - polyPoints[1].x=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]))); @@ -1567,16 +1687,13 @@ horizontal_log_grid(gdImagePtr gif, image_desc_t *im) if (value < im->minval) continue; i=0; while(yloglab[minoridx][++i] > 0){ - polyPoints[0].y = ytr(im,value * yloglab[minoridx][i]); - if (polyPoints[0].y <= im->yorigin - im->ysize) break; - gdImageSetStyle(gif, styleMinor, 2); - gdImageLine(gif, polyPoints[0].x-1,polyPoints[0].y, - polyPoints[0].x+1,polyPoints[0].y,graph_col[GRC_GRID].i); - gdImageLine(gif, polyPoints[1].x-1,polyPoints[0].y, - polyPoints[1].x+1,polyPoints[0].y,graph_col[GRC_GRID].i); - - gdImageLine(gif, polyPoints[0].x,polyPoints[0].y, - polyPoints[1].x,polyPoints[0].y,gdStyled); + Y0 = ytr(im,value * yloglab[minoridx][i]); + if (Y0 <= im->yorigin - im->ysize) break; + gfx_new_dashed_line ( im->canvas, + X0-1,Y0, + X1+1,Y0, + GRIDWIDTH, im->graph_col[GRC_GRID], + im->grid_dash_on, im->grid_dash_off); } } @@ -1588,22 +1705,22 @@ horizontal_log_grid(gdImagePtr gif, image_desc_t *im) if (value < im->minval) continue; i=0; while(yloglab[majoridx][++i] > 0){ - polyPoints[0].y = ytr(im,value * yloglab[majoridx][i]); - if (polyPoints[0].y <= im->yorigin - im->ysize) break; - gdImageSetStyle(gif, styleMajor, 2); - gdImageLine(gif, polyPoints[0].x-2,polyPoints[0].y, - polyPoints[0].x+2,polyPoints[0].y,graph_col[GRC_MGRID].i); - gdImageLine(gif, polyPoints[1].x-2,polyPoints[0].y, - polyPoints[1].x+2,polyPoints[0].y,graph_col[GRC_MGRID].i); - - gdImageLine(gif, polyPoints[0].x,polyPoints[0].y, - polyPoints[1].x,polyPoints[0].y,gdStyled); - sprintf(graph_label,"%3.0e",value * yloglab[majoridx][i]); - gdImageString(gif, SmallFont, - (polyPoints[0].x - (strlen(graph_label) * - SmallFont->w)-7), - polyPoints[0].y - SmallFont->h/2+1, - (unsigned char *)graph_label, graph_col[GRC_FONT].i); + Y0 = ytr(im,value * yloglab[majoridx][i]); + if (Y0 <= im->yorigin - im->ysize) break; + gfx_new_dashed_line ( im->canvas, + X0-2,Y0, + X1+2,Y0, + MGRIDWIDTH, im->graph_col[GRC_MGRID], + im->grid_dash_on, im->grid_dash_off); + + 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, + 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 ); } } return 1; @@ -1612,19 +1729,15 @@ horizontal_log_grid(gdImagePtr gif, image_desc_t *im) void vertical_grid( - gdImagePtr gif, image_desc_t *im ) { int xlab_sel; /* which sort of label and grid ? */ - time_t ti, tilab; + time_t ti, tilab, timajor; long factor; char graph_label[100]; - gdPoint polyPoints[4]; /* points for filled graph and more*/ - - /* style for grid lines */ - int styleDotted[4]; + double X0,Y0,Y1; /* points for filled graph and more*/ + struct tm tm; - /* the type of time grid is determined by finding the number of seconds per pixel in the graph */ @@ -1645,30 +1758,35 @@ vertical_grid( } /* y coords are the same for every line ... */ - polyPoints[0].y = im->yorigin; - polyPoints[1].y = im->yorigin-im->ysize; + Y0 = im->yorigin; + Y1 = im->yorigin-im->ysize; + /* paint the minor grid */ - for(ti = find_first_time(im->start, - im->xlab_user.gridtm, - im->xlab_user.gridst); - ti < im->end; - ti = find_next_time(ti,im->xlab_user.gridtm,im->xlab_user.gridst) - ){ - /* are we inside the graph ? */ - if (ti < im->start || ti > im->end) continue; - polyPoints[0].x = xtr(im,ti); - styleDotted[0] = graph_col[GRC_GRID].i; - styleDotted[1] = gdTransparent; - - gdImageSetStyle(gif, styleDotted, 2); - - gdImageLine(gif, polyPoints[0].x,polyPoints[0].y, - polyPoints[0].x,polyPoints[1].y,gdStyled); - gdImageLine(gif, polyPoints[0].x,polyPoints[0].y-1, - polyPoints[0].x,polyPoints[0].y+1,graph_col[GRC_GRID].i); - gdImageLine(gif, polyPoints[0].x,polyPoints[1].y-1, - polyPoints[0].x,polyPoints[1].y+1,graph_col[GRC_GRID].i); + if (!(im->extra_flags & NOMINOR)) + { + for(ti = find_first_time(im->start, + im->xlab_user.gridtm, + im->xlab_user.gridst), + timajor = find_first_time(im->start, + im->xlab_user.mgridtm, + im->xlab_user.mgridst); + ti < im->end; + ti = find_next_time(ti,im->xlab_user.gridtm,im->xlab_user.gridst) + ){ + /* are we inside the graph ? */ + if (ti < im->start || ti > im->end) continue; + while (timajor < ti) { + timajor = find_next_time(timajor, + im->xlab_user.mgridtm, im->xlab_user.mgridst); + } + if (ti == timajor) continue; /* skip as falls on major grid line */ + X0 = xtr(im,ti); + gfx_new_dashed_line(im->canvas,X0,Y0+1, X0,Y1-1,GRIDWIDTH, + im->graph_col[GRC_GRID], + im->grid_dash_on, im->grid_dash_off); + + } } /* paint the major grid */ @@ -1680,40 +1798,37 @@ vertical_grid( ){ /* are we inside the graph ? */ if (ti < im->start || ti > im->end) continue; - polyPoints[0].x = xtr(im,ti); - styleDotted[0] = graph_col[GRC_MGRID].i; - styleDotted[1] = gdTransparent; - gdImageSetStyle(gif, styleDotted, 2); - - gdImageLine(gif, polyPoints[0].x,polyPoints[0].y, - polyPoints[0].x,polyPoints[1].y,gdStyled); - gdImageLine(gif, polyPoints[0].x,polyPoints[0].y-2, - polyPoints[0].x,polyPoints[0].y+2,graph_col[GRC_MGRID].i); - gdImageLine(gif, polyPoints[0].x,polyPoints[1].y-2, - polyPoints[0].x,polyPoints[1].y+2,graph_col[GRC_MGRID].i); + X0 = xtr(im,ti); + gfx_new_dashed_line(im->canvas,X0,Y0+3, X0,Y1-2,MGRIDWIDTH, + im->graph_col[GRC_MGRID], + im->grid_dash_on, im->grid_dash_off); + } /* 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) ){ - int gr_pos,width; tilab= ti + im->xlab_user.precis/2; /* correct time for the label */ + /* are we inside the graph ? */ + if (tilab < im->start || tilab > im->end) continue; #if HAVE_STRFTIME - strftime(graph_label,99,im->xlab_user.stst,localtime(&tilab)); + localtime_r(&tilab, &tm); + strftime(graph_label,99,im->xlab_user.stst, &tm); #else # error "your libc has no strftime I guess we'll abort the exercise here." #endif - width=strlen(graph_label) * SmallFont->w; - gr_pos=xtr(im,tilab) - width/2; - if (gr_pos >= im->xorigin - && gr_pos + width <= im->xorigin+im->xsize) - gdImageString(gif, SmallFont, - gr_pos, polyPoints[0].y+4, - (unsigned char *)graph_label, graph_col[GRC_FONT].i); + 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, + im->tabwidth, 0.0, GFX_H_CENTER, GFX_V_TOP, + graph_label ); + } } @@ -1721,193 +1836,158 @@ vertical_grid( void axis_paint( - image_desc_t *im, - gdImagePtr gif - ) + image_desc_t *im + ) { /* draw x and y axis */ - gdImageLine(gif, im->xorigin+im->xsize,im->yorigin, - im->xorigin+im->xsize,im->yorigin-im->ysize, - graph_col[GRC_GRID].i); - - gdImageLine(gif, im->xorigin,im->yorigin-im->ysize, - im->xorigin+im->xsize,im->yorigin-im->ysize, - graph_col[GRC_GRID].i); - - gdImageLine(gif, im->xorigin-4,im->yorigin, - im->xorigin+im->xsize+4,im->yorigin, - graph_col[GRC_FONT].i); - - gdImageLine(gif, im->xorigin,im->yorigin, - im->xorigin,im->yorigin-im->ysize, - graph_col[GRC_GRID].i); + /* gfx_new_line ( im->canvas, im->xorigin+im->xsize,im->yorigin, + im->xorigin+im->xsize,im->yorigin-im->ysize, + 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_AXIS]); */ + + gfx_new_line ( im->canvas, im->xorigin-4,im->yorigin, + im->xorigin+im->xsize+4,im->yorigin, + 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_AXIS]); + /* arrow for X axis direction */ - gdImageLine(gif, im->xorigin+im->xsize+4, im->yorigin-3, im->xorigin+im->xsize+4, im->yorigin+3,graph_col[GRC_ARROW].i); - gdImageLine(gif, im->xorigin+im->xsize+4, im->yorigin-3, im->xorigin+im->xsize+9, im->yorigin,graph_col[GRC_ARROW].i); - gdImageLine(gif, im->xorigin+im->xsize+4, im->yorigin+3, im->xorigin+im->xsize+9, im->yorigin,graph_col[GRC_ARROW].i); - - /* gdImageLine(gif, im->xorigin+im->xsize-1, im->yorigin-3, im->xorigin+im->xsize-1, im->yorigin+3,graph_col[GRC_MGRID].i); - gdImageLine(gif, im->xorigin+im->xsize, im->yorigin-2, im->xorigin+im->xsize, im->yorigin+2,graph_col[GRC_MGRID].i); - gdImageLine(gif, im->xorigin+im->xsize+1, im->yorigin-2, im->xorigin+im->xsize+1, im->yorigin+2,graph_col[GRC_MGRID].i); - gdImageLine(gif, im->xorigin+im->xsize+2, im->yorigin-2, im->xorigin+im->xsize+2, im->yorigin+2,graph_col[GRC_MGRID].i); - gdImageLine(gif, im->xorigin+im->xsize+3, im->yorigin-1, im->xorigin+im->xsize+3, im->yorigin+1,graph_col[GRC_MGRID].i); - gdImageLine(gif, im->xorigin+im->xsize+4, im->yorigin-1, im->xorigin+im->xsize+4, im->yorigin+1,graph_col[GRC_MGRID].i); - gdImageLine(gif, im->xorigin+im->xsize+5, im->yorigin, im->xorigin+im->xsize+5, im->yorigin,graph_col[GRC_MGRID].i); */ - - + 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]); } void -grid_paint( - image_desc_t *im, - gdImagePtr gif - ) +grid_paint(image_desc_t *im) { long i; - int boxH=8, boxV=8; int res=0; - gdPoint polyPoints[4]; /* points for filled graph and more*/ + double X0,Y0; /* points for filled graph and more*/ + gfx_node_t *node; /* draw 3d border */ - gdImageLine(gif,0,0,im->xgif-1,0,graph_col[GRC_SHADEA].i); - gdImageLine(gif,1,1,im->xgif-2,1,graph_col[GRC_SHADEA].i); - gdImageLine(gif,0,0,0,im->ygif-1,graph_col[GRC_SHADEA].i); - gdImageLine(gif,1,1,1,im->ygif-2,graph_col[GRC_SHADEA].i); - gdImageLine(gif,im->xgif-1,0,im->xgif-1,im->ygif-1,graph_col[GRC_SHADEB].i); - gdImageLine(gif,0,im->ygif-1,im->xgif-1,im->ygif-1,graph_col[GRC_SHADEB].i); - gdImageLine(gif,im->xgif-2,1,im->xgif-2,im->ygif-2,graph_col[GRC_SHADEB].i); - gdImageLine(gif,1,im->ygif-2,im->xgif-2,im->ygif-2,graph_col[GRC_SHADEB].i); - - + 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 (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(gif, im); + vertical_grid(im); if (im->draw_y_grid == 1){ if(im->logarithmic){ - res = horizontal_log_grid(gif,im); + res = horizontal_log_grid(im); } else { - res = horizontal_grid(gif,im); + res = draw_horizontal_grid(im); } /* dont draw horizontal grid if there is no min and max val */ if (! res ) { char *nodata = "No Data found"; - gdImageString(gif, LargeFont, - im->xgif/2 - - (strlen(nodata)*LargeFont->w)/2, - (2*im->yorigin-im->ysize) / 2, - (unsigned char *)nodata, graph_col[GRC_FONT].i); + 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, + im->tabwidth, 0.0, GFX_H_CENTER, GFX_V_CENTER, + nodata ); } } - /* yaxis description */ - gdImageStringUp(gif, SmallFont, - 7, - (im->yorigin - im->ysize/2 - +(strlen(im->ylegend)*SmallFont->w)/2 ), - (unsigned char *)im->ylegend, graph_col[GRC_FONT].i); - + /* 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 */ - gdImageString(gif, LargeFont, - im->xgif/2 - - (strlen(im->title)*LargeFont->w)/2, - 8, - (unsigned char *)im->title, graph_col[GRC_FONT].i); + gfx_new_text( im->canvas, + 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) ) { - for(i=0;igdes_c;i++){ - if(im->gdes[i].legend[0] =='\0') - continue; - - if(im->gdes[i].gf != GF_GPRINT && im->gdes[i].gf != GF_COMMENT){ - - polyPoints[0].x = im->gdes[i].legloc.x; - polyPoints[0].y = im->gdes[i].legloc.y+1; - polyPoints[1].x = polyPoints[0].x+boxH; - polyPoints[2].x = polyPoints[0].x+boxH; - polyPoints[3].x = polyPoints[0].x; - polyPoints[1].y = polyPoints[0].y; - polyPoints[2].y = polyPoints[0].y+boxV; - polyPoints[3].y = polyPoints[0].y+boxV; - gdImageFilledPolygon(gif,polyPoints,4,im->gdes[i].col.i); - gdImagePolygon(gif,polyPoints,4,graph_col[GRC_FRAME].i); - - gdImageString(gif, SmallFont, - polyPoints[0].x+boxH+6, - polyPoints[0].y-1, - (unsigned char *)im->gdes[i].legend, - graph_col[GRC_FONT].i); - } else { - polyPoints[0].x = im->gdes[i].legloc.x; - polyPoints[0].y = im->gdes[i].legloc.y; - - gdImageString(gif, SmallFont, - polyPoints[0].x, - polyPoints[0].y, - (unsigned char *)im->gdes[i].legend, - graph_col[GRC_FONT].i); - } - } + 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_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); + } + } } - - - gator(gif, (int) im->xgif-5, 5); - } -gdImagePtr -MkLineBrush(image_desc_t *im,long cosel, enum gf_en typsel){ - gdImagePtr brush; - int pen; - switch (typsel){ - case GF_LINE1: - brush=gdImageCreate(1,1); - break; - case GF_LINE2: - brush=gdImageCreate(2,2); - break; - case GF_LINE3: - brush=gdImageCreate(3,3); - break; - default: - return NULL; - } - - gdImageColorTransparent(brush, - gdImageColorAllocate(brush, 0, 0, 0)); - - pen = gdImageColorAllocate(brush, - im->gdes[cosel].col.red, - im->gdes[cosel].col.green, - im->gdes[cosel].col.blue); - - switch (typsel){ - case GF_LINE1: - gdImageSetPixel(brush,0,0,pen); - break; - case GF_LINE2: - gdImageSetPixel(brush,0,0,pen); - gdImageSetPixel(brush,0,1,pen); - gdImageSetPixel(brush,1,0,pen); - gdImageSetPixel(brush,1,1,pen); - break; - case GF_LINE3: - gdImageSetPixel(brush,1,0,pen); - gdImageSetPixel(brush,0,1,pen); - gdImageSetPixel(brush,1,1,pen); - gdImageSetPixel(brush,2,1,pen); - gdImageSetPixel(brush,1,2,pen); - break; - default: - return NULL; - } - return brush; -} /***************************************************** * lazy check make sure we rely need to create this graph *****************************************************/ @@ -1915,322 +1995,598 @@ MkLineBrush(image_desc_t *im,long cosel, enum gf_en typsel){ 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; } -/* draw that picture thing ... */ -int -graph_paint(image_desc_t *im, char ***calcpr) +#ifdef WITH_PIECHART +void +pie_part(image_desc_t *im, gfx_color_t color, + double PieCenterX, double PieCenterY, double Radius, + double startangle, double endangle) { - int i,ii; - int lazy = lazy_check(im); - FILE *fo; - - /* gif stuff */ - gdImagePtr gif,brush; + 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