[GRASS-SVN] r31706 - grass/branches/develbranch_6/raster/r.in.xyz

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-06-13 11:27:32 -0400 (Fri, 13 Jun 2008)
New Revision: 31706

Modified:
   grass/branches/develbranch_6/raster/r.in.xyz/main.c
Log:
r.in.xyz: progress info also for "writing to map"


Modified: grass/branches/develbranch_6/raster/r.in.xyz/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.in.xyz/main.c	2008-06-13 13:48:50 UTC (rev 31705)
+++ grass/branches/develbranch_6/raster/r.in.xyz/main.c	2008-06-13 15:27:32 UTC (rev 31706)
@@ -563,7 +563,7 @@
 		else if(line < estimated_lines)
 		    G_percent(line, estimated_lines, 3);
 	    }
-
+	    
 	    if((buff[0] == '#') || (buff[0] == '\0')) {
 		continue; /* line is a comment or blank */
 	    }
@@ -676,6 +676,7 @@
 		}
 	    }
 	} /* while !EOF */
+	G_percent(1, 1, 1); /* flush */
 
 	G_debug(2, "pass %d finished, %d coordinates in box", pass, count);
 	count_total += count;
@@ -974,6 +975,7 @@
 		G_close_cell(out_fd);
 		G_fatal_error(_("Writing map, row %d"), ((pass-1)*rows)+row);
 	    }
+	    G_percent(row, rows, 3);
 	}
 
 	/* free memory */
@@ -993,7 +995,7 @@
 
     } /* passes loop */
 
-    G_percent(1,1,1); /* flush */
+    G_percent(1, 1, 1); /* flush */
     G_free(raster_row);
 
     /* close input file */