[GRASS-SVN] r56862 - grass/trunk/display/d.barscale

[svn_grass at osgeo.org]

Author: hamish
Date: 2013-06-20 23:34:37 -0700 (Thu, 20 Jun 2013)
New Revision: 56862

Modified:
   grass/trunk/display/d.barscale/draw_scale.c
   grass/trunk/display/d.barscale/main.c
Log:
a couple more rendering tweaks

Modified: grass/trunk/display/d.barscale/draw_scale.c
===================================================================
--- grass/trunk/display/d.barscale/draw_scale.c	2013-06-21 06:21:56 UTC (rev 56861)
+++ grass/trunk/display/d.barscale/draw_scale.c	2013-06-21 06:34:37 UTC (rev 56862)
@@ -255,12 +255,12 @@
 	D_cont_rel(-line_len + 1, 0);
 	D_cont_rel(0, 4);
 	D_end();
+	D_close();
 	D_stroke();
 
-	D_pos_rel(0, 1);
 	for (i = 1; i <= scales[incr].seg; i += 2) {
 	    /* width is seg_len and height is 5 */
-	    D_box_rel(seg_len, -5);
+	    D_box_rel(seg_len, -4);
 	    D_pos_rel(seg_len * 2, 0);
 	}
     }
@@ -391,7 +391,7 @@
 	D_move_abs(x_pos + 25, y_pos + 15);
 
 	for (i = 1; i <= scales[incr].seg; i++) {
-	    if (i <= (scales[incr].seg == 5 ? 2 : 4)) {
+	    if (i <= (scales[incr].seg == 5 ? 2 : 6)) {
 		if (i % 2 == 0) {
 		    xarr[0] = 0;	yarr[0] = 0;
 		    xarr[1] = seg_len;	yarr[1] = 0;

Modified: grass/trunk/display/d.barscale/main.c
===================================================================
--- grass/trunk/display/d.barscale/main.c	2013-06-21 06:21:56 UTC (rev 56861)
+++ grass/trunk/display/d.barscale/main.c	2013-06-21 06:34:37 UTC (rev 56862)
@@ -107,7 +107,7 @@
     fsize->key = "fontsize";
     fsize->type = TYPE_DOUBLE;
     fsize->required = NO;
-    fsize->answer = "14";
+    fsize->answer = "12";
     fsize->options = "1-360";
     fsize->description = _("Font size");
     fsize->guisection = "Text";