From: oetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa>
Date: Fri, 22 Jul 2005 13:10:50 +0000 (+0000)
Subject: make --no-gridfit with --only-graph work
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=cf44452e9b96291a85a4fe20d2d35657c4256ddd;p=rrdtool-all.git

make --no-gridfit with --only-graph work


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

diff --git a/program/src/rrd_graph.c b/program/src/rrd_graph.c
index bfbd4550..a06417e3 100644
--- a/program/src/rrd_graph.c
+++ b/program/src/rrd_graph.c
@@ -469,7 +469,7 @@ apply_gridfit(image_desc_t *im)
       double new_log10_range = factor * log10_range;
       double new_ymax_log10 = log10(im->minval) + new_log10_range;
       im->maxval = pow(10, new_ymax_log10);
-      ytr(im, DNAN); /* reset precalc */
+      ytr(im,DNAN); /* reset precalc */
       log10_range = log10(im->maxval) - log10(im->minval);
     }
     /* make sure first y=10^x gridline is located on 
@@ -481,7 +481,7 @@ apply_gridfit(image_desc_t *im)
       double yfrac = ypixfrac / im->ysize;
       im->minval = pow(10, log10(im->minval) - yfrac * log10_range);
       im->maxval = pow(10, log10(im->maxval) - yfrac * log10_range);
-      ytr(im, DNAN); /* reset precalc */
+      ytr(im,DNAN); /* reset precalc */
     }
   } else {
     /* Make sure we have an integer pixel distance between
@@ -494,7 +494,7 @@ apply_gridfit(image_desc_t *im)
     double gridstep = im->ygrid_scale.gridstep;
     double minor_y, minor_y_px, minor_y_px_frac;
     im->maxval = im->minval + new_range;
-    ytr(im, DNAN); /* reset precalc */
+    ytr(im,DNAN); /* reset precalc */
     /* make sure first minor gridline is on integer pixel y coord */
     minor_y = gridstep * floor(im->minval / gridstep);
     while (minor_y < im->minval)
@@ -506,7 +506,7 @@ apply_gridfit(image_desc_t *im)
       double range = im->maxval - im->minval;
       im->minval = im->minval - yfrac * range;
       im->maxval = im->maxval - yfrac * range;
-      ytr(im, DNAN); /* reset precalc */
+      ytr(im,DNAN); /* reset precalc */
     }
     calc_horizontal_grid(im); /* recalc with changed im->maxval */
   }
@@ -2151,6 +2151,7 @@ graph_size_location(image_desc_t *im, int elements
 	im->ximg = im->xsize;
         im->yimg = im->ysize;
         im->yorigin = im->ysize;
+        ytr(im,DNAN); 
 	return 0;
     }
 
@@ -2247,6 +2248,7 @@ graph_size_location(image_desc_t *im, int elements
 #endif
 
     im->yorigin = im->yimg - Yxlabel;
+    ytr(im,DNAN); 
 
     /* reserve space for the title *or* some padding above the graph */
     if (Ytitle) {
@@ -2258,7 +2260,6 @@ graph_size_location(image_desc_t *im, int elements
     }
     /* reserve space for padding below the graph */
     im->yimg += Yspacing;
-    ytr(im,DNAN);
 
     /* Determine where to place the legends onto the image.
     ** Adjust im->yimg to match the space requirements.