[GRASS-SVN] r37942 - in grass/trunk/vector/lidar: lidarlib v.lidar.edgedetection

[svn_grass at osgeo.org]

Author: hamish
Date: 2009-06-19 03:35:31 -0400 (Fri, 19 Jun 2009)
New Revision: 37942

Modified:
   grass/trunk/vector/lidar/lidarlib/TcholBand.c
   grass/trunk/vector/lidar/v.lidar.edgedetection/main.c
Log:
add G_verbose_message(), G_percent() for long running process (merge from devbr6)

Modified: grass/trunk/vector/lidar/lidarlib/TcholBand.c
===================================================================
--- grass/trunk/vector/lidar/lidarlib/TcholBand.c	2009-06-19 07:33:25 UTC (rev 37941)
+++ grass/trunk/vector/lidar/lidarlib/TcholBand.c	2009-06-19 07:35:31 UTC (rev 37942)
@@ -12,7 +12,10 @@
     int i, j, k;
     double somma;
 
+    G_debug(3, "tcholDec(): n=%d  BW=%d", n, BW);
+
     for (i = 0; i < n; i++) {
+	G_percent(i, n, 2);
 	for (j = 0; j < BW; j++) {
 	    somma = N[i][j];
 	    for (k = 1; k < BW; k++)
@@ -28,6 +31,7 @@
 	}
     }
 
+    G_percent(i, n, 2);
     return;
 }
 

Modified: grass/trunk/vector/lidar/v.lidar.edgedetection/main.c
===================================================================
--- grass/trunk/vector/lidar/v.lidar.edgedetection/main.c	2009-06-19 07:33:25 UTC (rev 37941)
+++ grass/trunk/vector/lidar/v.lidar.edgedetection/main.c	2009-06-19 07:35:31 UTC (rev 37942)
@@ -244,7 +244,7 @@
 	if (nsply > NSPLY_MAX) {
 	    nsply = NSPLY_MAX;
 	}
-	G_debug(1, _("nsply = %d"), nsply);
+	G_debug(1, "nsply = %d", nsply);
 
 	elaboration_reg.east = original_reg.west;
 	last_column = FALSE;
@@ -271,11 +271,11 @@
 	    if (nsplx > NSPLX_MAX) {
 		nsplx = NSPLX_MAX;
 	    }
-	    G_debug(1, _("nsplx = %d"), nsplx);
+	    G_debug(1, "nsplx = %d", nsplx);
 
 	    /*Setting the active region */
 	    dim_vect = nsplx * nsply;
-	    G_debug(1, _("read vector region map"));
+	    G_debug(1, "read vector region map");
 	    observ =
 		P_Read_Vector_Region_Map(&In, &elaboration_reg, &npoints,
 					 dim_vect, 1);
@@ -310,7 +310,7 @@
 
 		/*G_free (observ); */
 
-		G_debug(1, _("Bilinear interpolation"));
+		G_verbose_message(_("Bilinear interpolation"));
 		normalDefBilin(N, TN, Q, obsVect, passoE, passoN, nsplx,
 			       nsply, elaboration_reg.west,
 			       elaboration_reg.south, npoints, nparameters,
@@ -327,7 +327,7 @@
 		N = G_alloc_matrix(nparameters, BW);	/* Normal matrix */
 		parVect_bicub = G_alloc_vector(nparameters);	/* Bicubic parameters vector */
 
-		G_debug(1, _("Bicubic interpolation"));
+		G_verbose_message(_("Bicubic interpolation"));
 		normalDefBicubic(N, TN, Q, obsVect, passoE, passoN, nsplx,
 				 nsply, elaboration_reg.west,
 				 elaboration_reg.south, npoints, nparameters,
@@ -347,7 +347,7 @@
 			G_fatal_error(_("It was impossible to create <%s>."),
 				      table_name);
 		}
-		G_debug(1, _("Point classification"));
+		G_verbose_message(_("Point classification"));
 		classification(&Out, elaboration_reg, general_box,
 			       overlap_box, obsVect, parVect_bilin,
 			       parVect_bicub, mean, alpha, grad_H, grad_L,