v.lidar.edgedetection+v.in.lidar.correction: message cosmetics

                                             no i18n for debug
                                             progress info messages are important
                                             (merge https://trac.osgeo.org/grass/changeset/70774 from trunk)


git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@70776 15284696-431f-4ddb-bdfa-cd5b030d7da7

vector/v.lidar.correction/main.c

@@ -270,11 +270,11 @@ int main(int argc, char *argv[])
     P_get_edge(P_BILINEAR, &dims, stepE, stepN);
     P_set_dim(&dims, stepE, stepN, &nsplx_adj, &nsply_adj);
 
-    G_verbose_message(n_("adjusted EW spline %d",
-                         "adjusted EW splines %d",
+    G_verbose_message(n_("Adjusted EW spline %d",
+                         "Adjusted EW splines %d",
                          nsplx_adj), nsplx_adj);
-    G_verbose_message(n_("adjusted NS spline %d",
-                         "adjusted NS splines %d",
+    G_verbose_message(n_("Adjusted NS spline %d",
+                         "Adjusted NS splines %d",
                          nsply_adj), nsply_adj);
 
     /* calculate number of subregions */
@@ -321,7 +321,7 @@ int main(int argc, char *argv[])
 	    nsply = NSPLY_MAX;
 	}
 	*/
-	G_debug(1, _("nsply = %d"), nsply);
+	G_debug(1, "nsply = %d", nsply);
 
 	elaboration_reg.east = original_reg.west;
 	last_column = FALSE;
@@ -330,7 +330,7 @@ int main(int argc, char *argv[])
 
 	    subregion++;
 	    if (nsubregions > 1)
-		G_message(_("subregion %d of %d"), subregion, nsubregions);
+		G_message(_("Subregion %d of %d"), subregion, nsubregions);
 
 	    P_set_regions(&elaboration_reg, &general_box, &overlap_box, dims,
 			  GENERAL_COLUMN);
@@ -354,21 +354,21 @@ int main(int argc, char *argv[])
 		nsplx = NSPLX_MAX;
 	    }
 	    */
-	    G_debug(1, _("nsplx = %d"), nsplx);
+	    G_debug(1, "nsplx = %d", nsplx);
 
 	    dim_vect = nsplx * nsply;
-	    G_debug(1, _("read vector region map"));
+	    G_debug(1, "read vector region map");
 	    observ =
 		P_Read_Vector_Correction(&In, &elaboration_reg, &npoints,
 					 &nterrain, dim_vect, &lcat);
 
-	    G_debug(5, _("npoints = %d, nterrain = %d"), npoints, nterrain);
+	    G_debug(5, "npoints = %d, nterrain = %d", npoints, nterrain);
 	    if (npoints > 0) {	/* If there is any point falling into elaboration_reg. */
 		count_terrain = 0;
 		nparameters = nsplx * nsply;
 
 		/* Mean calculation */
-		G_debug(3, _("Mean calculation"));
+		G_important_message(_("Performing mean calculation..."));
 		mean = P_Mean_Calc(&elaboration_reg, observ, npoints);
 
 		/*Least Squares system */
@@ -382,7 +382,7 @@ int main(int argc, char *argv[])
 		lineVect = G_alloc_ivector(npoints + 1);
 
 		/* Setting obsVect vector & Q matrix */
-		G_debug(3, _("Only TERRAIN points"));
+		G_debug(3, "Only TERRAIN points");
 		for (i = 0; i < npoints; i++) {
 		    if (observ[i].cat == TERRAIN_SINGLE) {
 			obsVect[count_terrain][0] = observ[i].coordX;
@@ -412,7 +412,7 @@ int main(int argc, char *argv[])
 		G_free_vector(Q);
 		G_free_matrix(obsVect);
 
-		G_verbose_message( _("Correction and creation of terrain vector"));
+		G_important_message( _("Correction and creation of terrain vector..."));
 		P_Sparse_Correction(&In, &Out, &Terrain, &elaboration_reg,
 				    general_box, overlap_box, obsVect_all, lcat,
 				    parVect, lineVect, stepN, stepE,
@@ -434,7 +434,7 @@ int main(int argc, char *argv[])
 
     /* Dropping auxiliar table */
     if (npoints > 0) {
-	G_debug(1, _("Dropping <%s>"), table_name);
+	G_debug(1, "Dropping <%s>", table_name);
 	if (P_Drop_Aux_Table(driver, table_name) != DB_OK)
 	    G_fatal_error(_("Auxiliar table could not be dropped"));
     }

vector/v.lidar.edgedetection/main.c

@@ -292,8 +292,8 @@ int main(int argc, char *argv[])
     P_get_edge(P_BICUBIC, &dims, stepE, stepN);
     P_set_dim(&dims, stepE, stepN, &nsplx_adj, &nsply_adj);
 
-    G_verbose_message(_("adjusted EW splines %d"), nsplx_adj);
-    G_verbose_message(_("adjusted NS splines %d"), nsply_adj);
+    G_verbose_message(_("Adjusted EW splines %d"), nsplx_adj);
+    G_verbose_message(_("Adjusted NS splines %d"), nsply_adj);
 
     /* calculate number of subregions */
     edgeE = dims.ew_size - dims.overlap - 2 * dims.edge_v;
@@ -348,7 +348,7 @@ int main(int argc, char *argv[])
 
 	    subregion++;
 	    if (nsubregions > 1)
-		G_message(_("subregion %d of %d"), subregion, nsubregions);
+		G_message(_("Subregion %d of %d"), subregion, nsubregions);
 
 	    P_set_regions(&elaboration_reg, &general_box, &overlap_box, dims,
 			  GENERAL_COLUMN);
@@ -390,7 +390,7 @@ int main(int argc, char *argv[])
 		mean = P_Mean_Calc(&elaboration_reg, observ, npoints);
 
 		/* Least Squares system */
-		G_debug(1, _("Allocating memory for bilinear interpolation"));
+		G_debug(1, "Allocating memory for bilinear interpolation");
 		BW = P_get_BandWidth(P_BILINEAR, nsply);	/* Bilinear interpolation */
 		N = G_alloc_matrix(nparameters, BW);	/* Normal matrix */
 		TN = G_alloc_vector(nparameters);	/* vector */
@@ -411,7 +411,7 @@ int main(int argc, char *argv[])
 
 		G_free(observ);
 
-		G_verbose_message(_("Bilinear interpolation"));
+		G_important_message(_("Performing bilinear interpolation..."));
 		normalDefBilin(N, TN, Q, obsVect, stepE, stepN, nsplx,
 			       nsply, elaboration_reg.west,
 			       elaboration_reg.south, npoints, nparameters,
@@ -423,12 +423,12 @@ int main(int argc, char *argv[])
 		for (tn = 0; tn < nparameters; tn++)
 		    TN[tn] = 0;
 
-		G_debug(1, _("Allocating memory for bicubic interpolation"));
+		G_debug(1, "Allocating memory for bicubic interpolation");
 		BW = P_get_BandWidth(P_BICUBIC, nsply);
 		N = G_alloc_matrix(nparameters, BW);	/* Normal matrix */
 		parVect_bicub = G_alloc_vector(nparameters);	/* Bicubic parameters vector */
 
-		G_verbose_message(_("Bicubic interpolation"));
+		G_important_message(_("Performing bicubic interpolation..."));
 		normalDefBicubic(N, TN, Q, obsVect, stepE, stepN, nsplx,
 				 nsply, elaboration_reg.west,
 				 elaboration_reg.south, npoints, nparameters,
@@ -440,7 +440,7 @@ int main(int argc, char *argv[])
 		G_free_vector(TN);
 		G_free_vector(Q);
 
-		G_verbose_message(_("Point classification"));
+		G_important_message(_("Point classification..."));
 		classification(&Out, elaboration_reg, general_box,
 			       overlap_box, obsVect, parVect_bilin,
 			       parVect_bicub, mean, alpha, grad_H, grad_L,
@@ -462,7 +462,7 @@ int main(int argc, char *argv[])
 
     /* Dropping auxiliar table */
     if (npoints > 0) {
-	G_debug(1, _("Dropping <%s>"), table_name);
+	G_debug(1, "Dropping <%s>", table_name);
 	if (P_Drop_Aux_Table(driver, table_name) != DB_OK)
 	    G_warning(_("Auxiliar table could not be dropped"));
     }