[GRASS-SVN] r56038 - grass/trunk/display/d.grid

[svn_grass at osgeo.org]

Author: hamish
Date: 2013-04-29 23:58:01 -0700 (Mon, 29 Apr 2013)
New Revision: 56038

Modified:
   grass/trunk/display/d.grid/plot.c
Log:
improved label placement not dependent on region resolution (merge from devbr6)

Modified: grass/trunk/display/d.grid/plot.c
===================================================================
--- grass/trunk/display/d.grid/plot.c	2013-04-30 06:56:33 UTC (rev 56037)
+++ grass/trunk/display/d.grid/plot.c	2013-04-30 06:58:01 UTC (rev 56038)
@@ -270,9 +270,9 @@
 		start_coord = e1;
 
 		/* font rotates by bottom-left corner, try to keep top-left cnr on screen */
-		if(font_angle - 270 > 0) {
+		if (font_angle - 270 > 0) {
 		    extra_y_off = sin((font_angle - 270) * M_PI/180) * fontsize;
-		    if(D_u_to_a_row(n1) < extra_y_off)
+		    if (D_u_to_d_row(n1) - D_get_d_north() < extra_y_off + grid_off)
 			start_coord = -9999.;  /* wait until the next point south */
 		}
 	    }