X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_graph.c;h=b7acddc1b0110ba80c38d39653dc404cfad27c45;hb=554df7224e8b3fec9ec5981812b453c43072f150;hp=76115eceef47bfe1f278c4acd5330c77ae97fd55;hpb=5db43283c08b014a01de198af64d4fdd7817c7c6;p=rrdtool.git diff --git a/src/rrd_graph.c b/src/rrd_graph.c index 76115ec..b7acddc 100644 --- a/src/rrd_graph.c +++ b/src/rrd_graph.c @@ -1,5 +1,5 @@ /**************************************************************************** - * RRDtool 1.2.3 Copyright by Tobi Oetiker, 1997-2005 + * RRDtool 1.2.4 Copyright by Tobi Oetiker, 1997-2005 **************************************************************************** * rrd__graph.c produce graphs from data in rrdfiles ****************************************************************************/ @@ -1582,14 +1582,14 @@ calc_horizontal_grid(image_desc_t *im) else { for(i=0;ylab[i].grid > 0;i++){ pixel = im->ysize / (scaledrange / ylab[i].grid); - if (pixel > 5) { + if (pixel > 7) { gridind = i; break; } } for(i=0; i<4;i++) { - if (pixel * ylab[gridind].lfac[i] >= 2 * im->text_prop[TEXT_PROP_AXIS].size) { + if (pixel * ylab[gridind].lfac[i] >= 2.5 * im->text_prop[TEXT_PROP_AXIS].size) { im->ygrid_scale.labfact = ylab[gridind].lfac[i]; break; } @@ -1942,7 +1942,7 @@ grid_paint(image_desc_t *im) /* yaxis unit description */ gfx_new_text( im->canvas, - 12, (im->yorigin - im->ysize/2), + 10, (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, @@ -2151,7 +2151,7 @@ graph_size_location(image_desc_t *im, int elements } if (im->ylegend[0] != '\0' ) { - Xvertical = im->text_prop[TEXT_PROP_UNIT].size *1.6; + Xvertical = im->text_prop[TEXT_PROP_UNIT].size *2; } @@ -2180,7 +2180,7 @@ graph_size_location(image_desc_t *im, int elements im->text_prop[TEXT_PROP_AXIS].font, im->text_prop[TEXT_PROP_AXIS].size, im->tabwidth, - "0", 0) * im->unitslength + Xspacing; + "0", 0) * im->unitslength; } } @@ -2804,7 +2804,7 @@ rrd_graph_init(image_desc_t *im) 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;