* draw the axis last to have them always on top

* use a smaller font for labeling the axis

git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2/program@406 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/src/rrd_graph.c b/src/rrd_graph.c
index 2fd703e..97ede52 100644 (file)
--- a/src/rrd_graph.c
+++ b/src/rrd_graph.c
@@ -36,7 +36,7 @@
 text_prop_t text_prop[] = {   
      { 8.0, RRD_DEFAULT_FONT }, /* default */
      { 9.0, RRD_DEFAULT_FONT }, /* title */
 text_prop_t text_prop[] = {   
      { 8.0, RRD_DEFAULT_FONT }, /* default */
      { 9.0, RRD_DEFAULT_FONT }, /* title */

-     { 8.0,  RRD_DEFAULT_FONT }, /* axis */
+     { 7.0,  RRD_DEFAULT_FONT }, /* axis */

      { 8.0, RRD_DEFAULT_FONT }, /* unit */
      { 8.0, RRD_DEFAULT_FONT }  /* legend */
 };
      { 8.0, RRD_DEFAULT_FONT }, /* unit */
      { 8.0, RRD_DEFAULT_FONT }  /* legend */
 };


@@ -2540,12 +2540,14 @@ graph_paint(image_desc_t *im, char ***calcpr)
   }
 #endif
 
   }
 #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);
 
   /* 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++){    
   
   /* the RULES are the last thing to paint ... */
   for(i=0;i<im->gdes_c;i++){