[GRASS-SVN] r33911 - grass/branches/develbranch_6/imagery/i.ortho.photo/photo.2image

[svn_grass at osgeo.org]

Author: hamish
Date: 2008-10-16 08:22:34 -0400 (Thu, 16 Oct 2008)
New Revision: 33911

Modified:
   grass/branches/develbranch_6/imagery/i.ortho.photo/photo.2image/analyze.c
   grass/branches/develbranch_6/imagery/i.ortho.photo/photo.2image/ask.c
   grass/branches/develbranch_6/imagery/i.ortho.photo/photo.2image/input.c
Log:
fix window rendering (merge from i.points r20395)

Modified: grass/branches/develbranch_6/imagery/i.ortho.photo/photo.2image/analyze.c
===================================================================
--- grass/branches/develbranch_6/imagery/i.ortho.photo/photo.2image/analyze.c	2008-10-16 12:18:36 UTC (rev 33910)
+++ grass/branches/develbranch_6/imagery/i.ortho.photo/photo.2image/analyze.c	2008-10-16 12:22:34 UTC (rev 33911)
@@ -123,7 +123,7 @@
     nums += left;
 
     /* save what is under this area, so it can be restored */
-    R_panel_save(tempfile1, top, bottom, left, right);
+    R_panel_save(tempfile1, top, bottom+1, left, right+1);
 
 
     /* fill it with white */
@@ -325,11 +325,14 @@
 	show_point(first_point + n, 1);
 	return 1;
     }
+
+    /* first click */
     which = n;
     show_point(first_point + n, 0);
     R_standard_color(RED);
-    Outline_box(report.top + n * height, report.top + (n + 1) * height,
+    Outline_box((report.top + n * height)+1, report.top + (n + 1) * height,
 		report.left, report.right - 1);
+    R_flush();
     return 0;			/* ignore first click */
 
 }
@@ -344,7 +347,7 @@
 {
     if (which >= 0) {
 	R_standard_color(BACKGROUND);
-	Outline_box(report.top + which * height,
+	Outline_box((report.top + which * height)+1,
 		    report.top + (which + 1) * height, report.left,
 		    report.right - 1);
 	show_point(first_point + which, 1);

Modified: grass/branches/develbranch_6/imagery/i.ortho.photo/photo.2image/ask.c
===================================================================
--- grass/branches/develbranch_6/imagery/i.ortho.photo/photo.2image/ask.c	2008-10-16 12:18:36 UTC (rev 33910)
+++ grass/branches/develbranch_6/imagery/i.ortho.photo/photo.2image/ask.c	2008-10-16 12:22:34 UTC (rev 33911)
@@ -141,8 +141,8 @@
     rightx = leftx + widthx;
 
     /* save what is under these areas, so they can be restored */
-    R_panel_save(tempfile1, top, bottom, left, right);
-    R_panel_save(tempfile2, topx, bottomx, leftx, rightx);
+    R_panel_save(tempfile1, top, bottom+1, left, right+1);
+    R_panel_save(tempfile2, topx, bottomx+1, leftx, rightx+1);
 
     /* fill it top with GREY, pick area with white */
     R_standard_color(WHITE);
@@ -278,6 +278,7 @@
     R_standard_color(BLACK);
     Outline_box(top, bottom, left, right);
     dotext(text, top, bottom, left, right, centered);
+    R_flush();
 
     box->top = top;
     box->bottom = bottom;
@@ -330,6 +331,7 @@
 	which = -2;
 	R_standard_color(RED);
 	Outline_box(cancel.top, cancel.bottom, cancel.left, cancel.right);
+	R_flush();
 	return 0;
     }
     /* search name list. handle double click */
@@ -342,6 +344,7 @@
 	    R_standard_color(RED);
 	    Outline_box(list[n].box.top, list[n].box.bottom,
 			list[n].box.left, list[n].box.right);
+	    R_flush();
 	    return 0;		/* ignore first click */
 	}
 

Modified: grass/branches/develbranch_6/imagery/i.ortho.photo/photo.2image/input.c
===================================================================
--- grass/branches/develbranch_6/imagery/i.ortho.photo/photo.2image/input.c	2008-10-16 12:18:36 UTC (rev 33910)
+++ grass/branches/develbranch_6/imagery/i.ortho.photo/photo.2image/input.c	2008-10-16 12:22:34 UTC (rev 33911)
@@ -210,13 +210,14 @@
     R_standard_color(OUTLINE_COLOR);
     for (x = objects; x->type; x++) {
 	if (x->type == OPTION_OBJECT && *x->status == 0)
-	    Outline_box(x->top, x->bottom, x->left, x->right);
+	    Outline_box(x->top +1, x->bottom, x->left, x->right -1);
     }
     R_standard_color(GREEN);
     for (x = objects; x->type; x++) {
 	if (x->type == OPTION_OBJECT && *x->status > 0)
-	    Outline_box(x->top, x->bottom, x->left, x->right);
+	    Outline_box(x->top +1, x->bottom, x->left, x->right -1);
     }
+    R_flush();
 
     return 0;
 }