#include "rrd_tool.h"
#endif
-#include <gd.h>
-#include <gdlucidan10.h>
-#include <gdlucidab12.h>
#include <sys/stat.h>
#ifdef WIN32
#include <io.h>
#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
+#define RRD_DEFAULT_FONT "/usr/share/fonts/truetype/openoffice/ariosor.ttf"
+/* #define RRD_DEFAULT_FONT "/usr/share/fonts/truetype/Arial.ttf" */
#endif
+
+text_prop_t text_prop[] = {
+ { 10.0, RRD_DEFAULT_FONT }, /* default */
+ { 12.0, RRD_DEFAULT_FONT }, /* title */
+ { 8.0, RRD_DEFAULT_FONT }, /* axis */
+ { 10.0, RRD_DEFAULT_FONT }, /* unit */
+ { 10.0, RRD_DEFAULT_FONT } /* legend */
+};
+
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 */
+ 0x909090FF, /* grid */
+ 0xE05050FF, /* major grid */
+ 0x000000FF, /* font */
+ 0x000000FF, /* frame */
+ 0xFF0000FF /* arrow */
};
-/* 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
ytr(image_desc_t *im, double value){
static double pixie;
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)
return -1;
}
+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
)
{
- char *symbol[] = {"a", /* 10e-18 Ato */
+ char *symbol[] = {"a", /* 10e-18 Atto */
"f", /* 10e-15 Femto */
"p", /* 10e-12 Pico */
"n", /* 10e-9 Nano */
"k", /* 10e3 Kilo */
"M", /* 10e6 Mega */
"G", /* 10e9 Giga */
- "T", /* 10e12 Terra */
+ "T", /* 10e12 Tera */
"P", /* 10e15 Peta */
"E"};/* 10e18 Exa */
)
{
- char symbol[] = {'a', /* 10e-18 Ato */
+ char symbol[] = {'a', /* 10e-18 Atto */
'f', /* 10e-15 Femto */
'p', /* 10e-12 Pico */
'n', /* 10e-9 Nano */
'k', /* 10e3 Kilo */
'M', /* 10e6 Mega */
'G', /* 10e9 Giga */
- 'T', /* 10e12 Terra */
+ 'T', /* 10e12 Tera */
'P', /* 10e15 Peta */
'E'};/* 10e18 Exa */
(*step) = cur_step*reduce_factor; /* set new step size for reduced data */
dstptr = *data;
srcptr = *data;
+ row_cnt = ((*end)-(*start))/cur_step;
- /* We were given one extra row at the beginning of the interval.
- ** We also need to return one extra row. The extra interval is
- ** the one defined by the start time in both cases. It is not
- ** used when graphing but maybe we can use it while reducing the
- ** data.
- */
- row_cnt = ((*end)-(*start))/cur_step +1;
+#ifdef DEBUG
+#define DEBUG_REDUCE
+#endif
+#ifdef DEBUG_REDUCE
+printf("Reducing %lu rows with factor %i time %lu to %lu, step %lu\n",
+ row_cnt,reduce_factor,*start,*end,cur_step);
+for (col=0;col<row_cnt;col++) {
+ printf("time %10lu: ",*start+(col+1)*cur_step);
+ for (i=0;i<*ds_cnt;i++)
+ printf(" %8.2e",srcptr[*ds_cnt*col+i]);
+ printf("\n");
+}
+#endif
- /* alter start and end so that they are multiples of the new steptime.
- ** End will be shifted towards the future and start will be shifted
- ** towards the past in order to include the requested interval
- */
+ /* We have to combine [reduce_factor] rows of the source
+ ** into one row for the destination. Doing this we also
+ ** need to take care to combine the correct rows. First
+ ** alter the start and end time so that they are multiples
+ ** of the new step time. We cannot reduce the amount of
+ ** time so we have to move the end towards the future and
+ ** the start towards the past.
+ */
end_offset = (*end) % (*step);
- if (end_offset) end_offset = (*step)-end_offset;
start_offset = (*start) % (*step);
- (*end) = (*end)+end_offset;
- (*start) = (*start)-start_offset;
- /* The first destination row is unknown yet it still needs
- ** to be present in the returned data. Skip it.
- ** Don't make it NaN or we might overwrite the source.
- */
- dstptr += (*ds_cnt);
-
- /* Depending on the amount of extra data needed at the
- ** start of the destination, three things can happen:
- ** -1- start_offset == 0: skip the extra source row
- ** -2- start_offset == cur_step: do nothing
- ** -3- start_offset > cur_step: skip some source rows and
- ** fill one destination row with NaN
+ /* If there is a start offset (which cannot be more than
+ ** one destination row), skip the appropriate number of
+ ** source rows and one destination row. The appropriate
+ ** number is what we do know (start_offset/cur_step) of
+ ** the new interval (*step/cur_step aka reduce_factor).
*/
- if (start_offset==0) {
- srcptr+=(*ds_cnt);
- row_cnt--;
- } else if (start_offset!=cur_step) {
- skiprows=((*step)-start_offset)/cur_step+1;
- srcptr += ((*ds_cnt)*skiprows);
+#ifdef DEBUG_REDUCE
+printf("start_offset: %lu end_offset: %lu\n",start_offset,end_offset);
+printf("row_cnt before: %lu\n",row_cnt);
+#endif
+ if (start_offset) {
+ (*start) = (*start)-start_offset;
+ skiprows=reduce_factor-start_offset/cur_step;
+ srcptr+=skiprows* *ds_cnt;
+ for (col=0;col<(*ds_cnt);col++) *dstptr++ = DNAN;
row_cnt-=skiprows;
- for (col=0;col<(*ds_cnt);col++) *dstptr++=DNAN;
}
+#ifdef DEBUG_REDUCE
+printf("row_cnt between: %lu\n",row_cnt);
+#endif
- /* If we had to alter the endtime, there won't be
- ** enough data to fill the last row. This means
- ** we have to skip some rows at the end
+ /* At the end we have some rows that are not going to be
+ ** used, the amount is end_offset/cur_step
*/
if (end_offset) {
- skiprows = ((*step)-end_offset)/cur_step;
+ (*end) = (*end)-end_offset+(*step);
+ skiprows = end_offset/cur_step;
row_cnt-=skiprows;
}
-
+#ifdef DEBUG_REDUCE
+printf("row_cnt after: %lu\n",row_cnt);
+#endif
/* Sanity check: row_cnt should be multiple of reduce_factor */
-/* if this gets triggered, something is REALY WRONG ... we die immediately */
+/* if this gets triggered, something is REALLY WRONG ... we die immediately */
if (row_cnt%reduce_factor) {
printf("SANITY CHECK: %lu rows cannot be reduced by %i \n",
srcptr+=(*ds_cnt)*reduce_factor;
row_cnt-=reduce_factor;
}
-
/* If we had to alter the endtime, we didn't have enough
** source rows to fill the last row. Fill it with NaN.
*/
- if (end_offset!=0) for (col=0;col<(*ds_cnt);col++) *dstptr++ = DNAN;
+ if (end_offset) for (col=0;col<(*ds_cnt);col++) *dstptr++ = DNAN;
+#ifdef DEBUG_REDUCE
+ row_cnt = ((*end)-(*start))/ *step;
+ srcptr = *data;
+ printf("Done reducing. Currently %lu rows, time %lu to %lu, step %lu\n",
+ row_cnt,*start,*end,*step);
+for (col=0;col<row_cnt;col++) {
+ printf("time %10lu: ",*start+(col+1)*(*step));
+ for (i=0;i<*ds_cnt;i++)
+ printf(" %8.2e",srcptr[*ds_cnt*col+i]);
+ printf("\n");
+}
+#endif
}
/* Find the variables in the expression.
* - VDEF variables are substituted by their values
* and the opcode is changed into OP_NUMBER.
-******************
-* Note to Jake: I cannot oversee the implications for your
-* COMPUTE DS stuff. Please check if VDEF and COMPUTE are
-* compatible (or can be made so).
-******************
* - CDEF variables are analized for their step size,
* the lowest common denominator of all the step
* sizes of the data sources involved is calculated
* further save step size and data source
* count of this rra
*/
- im->gdes[gdi].rpnp[rpi].data =
- im->gdes[ptr].data + im->gdes[ptr].ds;
+ im->gdes[gdi].rpnp[rpi].data = im->gdes[ptr].data;
im->gdes[gdi].rpnp[rpi].step = im->gdes[ptr].step;
im->gdes[gdi].rpnp[rpi].ds_cnt = im->gdes[ptr].ds_cnt;
* rpncalc() function doesn't have to treat
* the first case differently
*/
- im->gdes[gdi].rpnp[rpi].data-=im->gdes[ptr].ds_cnt;
} /* if ds_cnt != 0 */
} /* if OP_VARIABLE */
} /* loop through all rpi */
free(steparray);
if((im->gdes[gdi].data = malloc((
(im->gdes[gdi].end-im->gdes[gdi].start)
- / im->gdes[gdi].step +1)
+ / im->gdes[gdi].step)
* sizeof(double)))==NULL){
rrd_set_error("malloc im->gdes[gdi].data");
rpnstack_free(&rpnstack);
/* Step through the new cdef results array and
* calculate the values
*/
- for (now = im->gdes[gdi].start;
+ for (now = im->gdes[gdi].start + im->gdes[gdi].step;
now<=im->gdes[gdi].end;
now += im->gdes[gdi].step)
{
/* 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) ||
+ 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)){
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_LINE:
case GF_AREA:
case GF_TICK:
paintval = 0.0;
value =
im->gdes[vidx].data[
- ((unsigned long)floor((double)
- (gr_time - im->gdes[vidx].start )
- / im->gdes[vidx].step)+1)
-
- /* added one because data was not being aligned properly
- this fixes it. We may also be having a problem in fetch ... */
-
- *im->gdes[vidx].ds_cnt
- +im->gdes[vidx].ds];
+ ((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;
}
-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 */
{
long i,ii,validsteps;
double printval;
+ time_t printtime;
int graphelement = 0;
long vidx;
int max_ii;
vidx = im->gdes[i].vidx;
if (im->gdes[vidx].gf==GF_VDEF) { /* simply use vals */
printval = im->gdes[vidx].vf.val;
+ printtime = im->gdes[vidx].vf.when;
} else { /* need to calculate max,min,avg etcetera */
max_ii =((im->gdes[vidx].end
- im->gdes[vidx].start)
* im->gdes[vidx].ds_cnt);
printval = DNAN;
validsteps = 0;
- for(ii=im->gdes[vidx].ds+im->gdes[vidx].ds_cnt;
- ii < max_ii+im->gdes[vidx].ds_cnt;
+ for( ii=im->gdes[vidx].ds;
+ ii < max_ii;
ii+=im->gdes[vidx].ds_cnt){
if (! finite(im->gdes[vidx].data[ii]))
continue;
}
} /* prepare printval */
-
+ if (!strcmp(im->gdes[i].format,"%c")) { /* VDEF time print */
+ 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);
+ (*prdata)[prlines-1] = NULL;
+ } else {
+ sprintf(im->gdes[i].legend,"%s (%lu)",
+ ctime(&printtime),printtime);
+ graphelement = 1;
+ }
+ } else {
if ((percent_s = strstr(im->gdes[i].format,"%S")) != NULL) {
/* Magfact is set to -1 upon entry to print_calc. If it
* is still less than 0, then we need to run auto_scale.
#endif
graphelement = 1;
}
+ }
break;
case GF_COMMENT:
- case GF_LINE1:
- case GF_LINE2:
- case GF_LINE3:
+ case GF_LINE:
case GF_AREA:
case GF_TICK:
case GF_STACK:
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 box =im->text_prop[TEXT_PROP_LEGEND].size*1.5;
+ int border = im->text_prop[TEXT_PROP_LEGEND].size*2.0;
int fill=0, fill_last;
int leg_c = 0;
int leg_x = border, leg_y = im->ygif;
im->gdes[i].gf != GF_COMMENT) {
fill += box;
}
- fill += leg_cc * SmallFont->w;
+ fill += gfx_get_text_width(fill+border,im->text_prop[TEXT_PROP_LEGEND].font,
+ im->text_prop[TEXT_PROP_LEGEND].size,
+ im->tabwidth,
+ im->gdes[i].legend);
leg_c++;
} else {
legspace[i]=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; */
} else {
glue = 0;
}
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;
+ im->gdes[ii].leg_x = leg_x;
+ im->gdes[ii].leg_y = leg_y;
+ leg_x +=
+ gfx_get_text_width(leg_x,im->text_prop[TEXT_PROP_LEGEND].font,
+ im->text_prop[TEXT_PROP_LEGEND].size,
+ im->tabwidth,
+ im->gdes[i].legend)
+ + 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;
+ leg_y = leg_y + im->text_prop[TEXT_PROP_LEGEND].size*1.2;
+ if (prt_fctn == 's') leg_y -= im->text_prop[TEXT_PROP_LEGEND].size*1.2;
fill = 0;
leg_c = 0;
mark = ii;
int
-horizontal_grid(gdImagePtr gif, image_desc_t *im)
+horizontal_grid(gfx_canvas_t *canvas, image_desc_t *im)
{
double range;
double scaledrange;
double gridstep;
double scaledstep;
char graph_label[100];
- gdPoint polyPoints[4];
+ double x0,x1,y0,y1;
int labfact,gridind;
- int styleMinor[2],styleMajor[2];
int decimals, fractionals;
char labfmt[64];
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)){
}
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) {
+ labfact = ylab[gridind].lfac[i];
+ break;
+ }
}
gridstep = ylab[gridind].grid * im->magfact;
labfact = im->ylabfact;
}
- polyPoints[0].x=im->xorigin;
- polyPoints[1].x=im->xorigin+im->xsize;
+ x0=im->xorigin;
+ x1=im->xorigin+im->xsize;
+
sgrid = (int)( im->minval / gridstep - 1);
egrid = (int)( im->maxval / gridstep + 1);
scaledstep = 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) {
+ y0=ytr(im,gridstep*i);
+ if ( y0 >= im->yorigin-im->ysize
+ && y0 <= im->yorigin){
if(i % labfact == 0){
if (i==0 || im->symbol == ' ') {
if(scaledstep < 1){
}
}
- 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);
+ gfx_new_text ( 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_line ( canvas,
+ x0-2,y0,
+ x1+2,y0,
+ MGRIDWIDTH, im->graph_col[GRC_MGRID] );
+
} 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_line ( canvas,
+ x0-1,y0,
+ x1+1,y0,
+ GRIDWIDTH, im->graph_col[GRC_GRID] );
+
}
- 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(gfx_canvas_t *canvas, 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,y1;
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_line ( canvas,
+ x0-1,y0,
+ x1+1,y0,
+ GRIDWIDTH, im->graph_col[GRC_GRID] );
}
}
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_line ( canvas,
+ x0-2,y0,
+ x1+2,y0,
+ MGRIDWIDTH, im->graph_col[GRC_MGRID] );
+
+ sprintf(graph_label,"%3.0e",value * yloglab[majoridx][i]);
+ gfx_new_text ( 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,
+ gfx_canvas_t *canvas,
image_desc_t *im )
{
int xlab_sel; /* which sort of label and grid ? */
time_t ti, tilab;
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*/
+
-
/* 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,
){
/* 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);
+ x0 = xtr(im,ti);
+ gfx_new_line(canvas,x0,y0+1, x0,y1-1,GRIDWIDTH, im->graph_col[GRC_GRID]);
+
}
/* 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_line(canvas,x0,y0+2, x0,y1-2,MGRIDWIDTH, im->graph_col[GRC_MGRID]);
+
}
/* paint the labels below the graph */
for(ti = find_first_time(im->start,
ti <= im->end;
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 */
#if HAVE_STRFTIME
#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 ( 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,
+ gfx_canvas_t *canvas
+ )
{
/* 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 ( canvas, im->xorigin+im->xsize,im->yorigin,
+ im->xorigin+im->xsize,im->yorigin-im->ysize,
+ GRIDWIDTH, im->graph_col[GRC_GRID]);
+
+ gfx_new_line ( canvas, im->xorigin,im->yorigin-im->ysize,
+ im->xorigin+im->xsize,im->yorigin-im->ysize,
+ GRIDWIDTH, im->graph_col[GRC_GRID]);
+
+ gfx_new_line ( canvas, im->xorigin-4,im->yorigin,
+ im->xorigin+im->xsize+4,im->yorigin,
+ MGRIDWIDTH, im->graph_col[GRC_GRID]);
+
+ gfx_new_line ( canvas, im->xorigin,im->yorigin+4,
+ im->xorigin,im->yorigin-im->ysize-4,
+ MGRIDWIDTH, im->graph_col[GRC_GRID]);
+
/* 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 ( canvas,
+ im->xorigin+im->xsize+4, im->yorigin-3,
+ im->xorigin+im->xsize+4, im->yorigin+3,
+ im->xorigin+im->xsize+9, im->yorigin,
+ im->graph_col[GRC_ARROW]);
+
+
+
}
void
grid_paint(
image_desc_t *im,
- gdImagePtr gif
+ gfx_canvas_t *canvas
+
)
{
long i;
int boxH=8, boxV=8;
int res=0;
- gdPoint polyPoints[4]; /* points for filled graph and more*/
+ double x0,x1,x2,x3,y0,y1,y2,y3; /* 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 (canvas, 0,im->ygif, 0,0, im->xgif, 0,im->graph_col[GRC_SHADEA]);
+ gfx_add_point( node , im->xgif - 2, 2 );
+ gfx_add_point( node , 2,2 );
+ gfx_add_point( node , 2,im->ygif-2 );
+ gfx_add_point( node , 0,im->ygif );
+
+ node = gfx_new_area (canvas, 0,im->ygif, im->xgif,im->ygif, im->xgif,0,im->graph_col[GRC_SHADEB]);
+ gfx_add_point( node , im->xgif - 2, 2 );
+ gfx_add_point( node , im->xgif-2,im->ygif-2 );
+ gfx_add_point( node , 2,im->ygif-2 );
+ gfx_add_point( node , 0,im->ygif );
+
+
if (im->draw_x_grid == 1 )
- vertical_grid(gif, im);
+ vertical_grid(canvas, im);
if (im->draw_y_grid == 1){
if(im->logarithmic){
- res = horizontal_log_grid(gif,im);
+ res = horizontal_log_grid(canvas,im);
} else {
- res = horizontal_grid(gif,im);
+ res = horizontal_grid(canvas,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(canvas,im->xgif/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);
-
-
+ gfx_new_text( canvas,
+ 7, (im->yorigin - im->ysize/2),
+ im->graph_col[GRC_FONT],
+ im->text_prop[TEXT_PROP_AXIS].font,
+ im->text_prop[TEXT_PROP_AXIS].size, im->tabwidth, 270.0,
+ GFX_H_CENTER, GFX_V_CENTER,
+ im->ylegend);
+
/* graph title */
- gdImageString(gif, LargeFont,
- im->xgif/2
- - (strlen(im->title)*LargeFont->w)/2,
- 8,
- (unsigned char *)im->title, graph_col[GRC_FONT].i);
-
- /* graph labels */
- if( !(im->extra_flags & NOLEGEND) ) {
+ gfx_new_text( canvas,
+ im->xgif/2, im->text_prop[TEXT_PROP_TITLE].size*1.5,
+ 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){
+ if(im->gdes[i].legend[0] =='\0')
+ continue;
+
+ if(im->gdes[i].gf != GF_GPRINT && im->gdes[i].gf != GF_COMMENT){
+ x0 = im->gdes[i].leg_x;
+ y0 = im->gdes[i].leg_y+1.0;
+ x1 = x0+boxH;
+ x2 = x0+boxH;
+ x3 = x0;
+ y1 = y0;
+ y2 = y0+boxV;
+ y3 = y0+boxV;
+ node = gfx_new_area(canvas, x0,y0,x1,y1,x2,y2 ,im->gdes[i].col);
+ gfx_add_point ( node, x3, y3 );
+ gfx_add_point ( node, x0, y0 );
+ node = gfx_new_line(canvas, x0,y0,x1,y1 ,GRIDWIDTH, im->graph_col[GRC_FRAME]);
+ gfx_add_point ( node, x2, y2 );
+ gfx_add_point ( node, x3, y3 );
+ gfx_add_point ( node, x0, y0 );
- 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;
+ gfx_new_text ( canvas, x0+boxH+6, (y0+y2) / 2.0,
+ 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_LEFT, GFX_V_CENTER,
+ im->gdes[i].legend );
- gdImageString(gif, SmallFont,
- polyPoints[0].x,
- polyPoints[0].y,
- (unsigned char *)im->gdes[i].legend,
- graph_col[GRC_FONT].i);
- }
+ } else {
+ x0 = im->gdes[i].leg_x;
+ y0 = im->gdes[i].leg_y;
+
+ gfx_new_text ( canvas, x0, (y0+y2) / 2.0,
+ 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_LEFT, GFX_V_BOTTOM,
+ im->gdes[i].legend );
+
+ }
}
- }
-
-
- 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
*****************************************************/
return size;
}
+
/* draw that picture thing ... */
int
graph_paint(image_desc_t *im, char ***calcpr)
{
- int i,ii;
- int lazy = lazy_check(im);
- FILE *fo;
-
- /* gif stuff */
- gdImagePtr gif,brush;
-
- double areazero = 0.0;
- enum gf_en stack_gf = GF_PRINT;
- graph_desc_t *lastgdes = NULL;
- gdPoint canvas[4], back[4]; /* points for canvas*/
-
- /* 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;
-
- /* 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->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 */
-
- /* 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 */
-
-
- im->xorigin = 10 + 9 * SmallFont->w+SmallFont->h;
- xtr(im,0);
-
- im->yorigin = 14 + im->ysize;
- ytr(im,DNAN);
-
- if(im->title[0] != '\0')
- im->yorigin += (LargeFont->h+4);
-
- 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(leg_place(im)==-1)
- return -1;
-
- gif=gdImageCreate(im->xgif,im->ygif);
-
- 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 (im->minval > 0.0)
- areazero = im->minval;
- if (im->maxval < 0.0)
- areazero = im->maxval;
-
- axis_paint(im,gif);
-
- 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 ;
- }
-
- }
- }
+ int i,ii;
+ int lazy = lazy_check(im);
+ FILE *fo;
+ gfx_canvas_t *canvas;
+ 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;
+
+ /* 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->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 */
+
+ /* 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 */
+
+
+ im->xorigin = 10 + 9 * im->text_prop[TEXT_PROP_LEGEND].size;
+
+ xtr(im,0);
+
+ im->yorigin = 10 + im->ysize;
+
+ ytr(im,DNAN);
+
+ if(im->title[0] != '\0')
+ im->yorigin += im->text_prop[TEXT_PROP_TITLE].size*3+4;
+
+ im->xgif=20+im->xsize + im->xorigin;
+ im->ygif= im->yorigin+2* im->text_prop[TEXT_PROP_LEGEND].size;
+
+ /* determine where to place the legends onto the graphics.
+ and set im->ygif to match space requirements for text */
+ if(leg_place(im)==-1)
+ return -1;
- 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]),
+ canvas=gfx_new_canvas();
+
+ /* the actual graph is created by going through the individual
+ graph elements and then drawing them */
+
+ node=gfx_new_area ( canvas,
+ 0, 0,
+ im->xgif, 0,
+ im->xgif, im->ygif,
+ im->graph_col[GRC_BACK]);
+
+ gfx_add_point(node,0, im->ygif);
+
+ node=gfx_new_area ( 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;
+ if (im->maxval < 0.0)
+ areazero = im->maxval;
+
+ axis_paint(im,canvas);
+
+
+ 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 */
+ gfx_new_line(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 (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-1])
+ && ! isnan(im->gdes[i].p_data[ii])){
+ if (node == NULL){
+ node = gfx_new_line(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]),
- gdBrushed);
-
- }
- gdImageDestroy(brush);
+ im->gdes[i].linewidth,
+ im->gdes[i].col);
+ } else {
+ gfx_add_point(node,ii+im->xorigin,ytr(im,im->gdes[i].p_data[ii]));
+ }
+ } else {
+ node = NULL;
+ }
+ }
+ } else {
+ int area_start=-1;
+ node = NULL;
+ for(ii=1;ii<im->xsize;ii++){
+ /* open an area */
+ if ( ! isnan(im->gdes[i].p_data[ii-1])
+ && ! isnan(im->gdes[i].p_data[ii])){
+ if (node == NULL){
+ float ybase = 0.0;
+ if (im->gdes[i].gf == GF_STACK) {
+ ybase = ytr(im,lastgdes->p_data[ii-1]);
+ } else {
+ ybase = ytr(im,areazero);
}
- 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;
- }
- }
+ area_start = ii-1;
+ node = gfx_new_area(canvas,
+ ii-1+im->xorigin,ybase,
+ ii-1+im->xorigin,ytr(im,im->gdes[i].p_data[ii-1]),
+ ii+im->xorigin,ytr(im,im->gdes[i].p_data[ii]),
+ im->gdes[i].col
+ );
+ } else {
+ gfx_add_point(node,ii+im->xorigin,ytr(im,im->gdes[i].p_data[ii]));
+ }
+ }
+
+ if ( node != NULL && (ii+1==im->xsize || isnan(im->gdes[i].p_data[ii]) )){
+ /* GF_AREA STACK type*/
+ if (im->gdes[i].gf == GF_STACK ) {
+ int iii;
+ for (iii=ii-1;iii>area_start;iii--){
+ gfx_add_point(node,iii+im->xorigin,ytr(im,lastgdes->p_data[iii]));
+ }
+ } else {
+ gfx_add_point(node,ii+im->xorigin,ytr(im,areazero));
+ };
+ node=NULL;
+ };
+ }
+ } /* 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])) {
+ double ybase = 0.0;
+ if (lastgdes) {
+ ybase = ytr(im,lastgdes->p_data[ii-1]);
+ };
+ if (isnan(ybase) || !lastgdes ){
+ ybase = ytr(im,areazero);
+ }
+ im->gdes[i].p_data[ii] = ybase;
+ }
+ }
+ lastgdes = &(im->gdes[i]);
+ break;
+ } /* switch */
+ }
+ grid_paint(im,canvas);
+
+ /* the RULES are the last thing to paint ... */
+ for(i=0;i<im->gdes_c;i++){
- grid_paint(im,gif);
-
- /* the RULES are the last thing to paint ... */
- for(i=0;i<im->gdes_c;i++){
-
- switch(im->gdes[i].gf){
- case GF_HRULE:
-printf("DEBUG: HRULE at %f\n",im->gdes[i].yrule);
- 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;
- }
+ switch(im->gdes[i].gf){
+ case GF_HRULE:
+ printf("DEBUG: HRULE at %f\n",im->gdes[i].yrule);
+ 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(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(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) {
+
+ if (strcmp(im->graphfile,"-")==0) {
#ifdef WIN32
- /* Change translation mode for stdout to BINARY */
- _setmode( _fileno( stdout ), O_BINARY );
+ /* Change translation mode for stdout to BINARY */
+ _setmode( _fileno( stdout ), 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);
- }
+ fo = stdout;
+ } else {
+ if ((fo = fopen(im->graphfile,"wb")) == NULL) {
+ rrd_set_error("Opening '%s' for write: %s",im->graphfile,
+ 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;
+ }
+ switch (im->imgformat) {
+ case IF_GIF:
+ break;
+ case IF_PNG:
+ gfx_render_png (canvas,im->xgif,im->ygif,im->zoom,0x0,fo);
+ break;
+ }
+ if (strcmp(im->graphfile,"-") != 0)
+ fclose(fo);
+
+ gfx_destroy(canvas);
+ return 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].col = 0x0;
im->gdes[im->gdes_c-1].legend[0]='\0';
im->gdes[im->gdes_c-1].rrd[0]='\0';
im->gdes[im->gdes_c-1].ds=-1;
return inp;
}
+/* Some surgery done on this function, it became ridiculously big.
+** Things moved:
+** - initializing now in rrd_graph_init()
+** - options parsing now in rrd_graph_options()
+** - script parsing now in rrd_graph_script()
+*/
int
rrd_graph(int argc, char **argv, char ***prdata, int *xsize, int *ysize)
{
-
image_desc_t im;
- int i;
- long long_tmp;
- time_t start_tmp=0,end_tmp=0;
- char scan_gtm[12],scan_mtm[12],scan_ltm[12],col_nam[12];
- 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 */
- struct time_value start_tv, end_tv;
- char *parsetime_error = NULL;
- int stroff;
+
+ rrd_graph_init(&im);
+
+ rrd_graph_options(argc,argv,&im);
+ if (rrd_test_error()) return -1;
+
+ if (strlen(argv[optind])>=MAXPATH) {
+ rrd_set_error("filename (including path) too long");
+ 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;
+
+ /* Everything is now read and the actual work can start */
(*prdata)=NULL;
+ if (graph_paint(&im,prdata)==-1){
+ im_free(&im);
+ return -1;
+ }
- parsetime("end-24h", &start_tv);
- parsetime("now", &end_tv);
+ /* The image is generated and needs to be output.
+ ** Also, if needed, print a line with information about the image.
+ */
- im.xlab_user.minsec = -1;
- im.xgif=0;
- im.ygif=0;
- im.xsize = 400;
- im.ysize = 100;
- im.step = 0;
- im.ylegend[0] = '\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.imginfo = NULL;
- im.lazy = 0;
- im.logarithmic = 0;
- im.ygridstep = DNAN;
- im.draw_x_grid = 1;
- im.draw_y_grid = 1;
- im.base = 1000;
- im.prt_c = 0;
- im.gdes_c = 0;
- im.gdes = NULL;
- im.imgformat = IF_GIF; /* we default to GIF output */
+ *xsize=im.xgif;
+ *ysize=im.ygif;
+ if (im.imginfo) {
+ char *filename;
+ if (!(*prdata)) {
+ /* maybe prdata is not allocated yet ... lets do it now */
+ if ((*prdata = calloc(2,sizeof(char *)))==NULL) {
+ rrd_set_error("malloc imginfo");
+ return -1;
+ };
+ }
+ if(((*prdata)[0] = malloc((strlen(im.imginfo)+200+strlen(im.graphfile))*sizeof(char)))
+ ==NULL){
+ rrd_set_error("malloc imginfo");
+ return -1;
+ }
+ filename=im.graphfile+strlen(im.graphfile);
+ while(filename > im.graphfile) {
+ if (*(filename-1)=='/' || *(filename-1)=='\\' ) break;
+ filename--;
+ }
+
+ sprintf((*prdata)[0],im.imginfo,filename,(long)(im.zoom*im.xgif),(long)(im.zoom*im.ygif));
+ }
+ im_free(&im);
+ return 0;
+}
+
+void
+rrd_graph_init(image_desc_t *im)
+{
+ int i;
+
+ im->xlab_user.minsec = -1;
+ im->xgif=0;
+ im->ygif=0;
+ im->xsize = 400;
+ im->ysize = 100;
+ im->step = 0;
+ im->ylegend[0] = '\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->imginfo = NULL;
+ im->lazy = 0;
+ im->logarithmic = 0;
+ im->ygridstep = DNAN;
+ im->draw_x_grid = 1;
+ im->draw_y_grid = 1;
+ im->base = 1000;
+ im->prt_c = 0;
+ im->gdes_c = 0;
+ im->gdes = NULL;
+ im->zoom = 1.0;
+ im->imgformat = IF_GIF; /* we default to GIF output */
for(i=0;i<DIM(graph_col);i++)
- im.graph_col[i].red=-1;
-
-
+ im->graph_col[i]=graph_col[i];
+
+ for(i=0;i<DIM(text_prop);i++){
+ im->text_prop[i].size = text_prop[i].size;
+ im->text_prop[i].font = text_prop[i].font;
+ }
+}
+
+void
+rrd_graph_options(int argc, char *argv[],image_desc_t *im)
+{
+ int stroff;
+ char *parsetime_error = NULL;
+ 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;
+ gfx_color_t color;
+
+ parsetime("end-24h", &start_tv);
+ parsetime("now", &end_tv);
+
while (1){
static struct option long_options[] =
{
{"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 },
int option_index = 0;
int opt;
-
+
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:z:g",
long_options, &option_index);
if (opt == EOF)
switch(opt) {
case 257:
- im.extra_flags |= ALTYGRID;
+ im->extra_flags |= ALTYGRID;
break;
case 258:
- im.extra_flags |= ALTAUTOSCALE;
+ im->extra_flags |= ALTAUTOSCALE;
break;
case 259:
- im.extra_flags |= ALTAUTOSCALE_MAX;
+ im->extra_flags |= ALTAUTOSCALE_MAX;
break;
case 'g':
- im.extra_flags |= NOLEGEND;
+ im->extra_flags |= NOLEGEND;
break;
case 260:
- im.unitsexponent = atoi(optarg);
+ im->unitsexponent = atoi(optarg);
break;
case 261:
- im.step = atoi(optarg);
+ im->step = atoi(optarg);
break;
case 's':
if ((parsetime_error = parsetime(optarg, &start_tv))) {
rrd_set_error( "start time: %s", parsetime_error );
- return -1;
+ return;
}
break;
case 'e':
if ((parsetime_error = parsetime(optarg, &end_tv))) {
rrd_set_error( "end time: %s", parsetime_error );
- return -1;
+ return;
}
break;
case 'x':
if(strcmp(optarg,"none") == 0){
- im.draw_x_grid=0;
+ im->draw_x_grid=0;
break;
};
if(sscanf(optarg,
"%10[A-Z]:%ld:%10[A-Z]:%ld:%10[A-Z]:%ld:%ld:%n",
scan_gtm,
- &im.xlab_user.gridst,
+ &im->xlab_user.gridst,
scan_mtm,
- &im.xlab_user.mgridst,
+ &im->xlab_user.mgridst,
scan_ltm,
- &im.xlab_user.labst,
- &im.xlab_user.precis,
+ &im->xlab_user.labst,
+ &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){
+ strncpy(im->xlab_form, optarg+stroff, sizeof(im->xlab_form) - 1);
+ if((im->xlab_user.gridtm = tmt_conv(scan_gtm)) == -1){
rrd_set_error("unknown keyword %s",scan_gtm);
- return -1;
- } else if ((im.xlab_user.mgridtm = tmt_conv(scan_mtm)) == -1){
+ return;
+ } else if ((im->xlab_user.mgridtm = tmt_conv(scan_mtm)) == -1){
rrd_set_error("unknown keyword %s",scan_mtm);
- return -1;
- } else if ((im.xlab_user.labtm = tmt_conv(scan_ltm)) == -1){
+ return;
+ } else if ((im->xlab_user.labtm = tmt_conv(scan_ltm)) == -1){
rrd_set_error("unknown keyword %s",scan_ltm);
- return -1;
+ return;
}
- im.xlab_user.minsec = 1;
- im.xlab_user.stst = im.xlab_form;
+ im->xlab_user.minsec = 1;
+ im->xlab_user.stst = im->xlab_form;
} else {
rrd_set_error("invalid x-grid format");
- return -1;
+ return;
}
break;
case 'y':
if(strcmp(optarg,"none") == 0){
- im.draw_y_grid=0;
+ im->draw_y_grid=0;
break;
};
if(sscanf(optarg,
"%lf:%d",
- &im.ygridstep,
- &im.ylabfact) == 2) {
- if(im.ygridstep<=0){
+ &im->ygridstep,
+ &im->ylabfact) == 2) {
+ if(im->ygridstep<=0){
rrd_set_error("grid step must be > 0");
- return -1;
- } else if (im.ylabfact < 1){
+ return;
+ } else if (im->ylabfact < 1){
rrd_set_error("label factor must be > 0");
- return -1;
+ return;
}
} else {
rrd_set_error("invalid y-grid format");
- return -1;
+ return;
}
break;
case 'v':
- strncpy(im.ylegend,optarg,150);
- im.ylegend[150]='\0';
+ strncpy(im->ylegend,optarg,150);
+ im->ylegend[150]='\0';
break;
case 'u':
- im.maxval = atof(optarg);
+ im->maxval = atof(optarg);
break;
case 'l':
- im.minval = atof(optarg);
+ im->minval = atof(optarg);
break;
case 'b':
- im.base = atol(optarg);
- if(im.base != 1024 && im.base != 1000 ){
+ im->base = atol(optarg);
+ if(im->base != 1024 && im->base != 1000 ){
rrd_set_error("the only sensible value for base apart from 1000 is 1024");
- return -1;
+ return;
}
break;
case 'w':
long_tmp = atol(optarg);
if (long_tmp < 10) {
rrd_set_error("width below 10 pixels");
- return -1;
+ return;
}
- im.xsize = long_tmp;
+ im->xsize = long_tmp;
break;
case 'h':
long_tmp = atol(optarg);
if (long_tmp < 10) {
rrd_set_error("height below 10 pixels");
- return -1;
+ return;
}
- im.ysize = long_tmp;
+ im->ysize = long_tmp;
break;
case 'i':
- im.interlaced = 1;
+ im->interlaced = 1;
break;
case 'r':
- im.rigid = 1;
+ im->rigid = 1;
break;
case 'f':
- im.imginfo = optarg;
+ im->imginfo = optarg;
break;
case 'a':
- if((im.imgformat = if_conv(optarg)) == -1) {
+ if((im->imgformat = if_conv(optarg)) == -1) {
rrd_set_error("unsupported graphics format '%s'",optarg);
- return -1;
+ return;
}
break;
case 'z':
- im.lazy = 1;
+ im->lazy = 1;
break;
case 'o':
- im.logarithmic = 1;
- if (isnan(im.minval))
- im.minval=1;
+ im->logarithmic = 1;
+ if (isnan(im->minval))
+ im->minval=1;
break;
- case 'c':
- 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);
- }
- } else {
- rrd_set_error("invalid color def format");
- return -1;
+ case 'c':
+ if(sscanf(optarg,
+ "%10[A-Z]#%8x",
+ col_nam,&color) == 2){
+ int ci;
+ if((ci=grc_conv(col_nam)) != -1){
+ im->graph_col[ci]=color;
+ } else {
+ rrd_set_error("invalid color name '%s'",col_nam);
+ }
+ } else {
+ rrd_set_error("invalid color def format");
+ return -1;
+ }
+ break;
+ case 'n':{
+ char *prop = "";
+ double size = 1;
+ char *font = "dummy";
+
+ if(sscanf(optarg,
+ "%10[A-Z]:%lf:%s",
+ prop,&size,font) == 3){
+ int sindex;
+ if((sindex=text_prop_conv(prop)) != -1){
+ im->text_prop[sindex].size=size;
+ im->text_prop[sindex].font=font;
+
+ } else {
+ rrd_set_error("invalid color name '%s'",col_nam);
+ }
+ } else {
+ rrd_set_error("invalid text property format");
+ return;
+ }
+ break;
+ }
+ case 'm':
+ im->zoom= atof(optarg);
+ if (im->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';
+ strncpy(im->title,optarg,150);
+ im->title[150]='\0';
break;
case '?':
rrd_set_error("unknown option '%c'", optopt);
else
rrd_set_error("unknown option '%s'",argv[optind-1]);
- return -1;
+ return;
}
}
if (optind >= argc) {
rrd_set_error("missing filename");
- return -1;
+ return;
}
- if (im.logarithmic == 1 && (im.minval <= 0 || isnan(im.minval))){
+ if (im->logarithmic == 1 && (im->minval <= 0 || isnan(im->minval))){
rrd_set_error("for a logarithmic yaxis you must specify a lower-limit > 0");
- return -1;
+ return;
}
- strncpy(im.graphfile,argv[optind],MAXPATH-1);
- im.graphfile[MAXPATH-1]='\0';
-
if (proc_start_end(&start_tv,&end_tv,&start_tmp,&end_tmp) == -1){
- return -1;
+ /* error string is set in parsetime.c */
+ return;
}
if (start_tmp < 3600*24*365*10){
rrd_set_error("the first entry to fetch should be after 1980 (%ld)",start_tmp);
- return -1;
+ return;
}
if (end_tmp < start_tmp) {
rrd_set_error("start (%ld) should be less than end (%ld)",
start_tmp, end_tmp);
- return -1;
+ return;
}
- im.start = start_tmp;
- im.end = end_tmp;
-
-
- for(i=optind+1;i<argc;i++){
- int argstart=0;
- int strstart=0;
- char varname[MAX_VNAME_LEN+1],*rpnex;
- gdes_alloc(&im);
- if(sscanf(argv[i],"%10[A-Z0-9]:%n",symname,&argstart)==1){
- if((im.gdes[im.gdes_c-1].gf=gf_conv(symname))==-1){
- im_free(&im);
- rrd_set_error("unknown function '%s'",symname);
- return -1;
- }
- } else {
- rrd_set_error("can't parse '%s'",argv[i]);
- im_free(&im);
- return -1;
- }
+ im->start = start_tmp;
+ im->end = end_tmp;
+}
- /* reset linepass if a non LINE/STACK/AREA operator gets parsed
-
- if (im.gdes[im.gdes_c-1].gf != GF_LINE1 &&
- im.gdes[im.gdes_c-1].gf != GF_LINE2 &&
- im.gdes[im.gdes_c-1].gf != GF_LINE3 &&
- im.gdes[im.gdes_c-1].gf != GF_AREA &&
- im.gdes[im.gdes_c-1].gf != GF_STACK) {
- linepass = 0;
- }
+void
+rrd_graph_script(int argc, char *argv[], image_desc_t *im)
+{
+ int i;
+ char symname[100];
+ int linepass = 0; /* stack must follow LINE*, AREA or STACK */
+
+ for (i=optind+1;i<argc;i++) {
+ int argstart=0;
+ int strstart=0;
+ graph_desc_t *gdp;
+ char *line;
+ char funcname[10],vname[MAX_VNAME_LEN+1],sep[1];
+ double d;
+ double linewidth;
+ int j,k,l,m;
+
+ /* Each command is one element from *argv[], we call this "line".
+ **
+ ** Each command defines the most current gdes inside struct im.
+ ** In stead of typing "im->gdes[im->gdes_c-1]" we use "gdp".
*/
-
- switch(im.gdes[im.gdes_c-1].gf){
- case GF_PRINT:
- im.prt_c++;
- case GF_GPRINT:
- strstart=0;
- sscanf(&argv[i][argstart], DEF_NAM_FMT ":%n"
- ,varname
- ,&strstart
- );
-
- if (strstart==0) {
- im_free(&im);
- rrd_set_error("can't parse vname in '%s'",&argv[i][argstart]);
- return -1;
- };
-
- if ((im.gdes[im.gdes_c-1].vidx=find_var(&im,varname))==-1){
- im_free(&im);
- rrd_set_error("Unknown variable '%s' in (G)PRINT",varname);
- return -1;
- } else {
- int n=0;
+ gdes_alloc(im);
+ gdp=&im->gdes[im->gdes_c-1];
+ line=argv[i];
+
+ /* function:newvname=string[:ds-name:CF] for xDEF
+ ** function:vname[#color[:string]] for LINEx,AREA,STACK
+ ** function:vname#color[:num[:string]] for TICK
+ ** function:vname-or-num#color[:string] for xRULE
+ ** function:vname:CF:string for xPRINT
+ ** function:string for COMMENT
+ */
+ argstart=0;
- sscanf(&argv[i][argstart+strstart],CF_NAM_FMT ":%n"
- ,symname
- ,&n
- );
- if (im.gdes[im.gdes[im.gdes_c-1].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 -1;
- }
- } 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,&argv[i][argstart]);
- return -1;
- };
- if((im.gdes[im.gdes_c-1].cf=cf_conv(symname))==-1){
- im_free(&im);
- return -1;
- };
- strstart+=n;
- };
- };
+ sscanf(line, "%10[A-Z0-9]:%n", funcname,&argstart);
+ if (argstart==0) {
+ rrd_set_error("Cannot parse function in line: %s",line);
+ im_free(im);
+ return;
+ }
+ if(sscanf(funcname,"LINE%lf",&linewidth)){
+ im->gdes[im->gdes_c-1].gf = GF_LINE;
+ im->gdes[im->gdes_c-1].linewidth = linewidth;
+ } else {
+ if ((gdp->gf=gf_conv(funcname))==-1) {
+ rrd_set_error("'%s' is not a valid function name",funcname);
+ im_free(im);
+ return;
+ }
+ }
- scan_for_col(
- &argv[i][argstart+strstart]
- ,FMT_LEG_LEN
- ,im.gdes[im.gdes_c-1].format
- );
- break;
- case GF_COMMENT:
- if(strlen(&argv[i][argstart])>FMT_LEG_LEN) argv[i][argstart+FMT_LEG_LEN-3]='\0' ;
- strcpy(im.gdes[im.gdes_c-1].legend, &argv[i][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(&argv[i][argstart], "%lf#%n"
- ,&im.gdes[im.gdes_c-1].yrule
- ,&strstart
- );
- if (strstart==0) { /* no number, should be vname */
- sscanf(&argv[i][argstart], DEF_NAM_FMT "#%n"
- ,varname
- ,&strstart
- );
- if (strstart) {
- im.gdes[im.gdes_c-1].yrule = DNAN;/* signal use of vname */
- if((im.gdes[im.gdes_c-1].vidx=find_var(&im,varname))==-1){
- im_free(&im);
- rrd_set_error("unknown variable '%s' in HRULE",varname);
- return -1;
- }
- if(im.gdes[im.gdes[im.gdes_c-1].vidx].gf != GF_VDEF) {
- im_free(&im);
- rrd_set_error("Only VDEF is allowed in HRULE",varname);
- return -1;
- }
- }
- } else {
-printf("DEBUG: matched HRULE:num\n");
-printf("DEBUG: strstart==%i\n",strstart);
- };
- if (strstart==0) {
- im_free(&im);
- rrd_set_error("can't parse '%s'",&argv[i][argstart]);
- return -1;
- } else {
- int n=0;
- if(sscanf(
- &argv[i][argstart+strstart],
- "%2x%2x%2x:%n",
- &col_red,
- &col_green,
- &col_blue,
- &n)>=3) {
- im.gdes[im.gdes_c-1].col.red = col_red;
- im.gdes[im.gdes_c-1].col.green = col_green;
- im.gdes[im.gdes_c-1].col.blue = col_blue;
- if (n==0) {
- im.gdes[im.gdes_c-1].legend[0] = '\0';
- } else {
- scan_for_col(&argv[i][argstart+strstart+n],FMT_LEG_LEN,im.gdes[im.gdes_c-1].legend);
- }
- } else {
- im_free(&im);
- rrd_set_error("can't parse '%s'",&argv[i][argstart]);
- return -1;
+ /* If the error string is set, we exit at the end of the switch */
+ switch (gdp->gf) {
+ case GF_COMMENT:
+ if (rrd_graph_legend(gdp,&line[argstart])==0)
+ rrd_set_error("Cannot parse comment in line: %s",line);
+ break;
+ case GF_VRULE:
+ case GF_HRULE:
+ j=k=l=m=0;
+ sscanf(&line[argstart], "%lf%n#%n", &d, &j, &k);
+ sscanf(&line[argstart], DEF_NAM_FMT "%n#%n", vname, &l, &m);
+ if (k+m==0) {
+ rrd_set_error("Cannot parse name or num in line: %s",line);
+ break;
}
- }
-
- 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(&argv[i][argstart], "%lu#%n"
- ,(long unsigned int *)&im.gdes[im.gdes_c-1].xrule
- ,&strstart
- );
- if (strstart==0) { /* no number, should be vname */
- sscanf(&argv[i][argstart], DEF_NAM_FMT "#%n"
- ,varname
- ,&strstart
- );
- if (strstart!=0) { /* vname matched */
- im.gdes[im.gdes_c-1].xrule = 0;/* signal use of vname */
- if((im.gdes[im.gdes_c-1].vidx=find_var(&im,varname))==-1){
- im_free(&im);
- rrd_set_error("unknown variable '%s' in VRULE",varname);
- return -1;
- }
- if(im.gdes[im.gdes[im.gdes_c-1].vidx].gf != GF_VDEF) {
- im_free(&im);
- rrd_set_error("Only VDEF is allowed in VRULE",varname);
- return -1;
- }
+ if (j!=0) {
+ gdp->xrule=d;
+ gdp->yrule=d;
+ argstart+=j;
+ } else if (!rrd_graph_check_vname(im,vname,line)) {
+ gdp->xrule=0;
+ gdp->yrule=DNAN;
+ argstart+=l;
+ } else break; /* exit due to wrong vname */
+ if ((j=rrd_graph_color(im,&line[argstart],line,0))==0) break;
+ argstart+=j;
+ if (strlen(&line[argstart])!=0) {
+ if (rrd_graph_legend(gdp,&line[++argstart])==0)
+ rrd_set_error("Cannot parse comment in line: %s",line);
}
- } else {
- if (im.gdes[im.gdes_c-1].xrule==0)
- strstart=0;
- }
-
- if (strstart==0) {
- im_free(&im);
- rrd_set_error("can't parse '%s'",&argv[i][argstart]);
- return -1;
- } else {
- int n=0;
- if(sscanf(
- &argv[i][argstart+strstart],
- "%2x%2x%2x:%n",
- &col_red,
- &col_green,
- &col_blue,
- &n)>=3) {
- im.gdes[im.gdes_c-1].col.red = col_red;
- im.gdes[im.gdes_c-1].col.green = col_green;
- im.gdes[im.gdes_c-1].col.blue = col_blue;
- if (n==0) {
- im.gdes[im.gdes_c-1].legend[0] = '\0';
- } else {
- scan_for_col(&argv[i][argstart+strstart+n],FMT_LEG_LEN,im.gdes[im.gdes_c-1].legend);
- }
- } else {
- im_free(&im);
- rrd_set_error("can't parse '%s'",&argv[i][argstart]);
- return -1;
+ break;
+ case GF_STACK:
+ if (linepass==0) {
+ rrd_set_error("STACK must follow another graphing element");
+ break;
}
- }
- break;
- case GF_TICK:
- if((scancount=sscanf(
- &argv[i][argstart],
- "%29[^:#]#%2x%2x%2x:%lf:%n",
- varname,
- &col_red,
- &col_green,
- &col_blue,
- &(im.gdes[im.gdes_c-1].yrule),
- &strstart))>=1)
- {
- im.gdes[im.gdes_c-1].col.red = col_red;
- im.gdes[im.gdes_c-1].col.green = col_green;
- im.gdes[im.gdes_c-1].col.blue = col_blue;
- if(strstart <= 0){
- im.gdes[im.gdes_c-1].legend[0] = '\0';
- } else {
- scan_for_col(&argv[i][argstart+strstart],FMT_LEG_LEN,im.gdes[im.gdes_c-1].legend);
+ case GF_LINE:
+ case GF_AREA:
+ case GF_TICK:
+ j=k=0;
+ linepass=1;
+ sscanf(&line[argstart],DEF_NAM_FMT"%n%1[#:]%n",vname,&j,sep,&k);
+ if (j+1!=k)
+ rrd_set_error("Cannot parse vname in line: %s",line);
+ else if (rrd_graph_check_vname(im,vname,line))
+ rrd_set_error("Undefined vname '%s' in line: %s",line);
+ else
+ k=rrd_graph_color(im,&line[argstart],line,1);
+ if (rrd_test_error()) break;
+ argstart=argstart+j+k;
+ if ((strlen(&line[argstart])!=0)&&(gdp->gf==GF_TICK)) {
+ j=0;
+ sscanf(&line[argstart], ":%lf%n", &gdp->yrule,&j);
+ argstart+=j;
}
- if((im.gdes[im.gdes_c-1].vidx=find_var(&im,varname))==-1){
- im_free(&im);
- rrd_set_error("unknown variable '%s'",varname);
- return -1;
+ if (strlen(&line[argstart])!=0)
+ if (rrd_graph_legend(gdp,&line[++argstart])==0)
+ rrd_set_error("Cannot parse legend in line: %s",line);
+ break;
+ case GF_PRINT:
+ im->prt_c++;
+ case GF_GPRINT:
+ j=0;
+ sscanf(&line[argstart], DEF_NAM_FMT ":%n",gdp->vname,&j);
+ if (j==0) {
+ rrd_set_error("Cannot parse vname in line: '%s'",line);
+ break;
}
- if (im.gdes[im.gdes_c-1].yrule <= 0.0 || im.gdes[im.gdes_c-1].yrule > 1.0)
- {
- im_free(&im);
- rrd_set_error("Tick mark scaling factor out of range");
- return -1;
+ argstart+=j;
+ if (rrd_graph_check_vname(im,gdp->vname,line)) return;
+ j=0;
+ sscanf(&line[argstart], CF_NAM_FMT ":%n",symname,&j);
+
+ k=(j!=0)?rrd_graph_check_CF(im,symname,line):1;
+#define VIDX im->gdes[gdp->vidx]
+ switch (k) {
+ case -1: /* looks CF but is not really CF */
+ if (VIDX.gf == GF_VDEF) rrd_clear_error();
+ break;
+ case 0: /* CF present and correct */
+ if (VIDX.gf == GF_VDEF)
+ rrd_set_error("Don't use CF when printing VDEF");
+ argstart+=j;
+ break;
+ case 1: /* CF not present */
+ if (VIDX.gf == GF_VDEF) rrd_clear_error();
+ else rrd_set_error("Printing DEF or CDEF needs CF");
+ break;
+ default:
+ rrd_set_error("Oops, bug in GPRINT scanning");
}
- if (scancount < 4)
- im.gdes[im.gdes_c-1].col.red = -1;
- if (scancount < 5)
- /* default tick marks: 10% of the y-axis */
- im.gdes[im.gdes_c-1].yrule = 0.1;
-
- } else {
- im_free(&im);
- rrd_set_error("can't parse '%s'",&argv[i][argstart]);
- return -1;
- } /* endif sscanf */
+#undef VIDX
+ if (rrd_test_error()) break;
+
+ if (strlen(&line[argstart])!=0) {
+ if (rrd_graph_legend(gdp,&line[argstart])==0)
+ rrd_set_error("Cannot parse legend in line: %s",line);
+ } else rrd_set_error("No legend in (G)PRINT line: %s",line);
+ strcpy(gdp->format, gdp->legend);
break;
- case GF_STACK:
- if(linepass == 0){
- im_free(&im);
- rrd_set_error("STACK must follow AREA, LINE or STACK");
- return -1;
- }
- case GF_LINE1:
- case GF_LINE2:
- case GF_LINE3:
- case GF_AREA:
- linepass = 1;
- if((scancount=sscanf(
- &argv[i][argstart],
- "%29[^:#]#%2x%2x%2x:%n",
- varname,
- &col_red,
- &col_green,
- &col_blue,
- &strstart))>=1){
- im.gdes[im.gdes_c-1].col.red = col_red;
- im.gdes[im.gdes_c-1].col.green = col_green;
- im.gdes[im.gdes_c-1].col.blue = col_blue;
- if(strstart <= 0){
- im.gdes[im.gdes_c-1].legend[0] = '\0';
- } else {
- scan_for_col(&argv[i][argstart+strstart],FMT_LEG_LEN,im.gdes[im.gdes_c-1].legend);
+ case GF_DEF:
+ case GF_VDEF:
+ case GF_CDEF:
+ j=0;
+ sscanf(&line[argstart], DEF_NAM_FMT "=%n",gdp->vname,&j);
+ if (j==0) {
+ rrd_set_error("Could not parse line: %s",line);
+ break;
}
- if((im.gdes[im.gdes_c-1].vidx=find_var(&im,varname))==-1){
- im_free(&im);
- rrd_set_error("unknown variable '%s'",varname);
- return -1;
- }
- if (scancount < 4)
- im.gdes[im.gdes_c-1].col.red = -1;
-
- } else {
- im_free(&im);
- rrd_set_error("can't parse '%s'",&argv[i][argstart]);
- return -1;
- }
- break;
- case GF_CDEF:
- if((rpnex = malloc(strlen(&argv[i][argstart])*sizeof(char)))==NULL){
- rrd_set_error("malloc for CDEF");
- return -1;
- }
- if(sscanf(
- &argv[i][argstart],
- DEF_NAM_FMT "=%[^: ]",
- im.gdes[im.gdes_c-1].vname,
- rpnex) != 2){
- im_free(&im);
- free(rpnex);
- rrd_set_error("can't parse CDEF '%s'",&argv[i][argstart]);
- return -1;
- }
- /* checking for duplicate variable names */
- if(find_var(&im,im.gdes[im.gdes_c-1].vname) != -1){
- im_free(&im);
- rrd_set_error("duplicate variable '%s'",
- im.gdes[im.gdes_c-1].vname);
- return -1;
- }
- if((im.gdes[im.gdes_c-1].rpnp =
- rpn_parse((void*)&im,rpnex,&find_var_wrapper))== NULL){
- rrd_set_error("invalid rpn expression '%s'", rpnex);
- im_free(&im);
- return -1;
- }
- free(rpnex);
- break;
- case GF_VDEF:
- strstart=parse_vname1(&argv[i][argstart],&im,"VDEF");
- if (strstart==0) return -1;
-
- argstart+=strstart;
- sscanf(
- &argv[i][argstart],
- DEF_NAM_FMT ",%n",
- varname,&strstart
- );
- if (strstart==0) {
- im_free(&im);
- rrd_set_error("variable '%s' not known in VDEF '%s'",
- varname,
- im.gdes[im.gdes_c-1].vname);
- return -1;
- };
- if (
- im.gdes[im.gdes[im.gdes_c-1].vidx].gf != GF_DEF
- && im.gdes[im.gdes[im.gdes_c-1].vidx].gf != GF_CDEF) {
- rrd_set_error("variable '%s' not DEF nor CDEF in VDEF '%s'",
- varname,
- im.gdes[im.gdes_c-1].vname);
- im_free(&im);
- return -1;
- };
-
- /* parsed upto and including the first comma. Now
- * see what function is requested. This function
- * sets the error string.
- */
- if (vdef_parse(&im.gdes[im.gdes_c-1],&argv[i][argstart+strstart])<0) {
- im_free(&im);
- return -1;
- };
- break;
- case GF_DEF:
- if (sscanf(
- &argv[i][argstart],
- DEF_NAM_FMT "=%n",
- im.gdes[im.gdes_c-1].vname,
- &strstart)== 1 && strstart){ /* is the = did not match %n returns 0 */
- if(sscanf(&argv[i][argstart
- +strstart
- +scan_for_col(&argv[i][argstart+strstart],
- MAXPATH,im.gdes[im.gdes_c-1].rrd)],
- ":" DS_NAM_FMT ":" CF_NAM_FMT,
- im.gdes[im.gdes_c-1].ds_nam,
- symname) != 2){
- im_free(&im);
- rrd_set_error("can't parse DEF '%s' -2",&argv[i][argstart]);
- return -1;
+ if (find_var(im,gdp->vname)!=-1) {
+ rrd_set_error("Variable '%s' in line '%s' already in use\n",
+ gdp->vname,line);
+ break;
}
- } else {
- im_free(&im);
- rrd_set_error("can't parse DEF '%s'",&argv[i][argstart]);
- return -1;
- }
-
- /* checking for duplicate DEF CDEFS */
- if (find_var(&im,im.gdes[im.gdes_c-1].vname) != -1){
- im_free(&im);
- rrd_set_error("duplicate variable '%s'",
- im.gdes[im.gdes_c-1].vname);
- return -1;
- }
- if((im.gdes[im.gdes_c-1].cf=cf_conv(symname))==-1){
- im_free(&im);
- rrd_set_error("unknown cf '%s'",symname);
- return -1;
- }
- break;
+ argstart+=j;
+ switch (gdp->gf) {
+ case GF_DEF:
+ argstart+=scan_for_col(&line[argstart],MAXPATH,gdp->rrd);
+ j=k=0;
+ sscanf(&line[argstart],
+ ":" DS_NAM_FMT ":" CF_NAM_FMT "%n%*s%n",
+ gdp->ds_nam, symname, &j, &k);
+ if ((j==0)||(k!=0)) {
+ rrd_set_error("Cannot parse DS or CF in '%s'",line);
+ break;
+ }
+ rrd_graph_check_CF(im,symname,line);
+ break;
+ case GF_VDEF:
+ j=0;
+ sscanf(&line[argstart],DEF_NAM_FMT ",%n",vname,&j);
+ if (j==0) {
+ rrd_set_error("Cannot parse vname in line '%s'",line);
+ break;
+ }
+ argstart+=j;
+ if (rrd_graph_check_vname(im,vname,line)) 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'", vname,gdp->vname);
+ break;
+ }
+ vdef_parse(gdp,&line[argstart+strstart]);
+ break;
+ case GF_CDEF:
+ if (strstr(&line[argstart],":")!=NULL) {
+ rrd_set_error("Error in RPN, line: %s",line);
+ break;
+ }
+ if ((gdp->rpnp = rpn_parse(
+ (void *)im,
+ &line[argstart],
+ &find_var_wrapper)
+ )==NULL)
+ rrd_set_error("invalid rpn expression in: %s",line);
+ break;
+ default: break;
+ }
+ break;
+ default: rrd_set_error("Big oops");
+ }
+ if (rrd_test_error()) {
+ im_free(im);
+ return;
}
-
}
- if (im.gdes_c==0){
+ if (im->gdes_c==0){
rrd_set_error("can't make a graph without contents");
- im_free(&im);
- return(-1);
+ im_free(im); /* ??? is this set ??? */
+ return;
}
-
- /* parse rest of arguments containing information on what to draw*/
- if (graph_paint(&im,prdata)==-1){
- im_free(&im);
+}
+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) {
+ rrd_set_error("Unknown variable '%s' in %s",varname,err);
return -1;
}
-
- *xsize=im.xgif;
- *ysize=im.ygif;
- if (im.imginfo){
- char *filename;
- if (! (*prdata)) {
- /* maybe prdata is not allocated yet ... lets do it now */
- if((*prdata = calloc(2,sizeof(char *)))==NULL){
- rrd_set_error("malloc imginfo");
- return -1;
- };
- }
- if(((*prdata)[0] = malloc((strlen(im.imginfo)+200+strlen(im.graphfile))*sizeof(char)))
- ==NULL){
- rrd_set_error("malloc imginfo");
+ return 0;
+}
+int
+rrd_graph_color(image_desc_t *im, char *var, char *err, int optional)
+{
+ 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;
+
+ rest=strstr(color,":");
+ if (rest!=NULL)
+ n=rest-color;
+ else
+ n=strlen(color);
+
+ switch (n) {
+ case 7:
+ sscanf(color,"#%6x%n",&col,&n);
+ col = (col << 8) + 0xff /* shift left by 8 */;
+ if (n!=7) rrd_set_error("Color problem in %s",err);
+ break;
+ case 9:
+ sscanf(color,"#%8x%n",&col,&n);
+ if (n==9) break;
+ default:
+ rrd_set_error("Color problem in %s",err);
+ }
+ if (rrd_test_error()) return 0;
+ gdp->col = col;
+ return n;
+ }
+}
+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) {
+ rrd_set_error("Unknown CF '%s' in %s",symname,err);
return -1;
- }
- filename=im.graphfile+strlen(im.graphfile);
- while(filename > im.graphfile){
- if (*(filename-1)=='/' || *(filename-1)=='\\' ) break;
- filename--;
- }
-
- sprintf((*prdata)[0],im.imginfo,filename,im.xgif,im.ygif);
}
- im_free(&im);
return 0;
}
+int
+rrd_graph_legend(graph_desc_t *gdp, char *line)
+{
+ int i;
+
+ i=scan_for_col(line,FMT_LEG_LEN,gdp->legend);
+
+ return (strlen(&line[i])==0);
+}
+
int bad_format(char *fmt) {
char *ptr;
+ int n=0;
ptr = fmt;
while (*ptr != '\0') {
if (*ptr == '\0') return 1;
if (*ptr == 'l') {
ptr++;
+ n++;
if (*ptr == '\0') return 1;
if (*ptr == 'e' || *ptr == 'f') {
ptr++;
++ptr;
}
}
- return 0;
+ return (n!=1);
}
int
vdef_parse(gdes,str)
dst = &im->gdes[gdi];
src = &im->gdes[dst->vidx];
- data = src->data + src->ds + src->ds_cnt; /* skip first value! */
+ data = src->data + src->ds;
steps = (src->end - src->start) / src->step;
#if 0
dst->vf.val = DNAN;
dst->vf.when = 0;
} else {
- dst->vf.val = data[steps*src->ds_cnt];
+ dst->vf.val = data[step*src->ds_cnt];
dst->vf.when = src->start + (step+1)*src->step;
}
while (step != steps) {
if (finite(data[step*src->ds_cnt])) {
if (data[step*src->ds_cnt] > dst->vf.val) {
- dst->vf.val = data[steps*src->ds_cnt];
+ dst->vf.val = data[step*src->ds_cnt];
dst->vf.when = src->start + (step+1)*src->step;
}
}
dst->vf.val = DNAN;
dst->vf.when = 0;
} else {
- dst->vf.val = data[steps*src->ds_cnt];
+ dst->vf.val = data[step*src->ds_cnt];
dst->vf.when = src->start + (step+1)*src->step;
}
while (step != steps) {
if (finite(data[step*src->ds_cnt])) {
if (data[step*src->ds_cnt] < dst->vf.val) {
- dst->vf.val = data[steps*src->ds_cnt];
+ dst->vf.val = data[step*src->ds_cnt];
dst->vf.when = src->start + (step+1)*src->step;
}
}
if (isnan( *(double *)a )) return -1;
if (isnan( *(double *)b )) return 1;
- /* NaN doestn't reach this part so INF and -INF are extremes.
+ /* NaN doesn't reach this part so INF and -INF are extremes.
* The sign from isinf() is compatible with the sign we return
*/
if (isinf( *(double *)a )) return isinf( *(double *)a );
/* If we reach this, both values must be finite */
if ( *(double *)a < *(double *)b ) return -1; else return 1;
}
-