X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_graph.c;h=f4ad81a74b16647f90557a498a05571d18eb7b42;hb=2c7a6087e28e5dbef634ebdffe97a0759cef1393;hp=6d9015e26b8c204ed66e706db136f661484671d9;hpb=e8427a643ab88d24bd5b67346375c3b065a1bd87;p=rrdtool.git diff --git a/src/rrd_graph.c b/src/rrd_graph.c index 6d9015e..f4ad81a 100644 --- a/src/rrd_graph.c +++ b/src/rrd_graph.c @@ -1,5 +1,5 @@ /**************************************************************************** - * RRDtool 1.0.33 Copyright Tobias Oetiker, 1997 - 2000 + * RRDtool 1.1.x Copyright Tobias Oetiker, 1997 - 2002 **************************************************************************** * rrd__graph.c make creates ne rrds ****************************************************************************/ @@ -21,7 +21,7 @@ #ifndef RRD_DEFAULT_FONT -#define RRD_DEFAULT_FONT "/usr/openwin/lib/X11/fonts/TrueType/Arial.ttf" +#define RRD_DEFAULT_FONT "/usr/share/fonts/truetype/openoffice/ariosor.ttf" /* #define RRD_DEFAULT_FONT "/usr/share/fonts/truetype/Arial.ttf" */ #endif @@ -803,7 +803,7 @@ printf("DEBUG: value from vdef is %f\n",im->gdes[ptr].vf.val); * further save step size and data source * count of this rra */ - im->gdes[gdi].rpnp[rpi].data = im->gdes[ptr].data; + im->gdes[gdi].rpnp[rpi].data = im->gdes[ptr].data + im->gdes[ptr].ds; im->gdes[gdi].rpnp[rpi].step = im->gdes[ptr].step; im->gdes[gdi].rpnp[rpi].ds_cnt = im->gdes[ptr].ds_cnt; @@ -1328,7 +1328,7 @@ leg_place(image_desc_t *im) 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) + im->gdes[ii].legend) + legspace[ii] + glue; if (im->gdes[ii].gf != GF_GPRINT &&