/****************************************************************************
- * RRDtool 1.0.33 Copyright Tobias Oetiker, 1997 - 2000
+ * RRDtool 1.2rc5 Copyright by Tobi Oetiker, 1997-2005
****************************************************************************
- * rrd__graph.c make creates ne rrds
+ * rrd__graph.c produce graphs from data in rrdfiles
****************************************************************************/
-#if 0
-#include "rrd_tool.h"
-#endif
-#include <gd.h>
-#include <gdlucidan10.h>
-#include <gdlucidab12.h>
#include <sys/stat.h>
-#ifdef WIN32
+
+#include "rrd_tool.h"
+
+#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
#include <io.h>
#include <fcntl.h>
#endif
+#ifdef HAVE_TIME_H
+#include <time.h>
+#endif
+
+#ifdef HAVE_LOCALE_H
+#include <locale.h>
+#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)
+
+#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"},
/*{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"},
{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){
}
/* 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;
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;
}
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);
}
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;i<im->gdes_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);
free (im->gdes[i].rpnp);
}
free(im->gdes);
+ gfx_destroy(im->canvas);
return 0;
}
#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
** 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;
relevant rrds ... */
int
-data_fetch( image_desc_t *im )
+data_fetch(image_desc_t *im )
{
- int i,ii;
- int skip;
+ int i,ii;
+ int skip;
+
/* pull the data from the log files ... */
- for (i=0;i<im->gdes_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;ii<i;ii++){
+ for (ii=0;ii<i;ii++) {
if (im->gdes[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;
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,
}
}
- /* lets see if the required data source is realy there */
- for(ii=0;ii<im->gdes[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; }
}
* 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.
* 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;
* further save step size and data source
* count of this rra
*/
- im->gdes[gdi].rpnp[rpi].data = im->gdes[ptr].data;
+ im->gdes[gdi].rpnp[rpi].data = im->gdes[ptr].data + im->gdes[ptr].ds;
im->gdes[gdi].rpnp[rpi].step = im->gdes[ptr].step;
im->gdes[gdi].rpnp[rpi].ds_cnt = im->gdes[ptr].ds_cnt;
} /* 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");
unsigned long gr_time;
/* memory for the processed data */
- for(i=0;i<im->gdes_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;i<im->gdes_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;i<im->xsize;i++){
+
+ for (i=0;i<im->xsize;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;ii<im->gdes_c;ii++){
- double value;
- switch(im->gdes[ii].gf){
- case GF_LINE1:
- case GF_LINE2:
- case GF_LINE3:
- case GF_AREA:
+ for (ii=0;ii<im->gdes_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
- )
- ) *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;
}
}
}
/* 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;
}
)
{
struct tm tm;
- tm = *localtime(&start);
+ localtime_r(&start, &tm);
switch(baseint){
case TMT_SECOND:
tm.tm_sec -= tm.tm_sec % basestep; break;
{
struct tm tm;
time_t madetime;
- tm = *localtime(¤t);
+ localtime_r(¤t, &tm);
do {
switch(baseint){
case TMT_SECOND:
}
-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; i<DIM(li); i=i+3)
- for(ii=y+li[i+1]; ii<=y+li[i+2];ii++)
- gdImageSetPixel(gif,x-li[i],ii,graph_col[GRC_GRID].i);
-}
-
/* calculate values required for PRINT and GPRINT functions */
} /* 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(&printtime),printtime);
+ ctime_r(&printtime,ctime_buf),printtime);
(*prdata)[prlines-1] = NULL;
} else {
sprintf(im->gdes[i].legend,"%s (%lu)",
- ctime(&printtime),printtime);
+ ctime_r(&printtime,ctime_buf),printtime);
graphelement = 1;
}
} else {
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
#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
}
}
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:
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;
}
}
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;
for(i=0;i<im->gdes_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';
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;
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--;
}
- 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;
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;
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)){
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 {
}
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);
}
}
- 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 */
}
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])));
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);
}
}
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;
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 */
}
/* 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 */
){
/* 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 );
+
}
}
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;i<im->gdes_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;i<im->gdes_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
*****************************************************/
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 ... */
+#ifdef WITH_PIECHART
+void
+pie_part(image_desc_t *im, gfx_color_t color,
+ double PieCenterX, double PieCenterY, double Radius,
+ double startangle, double endangle)
+{
+ gfx_node_t *node;
+ double angle;
+ double step=M_PI/50; /* Number of iterations for the circle;
+ ** 10 is definitely too low, more than
+ ** 50 seems to be overkill
+ */
+
+ /* Strange but true: we have to work clockwise or else
+ ** anti aliasing nor transparency don't work.
+ **
+ ** This test is here to make sure we do it right, also
+ ** this makes the for...next loop more easy to implement.
+ ** The return will occur if the user enters a negative number
+ ** (which shouldn't be done according to the specs) or if the
+ ** programmers do something wrong (which, as we all know, never
+ ** happens anyway :)
+ */
+ if (endangle<startangle) return;
+
+ /* Hidden feature: Radius decreases each full circle */
+ angle=startangle;
+ while (angle>=2*M_PI) {
+ angle -= 2*M_PI;
+ Radius *= 0.8;
+ }
+
+ node=gfx_new_area(im->canvas,
+ PieCenterX+sin(startangle)*Radius,
+ PieCenterY-cos(startangle)*Radius,
+ PieCenterX,
+ PieCenterY,
+ PieCenterX+sin(endangle)*Radius,
+ PieCenterY-cos(endangle)*Radius,
+ color);
+ for (angle=endangle;angle-startangle>=step;angle-=step) {
+ gfx_add_point(node,
+ PieCenterX+sin(angle)*Radius,
+ PieCenterY-cos(angle)*Radius );
+ }
+}
+
+#endif
+
int
-graph_paint(image_desc_t *im, char ***calcpr)
+graph_size_location(image_desc_t *im, int elements
+
+#ifdef WITH_PIECHART
+, int piechart
+#endif
+
+ )
{
- int i,ii;
- int lazy = lazy_check(im);
- FILE *fo;
-
- /* gif stuff */
- gdImagePtr gif,brush;
+ /* The actual size of the image to draw is determined from
+ ** several sources. The size given on the command line is
+ ** the graph area but we need more as we have to draw labels
+ ** and other things outside the graph area
+ */
- double areazero = 0.0;
- enum gf_en stack_gf = GF_PRINT;
- graph_desc_t *lastgdes = NULL;
- gdPoint canvas[4], back[4]; /* points for canvas*/
+ /* +-+-------------------------------------------+
+ ** |l|.................title.....................|
+ ** |e+--+-------------------------------+--------+
+ ** |b| b| | |
+ ** |a| a| | pie |
+ ** |l| l| main graph area | chart |
+ ** |.| .| | area |
+ ** |t| y| | |
+ ** |r+--+-------------------------------+--------+
+ ** |e| | x-axis labels | |
+ ** |v+--+-------------------------------+--------+
+ ** | |..............legends......................|
+ ** +-+-------------------------------------------+
+ */
+ int Xvertical=0, Yvertical=0,
+ Xtitle =0, Ytitle =0,
+ Xylabel =0, Yylabel =0,
+ Xmain =0, Ymain =0,
+#ifdef WITH_PIECHART
+ Xpie =0, Ypie =0,
+#endif
+ Xxlabel =0, Yxlabel =0,
+#if 0
+ Xlegend =0, Ylegend =0,
+#endif
+ Xspacing =10, Yspacing =10;
- /* if we are lazy and there is nothing to PRINT ... quit now */
- if (lazy && im->prt_c==0) return 0;
-
- /* pull the data from the rrd files ... */
-
- if(data_fetch(im)==-1)
- return -1;
+ if (im->extra_flags & ONLY_GRAPH) {
+ im->xorigin =0;
+ im->ximg = im->xsize;
+ im->yimg = im->ysize;
+ im->yorigin = im->ysize;
+ return 0;
+ }
- /* evaluate VDEF and CDEF operations ... */
- if(data_calc(im)==-1)
- return -1;
+ if (im->ylegend[0] != '\0' ) {
+ Xvertical = im->text_prop[TEXT_PROP_UNIT].size *2;
+ Yvertical = gfx_get_text_width(im->canvas, 0,
+ im->text_prop[TEXT_PROP_UNIT].font,
+ im->text_prop[TEXT_PROP_UNIT].size,
+ im->tabwidth,im->ylegend, 0);
+ }
- /* calculate and PRINT and GPRINT definitions. We have to do it at
- * this point because it will affect the length of the legends
- * if there are no graph elements we stop here ...
- * if we are lazy, try to quit ...
- */
- i=print_calc(im,calcpr);
- if(i<0) return -1;
- if(i==0 || lazy) return 0;
- /* get actual drawing data and find min and max values*/
- if(data_proc(im)==-1)
- return -1;
+ 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,
+ im->text_prop[TEXT_PROP_TITLE].font,
+ im->text_prop[TEXT_PROP_TITLE].size,
+ im->tabwidth,
+ im->title, 0) + 2*Xspacing;
+ Ytitle = im->text_prop[TEXT_PROP_TITLE].size*2.5;
+ }
- if(!im->logarithmic){si_unit(im);} /* identify si magnitude Kilo, Mega Giga ? */
+ if (elements) {
+ Xmain=im->xsize;
+ Ymain=im->ysize;
+ if (im->draw_x_grid) {
+ Xxlabel=Xmain;
+ Yxlabel=im->text_prop[TEXT_PROP_AXIS].size *2.5;
+ }
+ if (im->draw_y_grid) {
+ Xylabel=im->text_prop[TEXT_PROP_AXIS].size *6;
+ Yylabel=Ymain;
+ }
+ }
- if(!im->rigid && ! im->logarithmic)
- expand_range(im); /* make sure the upper and lower limit are
- sensible values */
+#ifdef WITH_PIECHART
+ if (piechart) {
+ im->piesize=im->xsize<im->ysize?im->xsize:im->ysize;
+ Xpie=im->piesize;
+ Ypie=im->piesize;
+ }
+#endif
- /* init xtr and ytr */
- /* determine the actual size of the gif to draw. The size given
- on the cmdline is the graph area. But we need more as we have
- draw labels and other things outside the graph area */
+ /* Now calculate the total size. Insert some spacing where
+ desired. im->xorigin and im->yorigin need to correspond
+ with the lower left corner of the main graph area or, if
+ this one is not set, the imaginary box surrounding the
+ pie chart area. */
+ /* The legend width cannot yet be determined, as a result we
+ ** have problems adjusting the image to it. For now, we just
+ ** forget about it at all; the legend will have to fit in the
+ ** size already allocated.
+ */
+ im->ximg = Xylabel + Xmain + 2 * Xspacing;
- im->xorigin = 10 + 9 * SmallFont->w+SmallFont->h;
- xtr(im,0);
+#ifdef WITH_PIECHART
+ im->ximg += Xpie;
+#endif
- im->yorigin = 14 + im->ysize;
- ytr(im,DNAN);
+ if (Xmain) im->ximg += Xspacing;
+#ifdef WITH_PIECHART
+ if (Xpie) im->ximg += Xspacing;
+#endif
- if(im->title[0] != '\0')
- im->yorigin += (LargeFont->h+4);
+ im->xorigin = Xspacing + Xylabel;
- im->xgif=20+im->xsize + im->xorigin;
- im->ygif= im->yorigin+2*SmallFont->h;
-
- /* determine where to place the legends onto the graphics.
- and set im->ygif to match space requirements for text */
+ if (Xtitle > im->ximg) im->ximg = Xtitle;
+
+ if (Xvertical) { /* unit description */
+ im->ximg += Xvertical;
+ im->xorigin += Xvertical;
+ }
+ xtr(im,0);
+
+ /* The vertical size is interesting... we need to compare
+ ** the sum of {Ytitle, Ymain, Yxlabel, Ylegend} with Yvertical
+ ** however we need to know {Ytitle+Ymain+Yxlabel} in order to
+ ** start even thinking about Ylegend.
+ **
+ ** Do it in three portions: First calculate the inner part,
+ ** then do the legend, then adjust the total height of the img.
+ */
+
+ /* 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;
+ }
+ /* 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;
+ return -1;
- gif=gdImageCreate(im->xgif,im->ygif);
+ /* last of three steps: check total height of image */
+ if (im->yimg < Yvertical) im->yimg = Yvertical;
- gdImageInterlace(gif, im->interlaced);
-
- /* allocate colors for the screen elements */
- for(i=0;i<DIM(graph_col);i++)
- /* check for user override values */
- if(im->graph_col[i].red != -1)
- graph_col[i].i =
- gdImageColorAllocate( gif,
- im->graph_col[i].red,
- im->graph_col[i].green,
- im->graph_col[i].blue);
- else
- graph_col[i].i =
- gdImageColorAllocate( gif,
- graph_col[i].red,
- graph_col[i].green,
- graph_col[i].blue);
-
-
- /* allocate colors for the graph */
- for(i=0;i<im->gdes_c;i++)
- /* only for elements which have a color defined */
- if (im->gdes[i].col.red != -1)
- im->gdes[i].col.i =
- gdImageColorAllocate(gif,
- im->gdes[i].col.red,
- im->gdes[i].col.green,
- im->gdes[i].col.blue);
-
-
- /* the actual graph is created by going through the individual
- graph elements and then drawing them */
-
- back[0].x = 0;
- back[0].y = 0;
- back[1].x = back[0].x+im->xgif;
- back[1].y = back[0].y;
- back[2].x = back[1].x;
- back[2].y = back[0].y+im->ygif;
- back[3].x = back[0].x;
- back[3].y = back[2].y;
-
- gdImageFilledPolygon(gif,back,4,graph_col[GRC_BACK].i);
-
- canvas[0].x = im->xorigin;
- canvas[0].y = im->yorigin;
- canvas[1].x = canvas[0].x+im->xsize;
- canvas[1].y = canvas[0].y;
- canvas[2].x = canvas[1].x;
- canvas[2].y = canvas[0].y-im->ysize;
- canvas[3].x = canvas[0].x;
- canvas[3].y = canvas[2].y;
-
- gdImageFilledPolygon(gif,canvas,4,graph_col[GRC_CANVAS].i);
+#if 0
+ if (Xlegend > im->ximg) {
+ im->ximg = Xlegend;
+ /* reposition Pie */
+ }
+#endif
+
+#ifdef WITH_PIECHART
+ /* The pie is placed in the upper right hand corner,
+ ** just below the title (if any) and with sufficient
+ ** padding.
+ */
+ if (elements) {
+ im->pie_x = im->ximg - Xspacing - Xpie/2;
+ im->pie_y = im->yorigin-Ymain+Ypie/2;
+ } else {
+ im->pie_x = im->ximg/2;
+ im->pie_y = im->yorigin-Ypie/2;
+ }
+#endif
+
+ return 0;
+}
+
+/* draw that picture thing ... */
+int
+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;
+
+ double areazero = 0.0;
+ enum gf_en stack_gf = GF_PRINT;
+ graph_desc_t *lastgdes = NULL;
+
+ /* if we are lazy and there is nothing to PRINT ... quit now */
+ if (lazy && im->prt_c==0) return 0;
+
+ /* pull the data from the rrd files ... */
+
+ if(data_fetch(im)==-1)
+ return -1;
+
+ /* 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;i<im->gdes_c;i++){
+ if (im->gdes[i].gf == GF_PART) {
+ piechart=1;
+ 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
+ * if there are no graph elements we stop here ...
+ * if we are lazy, try to quit ...
+ */
+ i=print_calc(im,calcpr);
+ if(i<0) return -1;
+ 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)
+ return -1;
+
+ if(!im->logarithmic){si_unit(im);} /* identify si magnitude Kilo, Mega Giga ? */
+
+ if(!im->rigid && ! im->logarithmic)
+ expand_range(im); /* make sure the upper and lower limit are
+ sensible values */
+
+ 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
+#ifdef WITH_PIECHART
+,piechart
+#endif
+)==-1)
+ return -1;
+
+ /* the actual graph is created by going through the individual
+ graph elements and then drawing them */
+
+ node=gfx_new_area ( im->canvas,
+ 0, 0,
+ im->ximg, 0,
+ im->ximg, im->yimg,
+ im->graph_col[GRC_BACK]);
+
+ gfx_add_point(node,0, im->yimg);
+
+#ifdef WITH_PIECHART
+ if (piechart != 2) {
+#endif
+ node=gfx_new_area ( im->canvas,
+ im->xorigin, im->yorigin,
+ im->xorigin + im->xsize, im->yorigin,
+ im->xorigin + im->xsize, im->yorigin-im->ysize,
+ im->graph_col[GRC_CANVAS]);
+
+ gfx_add_point(node,im->xorigin, im->yorigin - im->ysize);
if (im->minval > 0.0)
- areazero = im->minval;
+ areazero = im->minval;
if (im->maxval < 0.0)
- areazero = im->maxval;
+ areazero = im->maxval;
+#ifdef WITH_PIECHART
+ }
+#endif
- axis_paint(im,gif);
+#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;i<im->gdes_c;i++){
-
- switch(im->gdes[i].gf){
- case GF_CDEF:
- case GF_VDEF:
- case GF_DEF:
- case GF_PRINT:
- case GF_GPRINT:
- case GF_COMMENT:
- case GF_HRULE:
- case GF_VRULE:
- break;
- case GF_TICK:
- for (ii = 0; ii < im->xsize; ii++)
- {
- if (!isnan(im->gdes[i].p_data[ii]) &&
- im->gdes[i].p_data[ii] > 0.0)
- {
- /* generate a tick */
- gdImageLine(gif, im -> xorigin + ii,
- im -> yorigin - (im -> gdes[i].yrule * im -> ysize),
- im -> xorigin + ii,
- im -> yorigin,
- im -> gdes[i].col.i);
- }
- }
- break;
- case GF_LINE1:
- case GF_LINE2:
- case GF_LINE3:
- case GF_AREA:
- stack_gf = im->gdes[i].gf;
- case GF_STACK:
- /* fix data points at oo and -oo */
- for(ii=0;ii<im->xsize;ii++){
- if (isinf(im->gdes[i].p_data[ii])){
- if (im->gdes[i].p_data[ii] > 0) {
- im->gdes[i].p_data[ii] = im->maxval ;
- } else {
- im->gdes[i].p_data[ii] = im->minval ;
- }
-
- }
+ for(i=0;i<im->gdes_c;i++){
+ switch(im->gdes[i].gf){
+ case GF_CDEF:
+ case GF_VDEF:
+ case GF_DEF:
+ case GF_PRINT:
+ case GF_GPRINT:
+ case GF_COMMENT:
+ case GF_HRULE:
+ case GF_VRULE:
+ case GF_XPORT:
+ case GF_SHIFT:
+ break;
+ case GF_TICK:
+ for (ii = 0; ii < im->xsize; ii++)
+ {
+ if (!isnan(im->gdes[i].p_data[ii]) &&
+ im->gdes[i].p_data[ii] > 0.0)
+ {
+ /* generate a tick */
+ gfx_new_line(im->canvas, im -> xorigin + ii,
+ im -> yorigin - (im -> gdes[i].yrule * im -> ysize),
+ im -> xorigin + ii,
+ im -> yorigin,
+ 1.0,
+ im -> gdes[i].col );
+ }
+ }
+ break;
+ case GF_LINE:
+ case GF_AREA:
+ stack_gf = im->gdes[i].gf;
+ case GF_STACK:
+ /* fix data points at oo and -oo */
+ for(ii=0;ii<im->xsize;ii++){
+ if (isinf(im->gdes[i].p_data[ii])){
+ if (im->gdes[i].p_data[ii] > 0) {
+ im->gdes[i].p_data[ii] = im->maxval ;
+ } else {
+ im->gdes[i].p_data[ii] = im->minval ;
+ }
+
+ }
+ } /* for */
+
+ /* *******************************************************
+ ___
+ | | ___
+ ____| | | |
+ | |___|
+ -------|---------------------------------------
+
+ if we know the value of y at time t was a then
+ we draw a square from t-1 to t with the value a.
+
+ ********************************************************* */
+ if (im->gdes[i].col != 0x0){
+ /* GF_LINE and friend */
+ if(stack_gf == GF_LINE ){
+ node = NULL;
+ for(ii=1;ii<im->xsize;ii++){
+ if (isnan(im->gdes[i].p_data[ii])){
+ node = NULL;
+ continue;
}
-
- if (im->gdes[i].col.i != -1){
- /* GF_LINE and frined */
- if(stack_gf == GF_LINE1 || stack_gf == GF_LINE2 || stack_gf == GF_LINE3 ){
- brush = MkLineBrush(im,i,stack_gf);
- gdImageSetBrush(gif, brush);
- for(ii=1;ii<im->xsize;ii++){
- if (isnan(im->gdes[i].p_data[ii-1]) ||
- isnan(im->gdes[i].p_data[ii]))
- continue;
- gdImageLine(gif,
- ii+im->xorigin-1,ytr(im,im->gdes[i].p_data[ii-1]),
+ if ( node == NULL ) {
+ node = gfx_new_line(im->canvas,
+ ii-1+im->xorigin,ytr(im,im->gdes[i].p_data[ii]),
ii+im->xorigin,ytr(im,im->gdes[i].p_data[ii]),
- gdBrushed);
-
- }
- gdImageDestroy(brush);
- }
- else
- /* GF_AREA STACK type*/
- if (im->gdes[i].gf == GF_STACK )
- for(ii=0;ii<im->xsize;ii++){
- if(isnan(im->gdes[i].p_data[ii])){
- im->gdes[i].p_data[ii] = lastgdes->p_data[ii];
- continue;
- }
-
- if (lastgdes->p_data[ii] == im->gdes[i].p_data[ii]){
- continue;
- }
- gdImageLine(gif,
- ii+im->xorigin,ytr(im,lastgdes->p_data[ii]),
- ii+im->xorigin,ytr(im,im->gdes[i].p_data[ii]),
- im->gdes[i].col.i);
- }
-
- else /* simple GF_AREA */
- for(ii=0;ii<im->xsize;ii++){
- if (isnan(im->gdes[i].p_data[ii])) {
- im->gdes[i].p_data[ii] = 0;
- continue;
- }
- gdImageLine(gif,
- ii+im->xorigin,ytr(im,areazero),
- ii+im->xorigin,ytr(im,im->gdes[i].p_data[ii]),
- im->gdes[i].col.i);
- }
- }
- lastgdes = &(im->gdes[i]);
- break;
- }
- }
-
- grid_paint(im,gif);
+ 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]));
+ gfx_add_point(node,ii+im->xorigin,ytr(im,im->gdes[i].p_data[ii]));
+ };
+
+ }
+ } else {
+ for(ii=1;ii<im->xsize;ii++){
+ /* keep things simple for now, just draw these bars
+ do not try to build a big and complex area */
+ float ybase;
+ if ( isnan(im->gdes[i].p_data[ii]) ) {
+ continue;
+ }
+ if ( im->gdes[i].stack ) {
+ ybase = ytr(im,lastgdes->p_data[ii]);
+ } else {
+ ybase = ytr(im,areazero);
+ }
+ if ( ybase == im->gdes[i].p_data[ii] ){
+ continue;
+ }
+ node = gfx_new_area(im->canvas,
+ ii-1+im->xorigin,ybase,
+ ii-1+im->xorigin,ytr(im,im->gdes[i].p_data[ii]),
+ ii+im->xorigin,ytr(im,im->gdes[i].p_data[ii]),
+ im->gdes[i].col
+ );
+ gfx_add_point(node,ii+im->xorigin,ybase);
+ }
+ } /* else GF_LINE */
+ } /* if color != 0x0 */
+ /* make sure we do not run into trouble when stacking on NaN */
+ for(ii=0;ii<im->xsize;ii++){
+ if (isnan(im->gdes[i].p_data[ii])) {
+ 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);
+ }
+ }
+ }
+ 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;
+
+ if (finite(im->gdes[i].yrule)) { /* even the fetched var can be NaN */
+ pie_part(im,im->gdes[i].col,
+ im->pie_x,im->pie_y,im->piesize*0.4,
+ M_PI*2.0*PieStart/100.0,
+ M_PI*2.0*(PieStart+im->gdes[i].yrule)/100.0);
+ 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
- /* the RULES are the last thing to paint ... */
- for(i=0;i<im->gdes_c;i++){
-
- switch(im->gdes[i].gf){
- case GF_HRULE:
- if(isnan(im->gdes[i].yrule)) { /* fetch variable */
- im->gdes[i].yrule = im->gdes[im->gdes[i].vidx].vf.val;
- };
- if(im->gdes[i].yrule >= im->minval
- && im->gdes[i].yrule <= im->maxval)
- gdImageLine(gif,
- im->xorigin,ytr(im,im->gdes[i].yrule),
- im->xorigin+im->xsize,ytr(im,im->gdes[i].yrule),
- im->gdes[i].col.i);
- break;
- case GF_VRULE:
- if(im->gdes[i].xrule == 0) { /* fetch variable */
- im->gdes[i].xrule = im->gdes[im->gdes[i].vidx].vf.when;
- };
- if(im->gdes[i].xrule >= im->start
- && im->gdes[i].xrule <= im->end)
- gdImageLine(gif,
- xtr(im,im->gdes[i].xrule),im->yorigin,
- xtr(im,im->gdes[i].xrule),im->yorigin-im->ysize,
- im->gdes[i].col.i);
- break;
- default:
- break;
- }
+ if( !(im->extra_flags & ONLY_GRAPH) )
+ axis_paint(im);
+
+ /* grid_paint also does the text */
+ if( !(im->extra_flags & ONLY_GRAPH) )
+ grid_paint(im);
+
+ /* the RULES are the last thing to paint ... */
+ for(i=0;i<im->gdes_c;i++){
+
+ switch(im->gdes[i].gf){
+ case GF_HRULE:
+ if(isnan(im->gdes[i].yrule)) { /* fetch variable */
+ im->gdes[i].yrule = im->gdes[im->gdes[i].vidx].vf.val;
+ };
+ if(im->gdes[i].yrule >= im->minval
+ && im->gdes[i].yrule <= im->maxval)
+ gfx_new_line(im->canvas,
+ im->xorigin,ytr(im,im->gdes[i].yrule),
+ im->xorigin+im->xsize,ytr(im,im->gdes[i].yrule),
+ 1.0,im->gdes[i].col);
+ break;
+ case GF_VRULE:
+ if(im->gdes[i].xrule == 0) { /* fetch variable */
+ im->gdes[i].xrule = im->gdes[im->gdes[i].vidx].vf.when;
+ };
+ if(im->gdes[i].xrule >= im->start
+ && im->gdes[i].xrule <= im->end)
+ gfx_new_line(im->canvas,
+ xtr(im,im->gdes[i].xrule),im->yorigin,
+ xtr(im,im->gdes[i].xrule),im->yorigin-im->ysize,
+ 1.0,im->gdes[i].col);
+ break;
+ default:
+ break;
}
+ }
- if (strcmp(im->graphfile,"-")==0) {
-#ifdef WIN32
- /* Change translation mode for stdout to BINARY */
- _setmode( _fileno( stdout ), O_BINARY );
+
+ if (strcmp(im->graphfile,"-")==0) {
+ fo = im->graphhandle ? im->graphhandle : stdout;
+#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
+ /* Change translation mode for stdout to 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, strerror(errno));
- return (-1);
- }
+ } else {
+ if ((fo = fopen(im->graphfile,"wb")) == NULL) {
+ rrd_set_error("Opening '%s' for write: %s",im->graphfile,
+ rrd_strerror(errno));
+ return (-1);
}
- switch (im->imgformat) {
- case IF_GIF:
- gdImageGif(gif, fo);
- break;
- case IF_PNG:
- gdImagePng(gif, fo);
- break;
- }
- if (strcmp(im->graphfile,"-") != 0)
- fclose(fo);
- gdImageDestroy(gif);
-
- return 0;
+ }
+ gfx_render (im->canvas,im->ximg,im->yimg,0x0,fo);
+ if (strcmp(im->graphfile,"-") != 0)
+ fclose(fo);
+ return 0;
}
int
gdes_alloc(image_desc_t *im){
- 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");
}
- im->gdes[im->gdes_c-1].step=def_step;
+ im->gdes[im->gdes_c-1].step=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;
im->gdes[im->gdes_c-1].end=im->end;
im->gdes[im->gdes_c-1].vname[0]='\0';
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].col.red = -1;
- im->gdes[im->gdes_c-1].col.i=-1;
+ 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;
+ im->gdes[im->gdes_c-1].yrule=DNAN;
+ im->gdes[im->gdes_c-1].xrule=0;
return 0;
}
output[outp] = '\0';
return inp;
}
-
/* Some surgery done on this function, it became ridiculously big.
** Things moved:
** - initializing now in rrd_graph_init()
** - 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()) return -1;
+ if (rrd_test_error()) {
+ im_free(&im);
+ return -1;
+ }
if (strlen(argv[optind])>=MAXPATH) {
rrd_set_error("filename (including path) too long");
+ im_free(&im);
return -1;
}
strncpy(im.graphfile,argv[optind],MAXPATH-1);
im.graphfile[MAXPATH-1]='\0';
- rrd_graph_script(argc,argv,&im);
- if (rrd_test_error()) return -1;
+ rrd_graph_script(argc,argv,&im,1);
+ if (rrd_test_error()) {
+ im_free(&im);
+ return -1;
+ }
/* Everything is now read and the actual work can start */
** Also, if needed, print a line with information about the image.
*/
- *xsize=im.xgif;
- *ysize=im.ygif;
+ *xsize=im.ximg;
+ *ysize=im.yimg;
+ *ymin=im.minval;
+ *ymax=im.maxval;
if (im.imginfo) {
char *filename;
if (!(*prdata)) {
filename--;
}
- sprintf((*prdata)[0],im.imginfo,filename,im.xgif,im.ygif);
+ sprintf((*prdata)[0],im.imginfo,filename,(long)(im.canvas->zoom*im.ximg),(long)(im.canvas->zoom*im.yimg));
}
im_free(&im);
return 0;
void
rrd_graph_init(image_desc_t *im)
{
- int i;
+ unsigned int i;
+
+#ifdef HAVE_TZSET
+ tzset();
+#endif
+#ifdef HAVE_SETLOCALE
+ setlocale(LC_TIME,"");
+#endif
im->xlab_user.minsec = -1;
- im->xgif=0;
- im->ygif=0;
+ im->ximg=0;
+ im->yimg=0;
im->xsize = 400;
im->ysize = 100;
im->step = 0;
im->title[0] = '\0';
im->minval = DNAN;
im->maxval = DNAN;
- im->interlaced = 0;
im->unitsexponent= 9999;
im->extra_flags= 0;
im->rigid = 0;
+ im->gridfit = 1;
im->imginfo = NULL;
im->lazy = 0;
im->logarithmic = 0;
im->prt_c = 0;
im->gdes_c = 0;
im->gdes = NULL;
- im->imgformat = IF_GIF; /* we default to GIF output */
-
+ im->canvas = gfx_new_canvas();
+ im->grid_dash_on = 1;
+ im->grid_dash_off = 1;
+ im->tabwidth = 40.0;
+
for(i=0;i<DIM(graph_col);i++)
- im->graph_col[i].red=-1;
+ im->graph_col[i]=graph_col[i];
+
+#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
+ {
+ char *windir;
+ char rrd_win_default_font[1000];
+ windir = getenv("windir");
+ /* %windir% is something like D:\windows or C:\winnt */
+ if (windir != NULL) {
+ strncpy(rrd_win_default_font,windir,999);
+ rrd_win_default_font[999] = '\0';
+ strcat(rrd_win_default_font,"\\fonts\\cour.ttf");
+ for(i=0;i<DIM(text_prop);i++){
+ strncpy(text_prop[i].font,rrd_win_default_font,sizeof(text_prop[i].font)-1);
+ text_prop[i].font[sizeof(text_prop[i].font)-1] = '\0';
+ }
+ }
+#endif
+ {
+ char *deffont;
+ deffont = getenv("RRD_DEFAULT_FONT");
+ /* %windir% is something like D:\windows or C:\winnt */
+ if (deffont != NULL) {
+ for(i=0;i<DIM(text_prop);i++){
+ strncpy(text_prop[i].font,deffont,sizeof(text_prop[i].font)-1);
+ text_prop[i].font[sizeof(text_prop[i].font)-1] = '\0';
+ }
+ }
+ }
+ for(i=0;i<DIM(text_prop);i++){
+ im->text_prop[i].size = text_prop[i].size;
+ strcpy(im->text_prop[i].font,text_prop[i].font);
+ }
}
void
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;
- unsigned int col_red,col_green,col_blue;
+ struct rrd_time_value start_tv, end_tv;
+ gfx_color_t color;
parsetime("end-24h", &start_tv);
parsetime("now", &end_tv);
{"base", required_argument, 0, 'b'},
{"logarithmic",no_argument, 0, 'o'},
{"color", required_argument, 0, 'c'},
+ {"font", required_argument, 0, 'n'},
{"title", required_argument, 0, 't'},
{"imginfo", required_argument, 0, 'f'},
{"imgformat", required_argument, 0, 'a'},
{"lazy", no_argument, 0, 'z'},
+ {"zoom", required_argument, 0, 'm'},
{"no-legend", no_argument, 0, 'g'},
- {"alt-y-grid", no_argument, 0, 257 },
- {"alt-autoscale", no_argument, 0, 258 },
- {"alt-autoscale-max", no_argument, 0, 259 },
- {"units-exponent",required_argument, 0, 260},
- {"step", required_argument, 0, 261},
+ {"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'},
+ {"alt-autoscale", no_argument, 0, 'A'},
+ {"alt-autoscale-max", no_argument, 0, 'M'},
+ {"units-exponent",required_argument, 0, 'X'},
+ {"step", required_argument, 0, 'S'},
+ {"tabwidth", required_argument, 0, 'T'},
+ {"no-gridfit", no_argument, 0, 'N'},
{0,0,0,0}};
int option_index = 0;
int opt;
-
+ int col_start,col_end;
opt = getopt_long(argc, argv,
- "s:e:x:y:v:w:h:iu:l:rb:oc:t:f:a:z:g",
+ "s:e:x:y:v:w:h:iu:l:rb:oc:n:m:t:f:a:I:zgjFYAMX:S:NT:",
long_options, &option_index);
if (opt == EOF)
break;
switch(opt) {
- case 257:
+ case 'I':
+ im->extra_flags |= NOMINOR;
+ break;
+ case 'Y':
im->extra_flags |= ALTYGRID;
break;
- case 258:
+ case 'A':
im->extra_flags |= ALTAUTOSCALE;
break;
- case 259:
+ case 'M':
im->extra_flags |= ALTAUTOSCALE_MAX;
break;
+ case 'j':
+ im->extra_flags |= ONLY_GRAPH;
+ break;
case 'g':
im->extra_flags |= NOLEGEND;
break;
- case 260:
+ case 'F':
+ im->extra_flags |= FORCE_RULES_LEGEND;
+ break;
+ case 'X':
im->unitsexponent = atoi(optarg);
break;
- case 261:
+ case 'T':
+ im->tabwidth = atof(optarg);
+ break;
+ case 'S':
im->step = atoi(optarg);
break;
+ case 262:
+ im->gridfit = 0;
+ break;
case 's':
if ((parsetime_error = parsetime(optarg, &start_tv))) {
rrd_set_error( "start time: %s", parsetime_error );
&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;
}
im->ysize = long_tmp;
break;
case 'i':
- im->interlaced = 1;
+ im->canvas->interlaced = 1;
break;
case 'r':
im->rigid = 1;
im->imginfo = optarg;
break;
case 'a':
- if((im->imgformat = if_conv(optarg)) == -1) {
+ if((int)(im->canvas->imgformat = if_conv(optarg)) == -1) {
rrd_set_error("unsupported graphics format '%s'",optarg);
return;
}
if (isnan(im->minval))
im->minval=1;
break;
- case 'c':
+ case 'c':
+ if(sscanf(optarg,
+ "%10[A-Z]#%n%8lx%n",
+ col_nam,&col_start,&color,&col_end) == 2){
+ int ci;
+ int col_len = col_end - col_start;
+ switch (col_len){
+ case 6:
+ color = (color << 8) + 0xff /* shift left by 8 */;
+ break;
+ case 8:
+ break;
+ default:
+ rrd_set_error("the color format is #RRGGBB[AA]");
+ return;
+ }
+ if((ci=grc_conv(col_nam)) != -1){
+ im->graph_col[ci]=color;
+ } else {
+ rrd_set_error("invalid color name '%s'",col_nam);
+ return;
+ }
+ } else {
+ rrd_set_error("invalid color def format");
+ return;
+ }
+ break;
+ case 'n':{
+ char prop[15];
+ double size = 1;
+ char font[1024];
+
if(sscanf(optarg,
- "%10[A-Z]#%2x%2x%2x",
- col_nam,&col_red,&col_green,&col_blue) == 4){
- int ci;
- if((ci=grc_conv(col_nam)) != -1){
- im->graph_col[ci].red=col_red;
- im->graph_col[ci].green=col_green;
- im->graph_col[ci].blue=col_blue;
- } else {
- rrd_set_error("invalid color name '%s'",col_nam);
+ "%10[A-Z]:%lf:%1000s",
+ prop,&size,font) == 3){
+ int sindex;
+ if((sindex=text_prop_conv(prop)) != -1){
+ im->text_prop[sindex].size=size;
+ strcpy(im->text_prop[sindex].font,font);
+ if (sindex==0) { /* the default */
+ im->text_prop[TEXT_PROP_TITLE].size=size;
+ strcpy(im->text_prop[TEXT_PROP_TITLE].font,font);
+ im->text_prop[TEXT_PROP_AXIS].size=size;
+ strcpy(im->text_prop[TEXT_PROP_AXIS].font,font);
+ im->text_prop[TEXT_PROP_UNIT].size=size;
+ strcpy(im->text_prop[TEXT_PROP_UNIT].font,font);
+ im->text_prop[TEXT_PROP_LEGEND].size=size;
+ strcpy(im->text_prop[TEXT_PROP_LEGEND].font,font);
+ }
+ } else {
+ rrd_set_error("invalid fonttag '%s'",prop);
+ return;
}
} else {
- rrd_set_error("invalid color def format");
+ rrd_set_error("invalid text property format");
+ return;
+ }
+ break;
+ }
+ case 'm':
+ im->canvas->zoom = atof(optarg);
+ if (im->canvas->zoom <= 0.0) {
+ rrd_set_error("zoom factor must be > 0");
return;
}
- break;
+ break;
case 't':
strncpy(im->title,optarg,150);
im->title[150]='\0';
im->start = start_tmp;
im->end = end_tmp;
+ im->step = max((long)im->step, (im->end-im->start)/im->xsize);
}
int
rrd_graph_check_vname(image_desc_t *im, char *varname, char *err)
{
if ((im->gdes[im->gdes_c-1].vidx=find_var(im,varname))==-1) {
- im_free(im);
rrd_set_error("Unknown variable '%s' in %s",varname,err);
return -1;
}
return 0;
}
int
-rrd_graph_check_CF(image_desc_t *im, char *symname, char *err)
-{
- if ((im->gdes[im->gdes_c-1].cf=cf_conv(symname))==-1) {
- im_free(im);
- rrd_set_error("Unknown CF '%s' in %s",symname,err);
- return -1;
- }
- return 0;
-}
-
-void
-rrd_graph_script(int argc, char *myarg[], image_desc_t *im)
+rrd_graph_color(image_desc_t *im, char *var, char *err, int optional)
{
- int i;
- char symname[100];
- unsigned int col_red,col_green,col_blue;
- long scancount;
- int linepass = 0; /* stack can only follow directly after LINE* AREA or STACK */
-
-/* All code worked on "argv[i]", it made sense to formalize this
-** and use "arg" instead.
-**
-** The same can be said for "im->gdes[im->gdes_c-1]" which
-** has been changed into a simple "gdp".
-*/
-
- for(i=optind+1;i<argc;i++){
- char *arg=myarg[i];
- int argstart=0;
- int strstart=0;
- char varname[MAX_VNAME_LEN+1],*rpnex;
- graph_desc_t *gdp;
-
- gdes_alloc(im);
- gdp=&im->gdes[im->gdes_c-1];
-
- if(sscanf(arg,"%10[A-Z0-9]:%n",symname,&argstart)==1){
- if((gdp->gf=gf_conv(symname))==-1){
- im_free(im);
- rrd_set_error("unknown function '%s'",symname);
- return;
- }
- } else {
- rrd_set_error("can't parse '%s'",arg);
- im_free(im);
- return;
+ char *color;
+ graph_desc_t *gdp=&im->gdes[im->gdes_c-1];
+
+ color=strstr(var,"#");
+ if (color==NULL) {
+ if (optional==0) {
+ rrd_set_error("Found no color in %s",err);
+ return 0;
}
+ return 0;
+ } else {
+ int n=0;
+ char *rest;
+ gfx_color_t col;
- switch(gdp->gf){
- case GF_PRINT:
- im->prt_c++;
- case GF_GPRINT:
- strstart=0;
- sscanf(&arg[argstart], DEF_NAM_FMT ":%n"
- ,varname
- ,&strstart
- );
-
- if (strstart==0) {
- im_free(im);
- rrd_set_error("can't parse vname in '%s'",&arg[argstart]);
- return;
- };
-
- if (rrd_graph_check_vname(im,varname,arg)) return;
- else {
- int n=0;
-
- sscanf(&arg[argstart+strstart],CF_NAM_FMT ":%n"
- ,symname
- ,&n
- );
- if (im->gdes[gdp->vidx].gf==GF_VDEF) {
- /* No consolidation function should be present */
- if (n != 0) {
- rrd_set_error("(G)PRINT of VDEF needs no CF");
- im_free(im);
- return;
- }
- } else {
- /* A consolidation function should follow */
- if (n==0) {
- im_free(im);
- rrd_set_error("Missing or incorrect CF in (G)PRINTing '%s' (%s)",varname,&arg[argstart]);
- return;
- };
- if (rrd_graph_check_CF(im,symname,arg)) return;
- strstart+=n;
- };
- };
-
- scan_for_col(&arg[argstart+strstart],FMT_LEG_LEN,gdp->format);
- break;
- case GF_COMMENT:
- if(strlen(&arg[argstart])>FMT_LEG_LEN) arg[argstart+FMT_LEG_LEN-3]='\0' ;
- strcpy(gdp->legend, &arg[argstart]);
- break;
- case GF_HRULE:
- /* scan for either "HRULE:vname#..." or "HRULE:num#..."
- *
- * If a vname is used, the value NaN is set; this is catched
- * when graphing. Setting value NaN from the script is not
- * permitted
- */
- strstart=0;
- sscanf(&arg[argstart], "%lf#%n"
- ,&im->gdes[im->gdes_c-1].yrule
- ,&strstart
- );
- if (strstart==0) { /* no number, should be vname */
- sscanf(&arg[argstart], DEF_NAM_FMT "#%n"
- ,varname
- ,&strstart
- );
- if (strstart) {
- gdp->yrule = DNAN;/* signal use of vname */
- if (rrd_graph_check_vname(im,varname,arg)) return;
- if(im->gdes[gdp->vidx].gf != GF_VDEF) {
- im_free(im);
- rrd_set_error("Only VDEF is allowed in HRULE",varname);
- return;
- }
- }
- };
- if (strstart==0) {
- im_free(im);
- rrd_set_error("can't parse '%s'",&arg[argstart]);
- return;
- } else {
- int n=0;
- if(sscanf(
- &arg[argstart+strstart],
- "%2x%2x%2x:%n",
- &col_red,
- &col_green,
- &col_blue,
- &n)>=3) {
- gdp->col.red = col_red;
- gdp->col.green = col_green;
- gdp->col.blue = col_blue;
- if (n==0) {
- gdp->legend[0] = '\0';
- } else {
- scan_for_col(&arg[argstart+strstart+n],FMT_LEG_LEN,gdp->legend);
- }
- } else {
- im_free(im);
- rrd_set_error("can't parse '%s'",&arg[argstart]);
- return;
- }
- }
-
- break;
- case GF_VRULE:
- /* scan for either "VRULE:vname#..." or "VRULE:num#..."
- *
- * If a vname is used, the value 0 is set; this is catched
- * when graphing. Setting value 0 from the script is not
- * permitted
- */
- strstart=0;
- sscanf(&arg[argstart], "%lu#%n"
- ,(long unsigned int *)&gdp->xrule,&strstart);
- if (strstart==0) { /* no number, should be vname */
- sscanf(&arg[argstart], DEF_NAM_FMT "#%n"
- ,varname
- ,&strstart
- );
- if (strstart!=0) { /* vname matched */
- gdp->xrule = 0;/* signal use of vname */
- if (rrd_graph_check_vname(im,varname,arg)) return;
- if(im->gdes[gdp->vidx].gf != GF_VDEF) {
- im_free(im);
- rrd_set_error("Only VDEF is allowed in VRULE",varname);
- return;
- }
- }
- } else {
- if (gdp->xrule==0)
- strstart=0;
- }
-
- if (strstart==0) {
- im_free(im);
- rrd_set_error("can't parse '%s'",&arg[argstart]);
- return;
- } else {
- int n=0;
- if(sscanf(
- &arg[argstart+strstart],
- "%2x%2x%2x:%n",
- &col_red,
- &col_green,
- &col_blue,
- &n)>=3) {
- gdp->col.red = col_red;
- gdp->col.green = col_green;
- gdp->col.blue = col_blue;
- if (n==0) {
- gdp->legend[0] = '\0';
- } else {
- scan_for_col(&arg[argstart+strstart+n],FMT_LEG_LEN,gdp->legend);
- }
- } else {
- im_free(im);
- rrd_set_error("can't parse '%s'",&arg[argstart]);
- return;
- }
- }
- break;
- case GF_TICK:
- if((scancount=sscanf(
- &arg[argstart],
- "%29[^:#]#%2x%2x%2x:%lf:%n",
- varname,
- &col_red,
- &col_green,
- &col_blue,
- &(gdp->yrule),
- &strstart))>=1)
- {
- gdp->col.red = col_red;
- gdp->col.green = col_green;
- gdp->col.blue = col_blue;
- if(strstart <= 0){
- gdp->legend[0] = '\0';
- } else {
- scan_for_col(&arg[argstart+strstart],FMT_LEG_LEN,gdp->legend);
- }
- if (rrd_graph_check_vname(im,varname,arg)) return;
- if (gdp->yrule <= 0.0 || gdp->yrule > 1.0)
- {
- im_free(im);
- rrd_set_error("Tick mark scaling factor out of range");
- return;
- }
- if (scancount < 4)
- gdp->col.red = -1;
- if (scancount < 5)
- /* default tick marks: 10% of the y-axis */
- gdp->yrule = 0.1;
+ rest=strstr(color,":");
+ if (rest!=NULL)
+ n=rest-color;
+ else
+ n=strlen(color);
- } else {
- im_free(im);
- rrd_set_error("can't parse '%s'",&arg[argstart]);
- return;
- } /* endif sscanf */
+ switch (n) {
+ case 7:
+ sscanf(color,"#%6lx%n",&col,&n);
+ col = (col << 8) + 0xff /* shift left by 8 */;
+ if (n!=7) rrd_set_error("Color problem in %s",err);
break;
- case GF_STACK:
- if(linepass == 0){
- im_free(im);
- rrd_set_error("STACK must follow AREA, LINE or STACK");
- return;
- }
- case GF_LINE1:
- case GF_LINE2:
- case GF_LINE3:
- case GF_AREA:
- linepass = 1;
- if((scancount=sscanf(
- &arg[argstart],
- "%29[^:#]#%2x%2x%2x:%n",
- varname,
- &col_red,
- &col_green,
- &col_blue,
- &strstart))>=1){
- gdp->col.red = col_red;
- gdp->col.green = col_green;
- gdp->col.blue = col_blue;
- if(strstart <= 0){
- gdp->legend[0] = '\0';
- } else {
- scan_for_col(&arg[argstart+strstart],FMT_LEG_LEN,gdp->legend);
- }
- if (rrd_graph_check_vname(im,varname,arg)) return;
- if (scancount < 4)
- gdp->col.red = -1;
- } else {
- im_free(im);
- rrd_set_error("can't parse '%s'",&arg[argstart]);
- return;
- }
- break;
- case GF_CDEF:
- if((rpnex = malloc(strlen(&arg[argstart])*sizeof(char)))==NULL){
- free(im);
- rrd_set_error("malloc for CDEF");
- return;
- }
- strstart=parse_vname1(&arg[argstart],im,"CDEF");
- argstart+=strstart;
- /* parse_vname1() did free(im) and rrd_set_error() */
- if (strstart==0) return;
-
- strstart=0;
- sscanf(&arg[argstart],"%[^: ]%n",rpnex,&strstart);
- if (strstart==0) {
- rrd_set_error("can't parse RPN in CDEF:%s=%s",
- gdp->vname,
- &arg[argstart]);
- free(im);
- return;
- }
- if((gdp->rpnp =
- rpn_parse((void*)im,rpnex,&find_var_wrapper))== NULL){
- rrd_set_error("invalid rpn expression '%s'", rpnex);
- im_free(im);
- return;
- }
- free(rpnex);
- break;
- case GF_VDEF:
- strstart=parse_vname1(&arg[argstart],im,"VDEF");
- argstart+=strstart;
- /* parse_vname1() did free(im) and rrd_set_error() */
- if (strstart==0) return;
-
- strstart=0;
- sscanf(&arg[argstart],DEF_NAM_FMT ",%n",varname,&strstart);
- if (strstart==0) {
- im_free(im);
- rrd_set_error("Cannot parse '%s' in VDEF '%s'",
- &arg[argstart],
- gdp->vname);
- return;
- }
- if (rrd_graph_check_vname(im,varname,arg)) return;
- if ( im->gdes[gdp->vidx].gf != GF_DEF
- && im->gdes[gdp->vidx].gf != GF_CDEF) {
- rrd_set_error("variable '%s' not DEF nor CDEF in VDEF '%s'",
- varname,gdp->vname);
- im_free(im);
- return;
- };
-
- /* parsed upto and including the first comma. Now
- * see what function is requested. This function
- * sets the error string.
- */
- if (vdef_parse(gdp,&arg[argstart+strstart])<0) {
- im_free(im);
- return;
- };
- break;
- case GF_DEF:
- strstart=parse_vname1(&arg[argstart],im,"DEF");
- argstart+=strstart;
- /* parse_vname1() did free(im) and rrd_set_error() */
- if (strstart==0) return;
-
- argstart+=scan_for_col(&arg[argstart],MAXPATH,gdp->rrd);
- if(sscanf(&arg[argstart], ":" DS_NAM_FMT ":" CF_NAM_FMT,
- gdp->ds_nam, symname) != 2){
- im_free(im);
- rrd_set_error("can't parse DEF '%s' -2",&arg[argstart]);
- return;
- }
-
- if (rrd_graph_check_CF(im,symname,arg)) return;
- break;
+ case 9:
+ sscanf(color,"#%8lx%n",&col,&n);
+ if (n==9) break;
+ default:
+ rrd_set_error("Color problem in %s",err);
}
- }
-
- if (im->gdes_c==0){
- rrd_set_error("can't make a graph without contents");
- im_free(im);
- return;
+ if (rrd_test_error()) return 0;
+ gdp->col = col;
+ return n;
}
}
int bad_format(char *fmt) {
- char *ptr;
-
- ptr = fmt;
- while (*ptr != '\0') {
- if (*ptr == '%') {ptr++;
- if (*ptr == '\0') return 1;
- while ((*ptr >= '0' && *ptr <= '9') || *ptr == '.') {
- ptr++;
- }
- if (*ptr == '\0') return 1;
- if (*ptr == 'l') {
- ptr++;
- if (*ptr == '\0') return 1;
- if (*ptr == 'e' || *ptr == 'f') {
- ptr++;
- } else { return 1; }
- }
- else if (*ptr == 's' || *ptr == 'S' || *ptr == '%') { ++ptr; }
- else { return 1; }
- } else {
- ++ptr;
- }
- }
- return 0;
+ char *ptr;
+ int n=0;
+ ptr = fmt;
+ while (*ptr != '\0')
+ if (*ptr++ == '%') {
+
+ /* line cannot end with percent char */
+ if (*ptr == '\0') return 1;
+
+ /* '%s', '%S' and '%%' are allowed */
+ if (*ptr == 's' || *ptr == 'S' || *ptr == '%') ptr++;
+
+ /* or else '% 6.2lf' and such are allowed */
+ else {
+
+ /* optional padding character */
+ if (*ptr == ' ' || *ptr == '+' || *ptr == '-') ptr++;
+
+ /* This should take care of 'm.n' with all three optional */
+ while (*ptr >= '0' && *ptr <= '9') ptr++;
+ if (*ptr == '.') ptr++;
+ while (*ptr >= '0' && *ptr <= '9') ptr++;
+
+ /* Either 'le', 'lf' or 'lg' must follow here */
+ if (*ptr++ != 'l') return 1;
+ if (*ptr == 'e' || *ptr == 'f' || *ptr == 'g') ptr++;
+ else return 1;
+ n++;
+ }
+ }
+
+ return (n!=1);
}
+
+
int
vdef_parse(gdes,str)
struct graph_desc_t *gdes;
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'"
};
return 0;
}
+
+
int
vdef_calc(im,gdi)
image_desc_t *im;
field = (steps-1)*dst->vf.param/100;
dst->vf.val = array[field];
dst->vf.when = 0; /* no time component */
+ free(array);
#if 0
for(step=0;step<steps;step++)
printf("DEBUG: %3li:%10.2f %c\n",step,array[step],step==field?'*':' ');
projects / rrdtool.git / blobdiff