X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_graph.c;h=cad9963ec8695b14de73f7b88dfc184aa32d5449;hb=dd5bad7dd49cb350bca4a2585a8fceda51feb732;hp=01e174ce7cb0ed5fcdf38ed5ede01350a72cd951;hpb=db40632e1c55e32f618d14f75a8698d87cc6b974;p=rrdtool.git diff --git a/src/rrd_graph.c b/src/rrd_graph.c index 01e174c..cad9963 100644 --- a/src/rrd_graph.c +++ b/src/rrd_graph.c @@ -151,9 +151,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; } else if (yval < im->yorigin - im->ysize){ - yval = im->yorigin - im->ysize - 2; + yval = im->yorigin - im->ysize; } return yval; } @@ -886,26 +886,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; @@ -915,6 +918,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; @@ -927,8 +931,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 @@ -941,9 +945,9 @@ 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].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) @@ -1923,7 +1927,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"; @@ -1954,6 +1958,14 @@ grid_paint(image_desc_t *im) 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 ) | 0x00000066, + 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) & !(im->extra_flags & ONLY_GRAPH) ) { @@ -2442,13 +2454,13 @@ graph_paint(image_desc_t *im, char ***calcpr) } /* for */ /* ******************************************************* - ___ - | | ___ + a ___. (a,t) + | | ___ ____| | | | | |___| - -------|--------------------------------------- + -------|--t-1--t-------------------------------- - if we know the value of y at time t was a then + if we know the value at time t was a then we draw a square from t-1 to t with the value a. ********************************************************* */ @@ -2456,29 +2468,44 @@ graph_paint(image_desc_t *im, char ***calcpr) /* GF_LINE and friend */ if(stack_gf == GF_LINE ){ node = NULL; - for(ii=1;iixsize;ii++){ - if (isnan(im->gdes[i].p_data[ii])){ + for(ii=1;iixsize;ii++){ + 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 ) { - node = gfx_new_line(im->canvas, + if ( im->slopemode == 0 ){ + node = gfx_new_line(im->canvas, ii-1+im->xorigin,ytr(im,im->gdes[i].p_data[ii]), ii+im->xorigin,ytr(im,im->gdes[i].p_data[ii]), im->gdes[i].linewidth, im->gdes[i].col); + } else { + 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]), + im->gdes[i].linewidth, + im->gdes[i].col); + } } else { - gfx_add_point(node,ii-1+im->xorigin,ytr(im,im->gdes[i].p_data[ii])); + if ( im->slopemode==0 ){ + gfx_add_point(node,ii-1+im->xorigin,ytr(im,im->gdes[i].p_data[ii])); + }; gfx_add_point(node,ii+im->xorigin,ytr(im,im->gdes[i].p_data[ii])); }; } } else { - for(ii=1;iixsize;ii++){ + float ybase0 = DNAN,ytop0=DNAN; + for(ii=0;iixsize;ii++){ /* keep things simple for now, just draw these bars do not try to build a big and complex area */ float ybase,ytop; + if ( im->slopemode == 0 && ii==0){ + continue; + } if ( isnan(im->gdes[i].p_data[ii]) ) { + ybase0 = DNAN; continue; } ytop = ytr(im,im->gdes[i].p_data[ii]); @@ -2488,15 +2515,33 @@ graph_paint(image_desc_t *im, char ***calcpr) ybase = ytr(im,areazero); } if ( ybase == ytop ){ - continue; + ybase0 = DNAN; + continue; + } + /* every area has to be wound clock-wise, + so we have to make sur base remains base */ + if (ybase > ytop){ + float extra = ytop; + ytop = ybase; + ybase = extra; } - node = gfx_new_area(im->canvas, - ii-1+im->xorigin,ybase, - ii-1+im->xorigin,ytop, + if ( im->slopemode == 0){ + ybase0 = ybase; + ytop0 = ytop; + } + if ( !isnan(ybase0) ){ + node = gfx_new_area(im->canvas, + ii-1+im->xorigin,ybase0, + ii-1+im->xorigin,ytop0, ii+im->xorigin,ytop, im->gdes[i].col ); - gfx_add_point(node,ii+im->xorigin,ybase); + gfx_add_point(node, + ii+im->xorigin,ybase + ); + } + ybase0=ybase; + ytop0=ytop; } } /* else GF_LINE */ } /* if color != 0x0 */ @@ -2767,6 +2812,7 @@ rrd_graph_init(image_desc_t *im) im->gridfit = 1; im->imginfo = NULL; im->lazy = 0; + im->slopemode = 0; im->logarithmic = 0; im->ygridstep = DNAN; im->draw_x_grid = 1; @@ -2860,6 +2906,7 @@ rrd_graph_options(int argc, char *argv[],image_desc_t *im) {"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'}, @@ -2875,7 +2922,7 @@ rrd_graph_options(int argc, char *argv[],image_desc_t *im) int col_start,col_end; opt = getopt_long(argc, argv, - "s:e:x:y:v:w:h:iu:l:rb:oc:n:m:t:f:a:I:zgjFYAMX:L:S:T:NR:B:", + "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) @@ -3039,6 +3086,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))