use the pen to determine string length, do not look at the realy length, or space...

[rrdtool.git] / src / rrd_graph.c

diff --git a/src/rrd_graph.c b/src/rrd_graph.c
index 5efe827..2745ae9 100644 (file)
--- a/src/rrd_graph.c
+++ b/src/rrd_graph.c
@@ -30,7 +30,7 @@
 
 #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[] = {   
@@ -1938,7 +1938,7 @@ grid_paint(image_desc_t   *im)
 
     /* 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, 
@@ -1948,7 +1948,7 @@ grid_paint(image_desc_t   *im)
 
     /* 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,
@@ -2117,8 +2117,8 @@ graph_size_location(image_desc_t *im, int elements
     ** | |..............legends......................|
     ** +-+-------------------------------------------+
     */
-    int Xvertical=0,   Yvertical=0,
-       Xtitle   =0,    Ytitle   =0,
+    int Xvertical=0,   
+                       Ytitle   =0,
        Xylabel  =0,    
        Xmain    =0,    Ymain    =0,
 #ifdef WITH_PIECHART
@@ -2140,10 +2140,6 @@ graph_size_location(image_desc_t *im, int elements
 
     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);
     }
 
 
@@ -2152,12 +2148,13 @@ graph_size_location(image_desc_t *im, int elements
        ** 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) {
@@ -2171,7 +2168,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 + im->text_prop[TEXT_PROP_AXIS].size * 2;
+                       "0", 0) * im->unitslength + Xspacing;
        }
     }
 
@@ -2207,7 +2204,8 @@ graph_size_location(image_desc_t *im, int elements
 
     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;
@@ -2252,8 +2250,6 @@ graph_size_location(image_desc_t *im, int elements
     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) {