/****************************************************************************
- * RRDtool 1.2rc6 Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2.1 Copyright by Tobi Oetiker, 1997-2005
****************************************************************************
* rrd__graph.c produce graphs from data in rrdfiles
****************************************************************************/
#ifndef RRD_DEFAULT_FONT
/* there is special code later to pick Cour.ttf when running on windows */
-#define RRD_DEFAULT_FONT "VeraMono.ttf"
+#define RRD_DEFAULT_FONT "DejaVuSansMono-Roman.ttf"
#endif
text_prop_t text_prop[] = {
- { 9.0, RRD_DEFAULT_FONT }, /* default */
- { 11.0, RRD_DEFAULT_FONT }, /* title */
- { 8.0, RRD_DEFAULT_FONT }, /* axis */
- { 9.0, RRD_DEFAULT_FONT }, /* unit */
- { 9.0, RRD_DEFAULT_FONT } /* legend */
+ { 8.0, RRD_DEFAULT_FONT }, /* default */
+ { 9.0, RRD_DEFAULT_FONT }, /* title */
+ { 7.0, RRD_DEFAULT_FONT }, /* axis */
+ { 8.0, RRD_DEFAULT_FONT }, /* unit */
+ { 8.0, RRD_DEFAULT_FONT } /* legend */
};
xlab_t xlab[] = {
'E'};/* 10e18 Exa */
int symbcenter = 6;
- double digits;
+ double digits,viewdigits=0;
+ digits = floor( log( max( fabs(im->minval),fabs(im->maxval)))/log((double)im->base));
+
if (im->unitsexponent != 9999) {
/* unitsexponent = 9, 6, 3, 0, -3, -6, -9, etc */
- digits = floor(im->unitsexponent / 3);
+ viewdigits = floor(im->unitsexponent / 3);
} else {
- digits = floor( log( max( fabs(im->minval),fabs(im->maxval)))/log((double)im->base));
+ viewdigits = digits;
}
+
im->magfact = pow((double)im->base , digits);
#ifdef DEBUG
printf("digits %6.3f im->magfact %6.3f\n",digits,im->magfact);
#endif
- if ( ((digits+symbcenter) < sizeof(symbol)) &&
- ((digits+symbcenter) >= 0) )
- im->symbol = symbol[(int)digits+symbcenter];
+ im->viewfactor = im->magfact / pow((double)im->base , viewdigits);
+
+ pow((double)im->base , viewdigits);
+
+ if ( ((viewdigits+symbcenter) < sizeof(symbol)) &&
+ ((viewdigits+symbcenter) >= 0) )
+ im->symbol = symbol[(int)viewdigits+symbcenter];
else
im->symbol = '?';
}
if (!strcmp(im->gdes[i].format,"%c")) { /* VDEF time print */
char ctime_buf[128]; /* PS: for ctime_r, must be >= 26 chars */
+ int iii=0;
+ ctime_r(&printtime,ctime_buf);
+ while(isprint(ctime_buf[iii])){iii++;}
+ ctime_buf[iii]='\0';
if (im->gdes[i].gf == GF_PRINT){
(*prdata)[prlines-2] = malloc((FMT_LEG_LEN+2)*sizeof(char));
- sprintf((*prdata)[prlines-2],"%s (%lu)",
- ctime_r(&printtime,ctime_buf),printtime);
+ sprintf((*prdata)[prlines-2],"%s (%lu)",ctime_buf,printtime);
(*prdata)[prlines-1] = NULL;
} else {
- sprintf(im->gdes[i].legend,"%s (%lu)",
- ctime_r(&printtime,ctime_buf),printtime);
+ sprintf(im->gdes[i].legend,"%s (%lu)",ctime_buf,printtime);
graphelement = 1;
}
} else {
+ legspace[ii]
+ glue;
}
- leg_y += im->text_prop[TEXT_PROP_LEGEND].size*1.7;
+ leg_y += im->text_prop[TEXT_PROP_LEGEND].size*1.8;
if (prt_fctn == 's') leg_y -= im->text_prop[TEXT_PROP_LEGEND].size;
fill = 0;
leg_c = 0;
if (i==0 || im->symbol == ' ') {
if(scaledstep < 1){
if(im->extra_flags & ALTYGRID) {
- sprintf(graph_label,im->ygrid_scale.labfmt,scaledstep*i);
+ sprintf(graph_label,im->ygrid_scale.labfmt,scaledstep*im->viewfactor*i);
}
else {
- sprintf(graph_label,"%4.1f",scaledstep*i);
+ sprintf(graph_label,"%4.1f",scaledstep*im->viewfactor*i);
}
} else {
- sprintf(graph_label,"%4.0f",scaledstep*i);
+ sprintf(graph_label,"%4.0f",scaledstep*im->viewfactor*i);
}
}else {
if(scaledstep < 1){
- sprintf(graph_label,"%4.1f %c",scaledstep*i, im->symbol);
+ sprintf(graph_label,"%4.1f %c",scaledstep*im->viewfactor*i, im->symbol);
} else {
- sprintf(graph_label,"%4.0f %c",scaledstep*i, im->symbol);
+ sprintf(graph_label,"%4.0f %c",scaledstep*im->viewfactor*i, im->symbol);
}
}
/* yaxis unit description */
gfx_new_text( im->canvas,
- 7, (im->yorigin - im->ysize/2),
+ 12, (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,
/* graph title */
gfx_new_text( im->canvas,
- im->ximg/2, im->text_prop[TEXT_PROP_TITLE].size*1.2,
+ im->ximg/2, im->text_prop[TEXT_PROP_TITLE].size*1.3+4,
im->graph_col[GRC_FONT],
im->text_prop[TEXT_PROP_TITLE].font,
im->text_prop[TEXT_PROP_TITLE].size, im->tabwidth, 0.0,
** | |..............legends......................|
** +-+-------------------------------------------+
*/
- int Xvertical=0, Yvertical=0,
- Xtitle =0, Ytitle =0,
+ int Xvertical=0,
+ Ytitle =0,
Xylabel =0,
Xmain =0, Ymain =0,
#ifdef WITH_PIECHART
if (im->ylegend[0] != '\0' ) {
Xvertical = im->text_prop[TEXT_PROP_UNIT].size *2;
- Yvertical = gfx_get_text_width(im->canvas, 0,
- im->text_prop[TEXT_PROP_UNIT].font,
- im->text_prop[TEXT_PROP_UNIT].size,
- im->tabwidth,im->ylegend, 0);
}
** automatically has some vertical spacing. The horizontal
** spacing is added here, on each side.
*/
- Xtitle = gfx_get_text_width(im->canvas, 0,
+ /* don't care for the with of the title
+ Xtitle = gfx_get_text_width(im->canvas, 0,
im->text_prop[TEXT_PROP_TITLE].font,
im->text_prop[TEXT_PROP_TITLE].size,
im->tabwidth,
- im->title, 0) + 2*Xspacing;
- Ytitle = im->text_prop[TEXT_PROP_TITLE].size*2.5;
+ im->title, 0) + 2*Xspacing; */
+ Ytitle = im->text_prop[TEXT_PROP_TITLE].size*2.6+10;
}
if (elements) {
im->text_prop[TEXT_PROP_AXIS].font,
im->text_prop[TEXT_PROP_AXIS].size,
im->tabwidth,
- "0", 0) * im->unitslength + im->text_prop[TEXT_PROP_AXIS].size * 2;
+ "0", 0) * im->unitslength + Xspacing;
}
}
im->xorigin = Xspacing + Xylabel;
- if (Xtitle > im->ximg) im->ximg = Xtitle;
+ /* the length of the title should not influence with width of the graph
+ if (Xtitle > im->ximg) im->ximg = Xtitle; */
if (Xvertical) { /* unit description */
im->ximg += Xvertical;
im->yimg += Ytitle;
im->yorigin += Ytitle;
} else {
- im->yimg += Yspacing;
- im->yorigin += Yspacing;
+ im->yimg += 1.5*Yspacing;
+ im->yorigin += 1.5*Yspacing;
}
/* reserve space for padding below the graph */
im->yimg += Yspacing;
if(leg_place(im)==-1)
return -1;
- /* last of three steps: check total height of image */
- if (im->yimg < Yvertical) im->yimg = Yvertical;
#if 0
if (Xlegend > im->ximg) {
continue;
}
ytop = ytr(im,im->gdes[i].p_data[ii]);
- if ( im->gdes[i].stack ) {
+ if ( lastgdes && im->gdes[i].stack ) {
ybase = ytr(im,lastgdes->p_data[ii]);
} else {
ybase = ytr(im,areazero);
}
#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);
+
+
+ if( !(im->extra_flags & ONLY_GRAPH) )
+ axis_paint(im);
/* the RULES are the last thing to paint ... */
for(i=0;i<im->gdes_c;i++){
rrd_graph(int argc, char **argv, char ***prdata, int *xsize, int *ysize, FILE *stream, double *ymin, double *ymax)
{
image_desc_t im;
-
rrd_graph_init(&im);
im.graphhandle = stream;
im->minval = DNAN;
im->maxval = DNAN;
im->unitsexponent= 9999;
- im->unitslength= 5;
+ im->unitslength= 6;
+ im->symbol = ' ';
+ im->viewfactor = 1.0;
im->extra_flags= 0;
im->rigid = 0;
im->gridfit = 1;
if (windir != NULL) {
strncpy(rrd_win_default_font,windir,999);
rrd_win_default_font[999] = '\0';
- strcat(rrd_win_default_font,"\\fonts\\cour.ttf");
+ strcat(rrd_win_default_font,"\\fonts\\");
+ strcat(rrd_win_default_font,RRD_DEFAULT_FONT);
for(i=0;i<DIM(text_prop);i++){
strncpy(text_prop[i].font,rrd_win_default_font,sizeof(text_prop[i].font)-1);
text_prop[i].font[sizeof(text_prop[i].font)-1] = '\0';
}
+ }
}
#endif
{
long long_tmp;
struct rrd_time_value start_tv, end_tv;
gfx_color_t color;
+ optind = 0; opterr = 0; /* initialize getopt */
parsetime("end-24h", &start_tv);
parsetime("now", &end_tv);
{"units-length",required_argument, 0, 'L'},
{"step", required_argument, 0, 'S'},
{"tabwidth", required_argument, 0, 'T'},
+ {"font-render-mode", required_argument, 0, 'R'},
+ {"font-smoothing-threshold", required_argument, 0, 'B'},
{0,0,0,0}};
int option_index = 0;
int opt;
int col_start,col_end;
opt = getopt_long(argc, argv,
- "s:e:x:y:v:w:h:iu:l:rb:oc:n:m:t:f:a:I:zgjFYAMX:L:S:T:N",
+ "s:e:x:y:v:w:h:iu:l:rb:oc:n:m:t:f:a:I:zgjFYAMX:L:S:T:NR:B:",
long_options, &option_index);
if (opt == EOF)
im->title[150]='\0';
break;
+ case 'R':
+ if ( strcmp( optarg, "normal" ) == 0 )
+ im->canvas->aa_type = AA_NORMAL;
+ else if ( strcmp( optarg, "light" ) == 0 )
+ im->canvas->aa_type = AA_LIGHT;
+ else if ( strcmp( optarg, "mono" ) == 0 )
+ im->canvas->aa_type = AA_NONE;
+ else
+ {
+ rrd_set_error("unknown font-render-mode '%s'", optarg );
+ return;
+ }
+ break;
+
+ case 'B':
+ im->canvas->font_aa_threshold = atof(optarg);
+ break;
+
case '?':
if (optopt != 0)
rrd_set_error("unknown option '%c'", optopt);
projects / rrdtool.git / blobdiff