[GRASS-SVN] r61776 - in grass/branches/releasebranch_7_0/raster: r.in.lidar r.in.xyz

svn_grass at osgeo.org svn_grass at osgeo.org
Fri Aug 29 16:16:59 PDT 2014


Author: hamish
Date: 2014-08-29 16:16:59 -0700 (Fri, 29 Aug 2014)
New Revision: 61776

Modified:
   grass/branches/releasebranch_7_0/raster/r.in.lidar/main.c
   grass/branches/releasebranch_7_0/raster/r.in.xyz/main.c
Log:
cut back clicker update frequency to a more human observable value (merge from trunk)

Modified: grass/branches/releasebranch_7_0/raster/r.in.lidar/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.in.lidar/main.c	2014-08-29 23:15:41 UTC (rev 61775)
+++ grass/branches/releasebranch_7_0/raster/r.in.lidar/main.c	2014-08-29 23:16:59 UTC (rev 61776)
@@ -749,7 +749,7 @@
 	    line++;
 	    counter++;
 
-	    if (counter == 10000) {	/* speed */
+	    if (counter == 100000) {	/* speed */
 		if (line < estimated_lines)
 		    G_percent(line, estimated_lines, 3);
 		counter = 0;

Modified: grass/branches/releasebranch_7_0/raster/r.in.xyz/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.in.xyz/main.c	2014-08-29 23:15:41 UTC (rev 61775)
+++ grass/branches/releasebranch_7_0/raster/r.in.xyz/main.c	2014-08-29 23:16:59 UTC (rev 61776)
@@ -661,7 +661,7 @@
 	while (0 != G_getl2(buff, BUFFSIZE - 1, in_fp)) {
 	    line++;
 
-	    if (line % 10000 == 0) {	/* mod for speed */
+	    if (line % 100000 == 0) {	/* mod for speed */
 		if (!can_seek)
 		    G_clicker();
 		else if (line < estimated_lines)
@@ -749,7 +749,7 @@
 	    arr_row = (int)((pass_north - y) / region.ns_res);
 	    arr_col = (int)((x - region.west) / region.ew_res);
 
-	    /*          G_debug(5, "arr_row: %d   arr_col: %d", arr_row, arr_col); */
+	    /* G_debug(5, "arr_row: %d   arr_col: %d", arr_row, arr_col); */
 
 	    /* The range should be [0,cols-1]. We use (int) to round down,
 	       but if the point exactly on eastern edge arr_col will be /just/



More information about the grass-commit mailing list