/****************************************************************************
- * RRDtool 1.1.x Copyright Tobias Oetiker, 1997 - 2002
+ * RRDtool 1.2rc2 Copyright by Tobi Oetiker, 1997-2005
****************************************************************************
- * rrd__graph.c make creates ne rrds
+ * rrd__graph.c produce graphs from data in rrdfiles
****************************************************************************/
#endif
#ifndef RRD_DEFAULT_FONT
-#ifndef WIN32
+/* there is special code later to pick Cour.ttf when running on windows */
#define RRD_DEFAULT_FONT "VeraMono.ttf"
-/* #define RRD_DEFAULT_FONT "/usr/share/fonts/truetype/openoffice/ariosor.ttf" */
-/* #define RRD_DEFAULT_FONT "/usr/share/fonts/truetype/Arial.ttf" */
-#endif
#endif
text_prop_t text_prop[] = {
- { 10.0, RRD_DEFAULT_FONT }, /* default */
- { 10.0, RRD_DEFAULT_FONT }, /* title */
- { 8.0, RRD_DEFAULT_FONT }, /* axis */
- { 10.0, RRD_DEFAULT_FONT }, /* unit */
- { 10.0, RRD_DEFAULT_FONT } /* legend */
+ { 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[] = {
0xF0F0F0FF, /* background */
0xD0D0D0FF, /* shade A */
0xA0A0A0FF, /* shade B */
- 0x909090FF, /* grid */
- 0xE05050FF, /* major grid */
+ 0x90909080, /* grid */
+ 0xE0505080, /* major grid */
0x000000FF, /* font */
- 0x000000FF, /* frame */
- 0xFF0000FF /* arrow */
+ 0xFF0000FF, /* arrow */
+ 0x404040FF /* axis */
};
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)
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;
}
continue;
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)) {
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,
vdp->shift = im->gdes[gdi].shval;
/* normalize shift to multiple of consolidated step */
- vdp->shift = (vdp->shift / vdp->step) * vdp->step;
+ vdp->shift = (vdp->shift / (long)vdp->step) * (long)vdp->step;
/* apply shift */
vdp->start += vdp->shift;
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;
+ 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;
(*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
/* 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
case GF_DEF:
case GF_CDEF:
case GF_VDEF:
+#ifdef WITH_PIECHART
case GF_PART:
+#endif
case GF_SHIFT:
case GF_XPORT:
break;
{
/* graph labels */
int interleg = im->text_prop[TEXT_PROP_LEGEND].size*2.0;
- int box =im->text_prop[TEXT_PROP_LEGEND].size*1.5;
int border = im->text_prop[TEXT_PROP_LEGEND].size*2.0;
int fill=0, fill_last;
int leg_c = 0;
/* hid legends for rules which are not displayed */
- if (im->gdes[i].gf == GF_HRULE &&
- (im->gdes[i].yrule < im->minval || im->gdes[i].yrule > im->maxval))
- im->gdes[i].legend[0] = '\0';
-
- if (im->gdes[i].gf == GF_VRULE &&
- (im->gdes[i].xrule < im->start || im->gdes[i].xrule > im->end))
- im->gdes[i].legend[0] = '\0';
+ if(!(im->extra_flags & FORCE_RULES_LEGEND)) {
+ if (im->gdes[i].gf == GF_HRULE &&
+ (im->gdes[i].yrule < im->minval || im->gdes[i].yrule > im->maxval))
+ im->gdes[i].legend[0] = '\0';
+
+ if (im->gdes[i].gf == GF_VRULE &&
+ (im->gdes[i].xrule < im->start || im->gdes[i].xrule > im->end))
+ im->gdes[i].legend[0] = '\0';
+ }
leg_cc = strlen(im->gdes[i].legend);
/* is there a controle code ant the end of the legend string ? */
- if (leg_cc >= 2 && im->gdes[i].legend[leg_cc-2] == '\\') {
+ /* and it is not a tab \\t */
+ if (leg_cc >= 2 && im->gdes[i].legend[leg_cc-2] == '\\' && im->gdes[i].legend[leg_cc-1] != 't') {
prt_fctn = im->gdes[i].legend[leg_cc-1];
leg_cc -= 2;
im->gdes[i].legend[leg_cc] = '\0';
/* no interleg space if string ends in \g */
fill += legspace[i];
}
- if (im->gdes[i].gf != GF_GPRINT &&
- im->gdes[i].gf != GF_COMMENT) {
- fill += box;
- }
fill += gfx_get_text_width(im->canvas, fill+border,
im->text_prop[TEXT_PROP_LEGEND].font,
im->text_prop[TEXT_PROP_LEGEND].size,
}
- if (prt_fctn != '\0'){
+ if (prt_fctn != '\0'){
leg_x = border;
if (leg_c >= 2 && prt_fctn == 'j') {
glue = (im->ximg - fill - 2* border) / (leg_c-1);
for(ii=mark;ii<=i;ii++){
if(im->gdes[ii].legend[0]=='\0')
- continue;
+ continue; /* skip empty legends */
im->gdes[ii].leg_x = leg_x;
im->gdes[ii].leg_y = leg_y;
leg_x +=
im->gdes[ii].legend, 0)
+ legspace[ii]
+ glue;
- if (im->gdes[ii].gf != GF_GPRINT &&
- im->gdes[ii].gf != GF_COMMENT)
- leg_x += box;
- }
- leg_y = leg_y + im->text_prop[TEXT_PROP_LEGEND].size*1.2;
- if (prt_fctn == 's') leg_y -= im->text_prop[TEXT_PROP_LEGEND].size*1.2;
+ }
+ leg_y += im->text_prop[TEXT_PROP_LEGEND].size*1.7;
+ if (prt_fctn == 's') leg_y -= im->text_prop[TEXT_PROP_LEGEND].size;
fill = 0;
leg_c = 0;
mark = ii;
}
/* paint the labels below the graph */
- for(ti = find_first_time(im->start,
+ for(ti = find_first_time(im->start - im->xlab_user.precis/2,
im->xlab_user.labtm,
im->xlab_user.labst);
- ti <= im->end;
+ ti <= im->end - im->xlab_user.precis/2;
ti = find_next_time(ti,im->xlab_user.labtm,im->xlab_user.labst)
){
tilab= ti + im->xlab_user.precis/2; /* correct time for the label */
/* are we inside the graph ? */
- if (ti < im->start || ti > im->end) continue;
+ if (tilab < im->start || tilab > im->end) continue;
#if HAVE_STRFTIME
localtime_r(&tilab, &tm);
)
{
/* draw x and y axis */
- gfx_new_line ( im->canvas, im->xorigin+im->xsize,im->yorigin,
+ /* gfx_new_line ( im->canvas, im->xorigin+im->xsize,im->yorigin,
im->xorigin+im->xsize,im->yorigin-im->ysize,
- GRIDWIDTH, im->graph_col[GRC_GRID]);
+ GRIDWIDTH, im->graph_col[GRC_AXIS]);
gfx_new_line ( im->canvas, im->xorigin,im->yorigin-im->ysize,
im->xorigin+im->xsize,im->yorigin-im->ysize,
- GRIDWIDTH, im->graph_col[GRC_GRID]);
+ GRIDWIDTH, im->graph_col[GRC_AXIS]); */
gfx_new_line ( im->canvas, im->xorigin-4,im->yorigin,
im->xorigin+im->xsize+4,im->yorigin,
- MGRIDWIDTH, im->graph_col[GRC_GRID]);
+ MGRIDWIDTH, im->graph_col[GRC_AXIS]);
gfx_new_line ( im->canvas, im->xorigin,im->yorigin+4,
im->xorigin,im->yorigin-im->ysize-4,
- MGRIDWIDTH, im->graph_col[GRC_GRID]);
+ MGRIDWIDTH, im->graph_col[GRC_AXIS]);
/* arrow for X axis direction */
im->xorigin+im->xsize+3, im->yorigin+4,
im->xorigin+im->xsize+8, im->yorigin+0.5, /* LINEOFFSET */
im->graph_col[GRC_ARROW]);
-
-
-
+
}
void
}
}
- /* yaxis description */
-/* if (im->canvas->imgformat != IF_PNG) {*/
- if (1) {
- gfx_new_text( im->canvas,
- 7, (im->yorigin - im->ysize/2),
- im->graph_col[GRC_FONT],
- im->text_prop[TEXT_PROP_AXIS].font,
- im->text_prop[TEXT_PROP_AXIS].size, im->tabwidth,
- RRDGRAPH_YLEGEND_ANGLE,
- GFX_H_LEFT, GFX_V_CENTER,
- im->ylegend);
- } else {
- /* horrible hack until we can actually print vertically */
- {
- int n;
- char s[2];
- for (n=0;n< (int)strlen(im->ylegend);n++) {
- s[0]=im->ylegend[n];
- s[1]='\0';
- gfx_new_text(im->canvas,7,im->text_prop[TEXT_PROP_AXIS].size*(n+1),
- im->graph_col[GRC_FONT],
- im->text_prop[TEXT_PROP_AXIS].font,
- im->text_prop[TEXT_PROP_AXIS].size, im->tabwidth, 270.0,
- GFX_H_CENTER, GFX_V_CENTER,
- s);
- }
- }
- }
-
+ /* yaxis unit description */
+ gfx_new_text( im->canvas,
+ 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 */
gfx_new_text( im->canvas,
- im->ximg/2, im->text_prop[TEXT_PROP_TITLE].size,
+ im->ximg/2, im->text_prop[TEXT_PROP_TITLE].size*1.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) & !(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;
- /* Box needed? */
- if ( im->gdes[i].gf != GF_GPRINT
- && im->gdes[i].gf != GF_COMMENT) {
- int boxH, boxV;
-
- boxH = gfx_get_text_width(im->canvas, 0,
- im->text_prop[TEXT_PROP_AXIS].font,
- im->text_prop[TEXT_PROP_AXIS].size,
- im->tabwidth,"M", 0) * 1.25;
- boxV = boxH;
-
- node = gfx_new_area(im->canvas,
- X0,Y0-boxV,
- X0,Y0,
- X0+boxH,Y0,
- im->gdes[i].col);
- gfx_add_point ( node, X0+boxH, Y0-boxV );
- node = gfx_new_line(im->canvas,
- X0,Y0-boxV, X0,Y0,
- 1,0x000000FF);
- gfx_add_point(node,X0+boxH,Y0);
- gfx_add_point(node,X0+boxH,Y0-boxV);
- gfx_close_path(node);
- X0 += boxH / 1.25 * 2;
- }
- gfx_new_text ( im->canvas, X0, Y0,
+ 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_AXIS].font,
- im->text_prop[TEXT_PROP_AXIS].size,
+ im->text_prop[TEXT_PROP_LEGEND].font,
+ im->text_prop[TEXT_PROP_LEGEND].size,
im->tabwidth,0.0, GFX_H_LEFT, GFX_V_BOTTOM,
im->gdes[i].legend );
- }
- }
- }
+ /* The legend for GRAPH items starts with "M " to have
+ enough space for the box */
+ if ( im->gdes[i].gf != GF_PRINT &&
+ im->gdes[i].gf != GF_GPRINT &&
+ im->gdes[i].gf != GF_COMMENT) {
+ int boxH, boxV;
+
+ boxH = gfx_get_text_width(im->canvas, 0,
+ im->text_prop[TEXT_PROP_LEGEND].font,
+ im->text_prop[TEXT_PROP_LEGEND].size,
+ im->tabwidth,"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);
+ }
+ }
+ }
+}
/*****************************************************
return size;
}
+#ifdef WITH_PIECHART
void
pie_part(image_desc_t *im, gfx_color_t color,
double PieCenterX, double PieCenterY, double Radius,
}
}
+#endif
+
int
-graph_size_location(image_desc_t *im, int elements, int piechart )
+graph_size_location(image_desc_t *im, int elements
+
+#ifdef WITH_PIECHART
+, int piechart
+#endif
+
+ )
{
/* The actual size of the image to draw is determined from
** several sources. The size given on the command line is
Xspacing =10, Yspacing =10;
if (im->extra_flags & ONLY_GRAPH) {
- if ( im->ysize > 32 ) {
- rrd_set_error("height > 32 is not possible with --only-graph option");
- return -1;
- }
Xspacing =0;
- Yspacing =0;
+ Yspacing =0;
} else {
if (im->ylegend[0] != '\0') {
- Xvertical = im->text_prop[TEXT_PROP_LEGEND].size *2;
- Yvertical = im->text_prop[TEXT_PROP_LEGEND].size * (strlen(im->ylegend)+1);
+ 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);
}
}
im->text_prop[TEXT_PROP_TITLE].size,
im->tabwidth,
im->title, 0) + 2*Xspacing;
- Ytitle = im->text_prop[TEXT_PROP_TITLE].size*2;
+ Ytitle = im->text_prop[TEXT_PROP_TITLE].size*2.5;
}
if (elements) {
Ymain=im->ysize;
if (im->draw_x_grid) {
Xxlabel=Xmain;
- Yxlabel=im->text_prop[TEXT_PROP_LEGEND].size *2;
+ Yxlabel=im->text_prop[TEXT_PROP_AXIS].size *2.5;
}
if (im->draw_y_grid) {
- Xylabel=im->text_prop[TEXT_PROP_LEGEND].size *6;
+ Xylabel=im->text_prop[TEXT_PROP_AXIS].size *6;
Yylabel=Ymain;
}
}
+#ifdef WITH_PIECHART
if (piechart) {
im->piesize=im->xsize<im->ysize?im->xsize:im->ysize;
Xpie=im->piesize;
Ypie=im->piesize;
}
+#endif
/* Now calculate the total size. Insert some spacing where
desired. im->xorigin and im->yorigin need to correspond
im->ximg = Xmain;
if ( !(im->extra_flags & ONLY_GRAPH) ) {
- im->ximg = Xylabel + Xmain + Xpie + Xspacing;
+ im->ximg = Xylabel + Xmain + Xpie + 2 * Xspacing;
}
if (Xmain) im->ximg += Xspacing;
}
#endif
+#ifdef WITH_PIECHART
/* The pie is placed in the upper right hand corner,
** just below the title (if any) and with sufficient
** padding.
im->pie_x = im->ximg/2;
im->pie_y = im->yorigin-Ypie/2;
}
+#endif
return 0;
}
{
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;
/* 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) {
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
*/
i=print_calc(im,calcpr);
if(i<0) return -1;
- if(((i==0)&&(piechart==0)) || lazy) return 0;
+ if(((i==0)
+#ifdef WITH_PIECHART
+&&(piechart==0)
+#endif
+) || lazy) return 0;
+#ifdef WITH_PIECHART
/* If there's only the pie chart to draw, signal this */
if (i==0) piechart=2;
+#endif
/* get actual drawing data and find min and max values*/
if(data_proc(im)==-1)
*** Calculating sizes and locations became a bit confusing ***
*** so I moved this into a separate function. ***
**************************************************************/
- if(graph_size_location(im,i,piechart)==-1)
+ if(graph_size_location(im,i
+#ifdef WITH_PIECHART
+,piechart
+#endif
+)==-1)
return -1;
/* the actual graph is created by going through the individual
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,
areazero = im->minval;
if (im->maxval < 0.0)
areazero = im->maxval;
- if( !(im->extra_flags & ONLY_GRAPH) )
- axis_paint(im);
- }
+#ifdef WITH_PIECHART
+ }
+#endif
+#ifdef WITH_PIECHART
if (piechart) {
pie_part(im,im->graph_col[GRC_CANVAS],im->pie_x,im->pie_y,im->piesize*0.5,0,2*M_PI);
}
+#endif
for(i=0;i<im->gdes_c;i++){
switch(im->gdes[i].gf){
}
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;
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
+
+ if( !(im->extra_flags & ONLY_GRAPH) )
+ axis_paint(im);
+
/* grid_paint also does the text */
if( !(im->extra_flags & ONLY_GRAPH) )
grid_paint(im);
int
gdes_alloc(image_desc_t *im){
- unsigned long def_step = (im->end-im->start)/im->xsize;
-
- if (im->step > def_step) /* step can be increassed ... no decreassed */
- def_step = im->step;
-
im->gdes_c++;
-
if ((im->gdes = (graph_desc_t *) rrd_realloc(im->gdes, (im->gdes_c)
* sizeof(graph_desc_t)))==NULL){
rrd_set_error("realloc graph_descs");
}
- 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].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;
** - script parsing now in rrd_graph_script()
*/
int
-rrd_graph(int argc, char **argv, char ***prdata, int *xsize, int *ysize, FILE *stream)
+rrd_graph(int argc, char **argv, char ***prdata, int *xsize, int *ysize, FILE *stream, double *ymin, double *ymax)
{
image_desc_t im;
*xsize=im.ximg;
*ysize=im.yimg;
+ *ymin=im.minval;
+ *ymax=im.maxval;
if (im.imginfo) {
char *filename;
if (!(*prdata)) {
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]=graph_col[i];
#ifdef WIN32
{
- char *windir;
- windir = getenv("windir");
- /* %windir% is something like D:\windows or C:\winnt */
- if (windir != NULL) {
- strcpy(rrd_win_default_font,windir);
- strcat(rrd_win_default_font,"\\fonts\\cour.ttf");
- for(i=0;i<DIM(text_prop);i++)
- text_prop[i].font = rrd_win_default_font;
- }
+ char *windir;
+ windir = getenv("windir");
+ /* %windir% is something like D:\windows or C:\winnt */
+ if (windir != NULL) {
+ strcpy(rrd_win_default_font,windir);
+ strcat(rrd_win_default_font,"\\fonts\\cour.ttf");
+ for(i=0;i<DIM(text_prop);i++)
+ strcpy(text_prop[i].font,rrd_win_default_font);
+ }
}
#endif
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;
+ strcpy(im->text_prop[i].font,text_prop[i].font);
}
}
{"lazy", no_argument, 0, 'z'},
{"zoom", required_argument, 0, 'm'},
{"no-legend", no_argument, 0, 'g'},
+ {"force-rules-legend",no_argument,0, 'F'},
{"only-graph", no_argument, 0, 'j'},
{"alt-y-grid", no_argument, 0, 'Y'},
{"no-minor", no_argument, 0, 'I'},
{"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;
opt = getopt_long(argc, argv,
- "s:e:x:y:v:w:h:iu:l:rb:oc:n:m:t:f:a:I:zgjYAMX:S:N",
+ "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)
case 'M':
im->extra_flags |= ALTAUTOSCALE_MAX;
break;
- case 'j':
+ case 'j':
im->extra_flags |= ONLY_GRAPH;
break;
case 'g':
im->extra_flags |= NOLEGEND;
break;
+ case 'F':
+ im->extra_flags |= FORCE_RULES_LEGEND;
+ break;
case 'X':
im->unitsexponent = atoi(optarg);
break;
+ case 'T':
+ im->tabwidth = atof(optarg);
+ break;
case 'S':
im->step = atoi(optarg);
break;
}
break;
case 'n':{
- /* originally this used char *prop = "" and
- ** char *font = "dummy" however this results
- ** in a SEG fault, at least on RH7.1
- **
- ** The current implementation isn't proper
- ** either, font is never freed and prop uses
- ** a fixed width string
- */
- char prop[100];
+ char prop[15];
double size = 1;
- char *font;
+ char font[1024];
- font=malloc(255);
if(sscanf(optarg,
- "%10[A-Z]:%lf:%s",
+ "%10[A-Z]:%lf:%1000s",
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;
+ strcpy(im->text_prop[sindex].font,font);
if (sindex==0) { /* the default */
im->text_prop[TEXT_PROP_TITLE].size=size;
- im->text_prop[TEXT_PROP_TITLE].font=font;
+ strcpy(im->text_prop[TEXT_PROP_TITLE].font,font);
im->text_prop[TEXT_PROP_AXIS].size=size;
- im->text_prop[TEXT_PROP_AXIS].font=font;
+ strcpy(im->text_prop[TEXT_PROP_AXIS].font,font);
im->text_prop[TEXT_PROP_UNIT].size=size;
- im->text_prop[TEXT_PROP_UNIT].font=font;
+ strcpy(im->text_prop[TEXT_PROP_UNIT].font,font);
im->text_prop[TEXT_PROP_LEGEND].size=size;
- im->text_prop[TEXT_PROP_LEGEND].font=font;
+ strcpy(im->text_prop[TEXT_PROP_LEGEND].font,font);
}
} else {
rrd_set_error("invalid fonttag '%s'",prop);
im->start = start_tmp;
im->end = end_tmp;
+ im->step = max((long)im->step, (im->end-im->start)/im->xsize);
}
int
return n;
}
}
-int
-rrd_graph_legend(graph_desc_t *gdp, char *line)
-{
- int i;
-
- i=scan_for_col(line,FMT_LEG_LEN,gdp->legend);
-
- return (strlen(&line[i])==0);
-}
int bad_format(char *fmt) {
projects / rrdtool.git / blobdiff