[GRASS-SVN] r41061 - in grass/trunk/vector/lidar: lidarlib v.lidar.correction v.lidar.edgedetection v.lidar.growing v.outlier v.surf.bspline

svn_grass at osgeo.org svn_grass at osgeo.org
Wed Feb 17 12:05:38 EST 2010


Author: mmetz
Date: 2010-02-17 12:05:36 -0500 (Wed, 17 Feb 2010)
New Revision: 41061

Modified:
   grass/trunk/vector/lidar/lidarlib/raster.c
   grass/trunk/vector/lidar/v.lidar.correction/main.c
   grass/trunk/vector/lidar/v.lidar.edgedetection/main.c
   grass/trunk/vector/lidar/v.lidar.growing/main.c
   grass/trunk/vector/lidar/v.outlier/main.c
   grass/trunk/vector/lidar/v.surf.bspline/main.c
Log:
better phrasing

Modified: grass/trunk/vector/lidar/lidarlib/raster.c
===================================================================
--- grass/trunk/vector/lidar/lidarlib/raster.c	2010-02-17 08:18:12 UTC (rev 41060)
+++ grass/trunk/vector/lidar/lidarlib/raster.c	2010-02-17 17:05:36 UTC (rev 41061)
@@ -78,7 +78,7 @@
 			db_append_string(&sql, buf);
 
 			if (db_execute_immediate(driver, &sql) != DB_OK)
-			    G_fatal_error(_("Unable to write to table: %s"),
+			    G_fatal_error(_("Unable to access table <%s>"),
 					  buf);
 		    }
 		    else if ((*point->y < Overlap.S) && (*point->y > General.S)) {	/*(1) */
@@ -93,7 +93,7 @@
 			db_append_string(&sql, buf);
 
 			if (db_execute_immediate(driver, &sql) != DB_OK)
-			    G_fatal_error(_("Unable to write to table: %s"),
+			    G_fatal_error(_("Unable to access table <%s>"),
 					  buf);
 		    }
 		    else if ((*point->y <= Overlap.N) && (*point->y >= Overlap.S)) {	/*(1) */
@@ -106,7 +106,7 @@
 			db_append_string(&sql, buf);
 
 			if (db_execute_immediate(driver, &sql) != DB_OK)
-			    G_fatal_error(_("Unable to write to table: %s"),
+			    G_fatal_error(_("Unable to access table <%s>"),
 					  buf);
 		    }
 		}
@@ -123,7 +123,7 @@
 			db_append_string(&sql, buf);
 
 			if (db_execute_immediate(driver, &sql) != DB_OK)
-			    G_fatal_error(_("Unable to write to table: %s"),
+			    G_fatal_error(_("Unable to access table <%s>"),
 					  buf);
 		    }
 		    else if ((*point->y < Overlap.S) && (*point->y > General.S)) {	/*(2) */
@@ -138,7 +138,7 @@
 			db_append_string(&sql, buf);
 
 			if (db_execute_immediate(driver, &sql) != DB_OK)
-			    G_fatal_error(_("Unable to write to table: %s"),
+			    G_fatal_error(_("Unable to access table <%s>"),
 					  buf);
 		    }
 		    else if ((*point->y >= Overlap.S) && (*point->y <= Overlap.N)) {	/*(2) */
@@ -151,7 +151,7 @@
 			db_append_string(&sql, buf);
 
 			if (db_execute_immediate(driver, &sql) != DB_OK)
-			    G_fatal_error(_("Unable to write to table: %s"),
+			    G_fatal_error(_("Unable to access table <%s>"),
 					  buf);
 		    }
 		}
@@ -166,7 +166,7 @@
 			db_append_string(&sql, buf);
 
 			if (db_execute_immediate(driver, &sql) != DB_OK)
-			    G_fatal_error(_("Unable to write to table: %s"),
+			    G_fatal_error(_("Unable to access table <%s>"),
 					  buf);
 		    }
 		    else if ((*point->y < Overlap.S) && (*point->y > General.S)) {	/*(1) */
@@ -179,7 +179,7 @@
 			db_append_string(&sql, buf);
 
 			if (db_execute_immediate(driver, &sql) != DB_OK)
-			    G_fatal_error(_("Unable to write to table: %s"),
+			    G_fatal_error(_("Unable to access table <%s>"),
 					  buf);
 		    }
 		}

Modified: grass/trunk/vector/lidar/v.lidar.correction/main.c
===================================================================
--- grass/trunk/vector/lidar/v.lidar.correction/main.c	2010-02-17 08:18:12 UTC (rev 41060)
+++ grass/trunk/vector/lidar/v.lidar.correction/main.c	2010-02-17 17:05:36 UTC (rev 41061)
@@ -37,7 +37,7 @@
     int dim_vect, nparameters, BW, npoints, nrows, ncols;
     int nsply, nsplx, nsplx_adj, nsply_adj;
     int nsubregion_col, nsubregion_row;
-    int subzone = 0, nsubzones = 0;
+    int subregion = 0, nsubregions = 0;
     const char *dvr, *db, *mapset;
     char table_name[GNAME_MAX];
     char xname[GNAME_MAX], xmapset[GMAPSET_MAX];
@@ -277,10 +277,10 @@
     P_get_orlo(P_BILINEAR, &dims, passoE, passoN);
     P_set_dim(&dims, passoE, passoN, &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 subzones */
+    /* calculate number of subregions */
     orloE = dims.latoE - dims.overlap - 2 * dims.orlo_v;
     orloN = dims.latoN - dims.overlap - 2 * dims.orlo_h;
 
@@ -295,7 +295,7 @@
     if (nsubregion_row < 0)
 	nsubregion_row = 0;
 
-    nsubzones = nsubregion_row * nsubregion_col;
+    nsubregions = nsubregion_row * nsubregion_col;
 
     elaboration_reg.south = original_reg.north;
     last_row = FALSE;
@@ -331,9 +331,9 @@
 
 	while (last_column == FALSE) {	/* For each column */
 
-	    subzone++;
-	    if (nsubzones > 1)
-		G_message(_("subzone %d of %d"), subzone, nsubzones);
+	    subregion++;
+	    if (nsubregions > 1)
+		G_message(_("subregion %d of %d"), subregion, nsubregions);
 
 	    P_set_regions(&elaboration_reg, &general_box, &overlap_box, dims,
 			  GENERAL_COLUMN);
@@ -428,7 +428,7 @@
 	    }
 	    else {
 		G_free(observ);
-		G_warning(_("No data within this subzone. "
+		G_warning(_("No data within this subregion. "
 			    "Consider changing the spline step."));
 	    }
 	    G_free(lcat);

Modified: grass/trunk/vector/lidar/v.lidar.edgedetection/main.c
===================================================================
--- grass/trunk/vector/lidar/v.lidar.edgedetection/main.c	2010-02-17 08:18:12 UTC (rev 41060)
+++ grass/trunk/vector/lidar/v.lidar.edgedetection/main.c	2010-02-17 17:05:36 UTC (rev 41061)
@@ -43,7 +43,7 @@
 {
     /* Variables' declarations */
     int nsplx_adj, nsply_adj;
-    int nsubregion_col, nsubregion_row, subzone = 0, nsubzones = 0;
+    int nsubregion_col, nsubregion_row, subregion = 0, nsubregions = 0;
     double N_extension, E_extension, orloE, orloN;
     int dim_vect, nparameters, BW, npoints;
     double lambda_B, lambda_F, grad_H, grad_L, alpha, mean;
@@ -297,10 +297,10 @@
     P_get_orlo(P_BICUBIC, &dims, passoE, passoN);
     P_set_dim(&dims, passoE, passoN, &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 subzones */
+    /* calculate number of subregions */
     orloE = dims.latoE - dims.overlap - 2 * dims.orlo_v;
     orloN = dims.latoN - dims.overlap - 2 * dims.orlo_h;
 
@@ -315,7 +315,7 @@
     if (nsubregion_row < 0)
 	nsubregion_row = 0;
 
-    nsubzones = nsubregion_row * nsubregion_col;
+    nsubregions = nsubregion_row * nsubregion_col;
 
     elaboration_reg.south = original_reg.north;
     last_row = FALSE;
@@ -351,9 +351,9 @@
 
 	while (last_column == FALSE) {	/* For each column */
 
-	    subzone++;
-	    if (nsubzones > 1)
-		G_message(_("subzone %d of %d"), subzone, nsubzones);
+	    subregion++;
+	    if (nsubregions > 1)
+		G_message(_("subregion %d of %d"), subregion, nsubregions);
 
 	    P_set_regions(&elaboration_reg, &general_box, &overlap_box, dims,
 			  GENERAL_COLUMN);
@@ -459,7 +459,7 @@
 	    }			/* IF */
 	    else {
 		G_free(observ);
-		G_warning(_("No data within this subzone. "
+		G_warning(_("No data within this subregion. "
 			    "Consider changing the spline step."));
 	    }
 	}			/*! END WHILE; last_column = TRUE */

Modified: grass/trunk/vector/lidar/v.lidar.growing/main.c
===================================================================
--- grass/trunk/vector/lidar/v.lidar.growing/main.c	2010-02-17 08:18:12 UTC (rev 41060)
+++ grass/trunk/vector/lidar/v.lidar.growing/main.c	2010-02-17 17:05:36 UTC (rev 41061)
@@ -41,7 +41,7 @@
     /* Variables' declarations */
     int row, nrows, col, ncols, MaxPoints;
     int nsubregion_col, nsubregion_row;
-    int subzone = 0, nsubzones = 0;
+    int subregion = 0, nsubregions = 0;
     int last_row, last_column;
     int nlines, nlines_first, line_num;
     int more;
@@ -212,7 +212,7 @@
     ew_resol = original_reg.ew_res;
     ns_resol = original_reg.ns_res;
 
-    /* calculate number of subzones */
+    /* calculate number of subregions */
     nsubregion_col = ceil((original_reg.east - original_reg.west) / (LATO * ew_resol)) + 0.5;
     nsubregion_row = ceil((original_reg.north - original_reg.south) / (LATO * ns_resol)) + 0.5;
 
@@ -221,7 +221,7 @@
     if (nsubregion_row < 0)
 	nsubregion_row = 0;
 
-    nsubzones = nsubregion_row * nsubregion_col;
+    nsubregions = nsubregion_row * nsubregion_col;
 
     /* Subdividing and working with tiles */
     elaboration_reg.south = original_reg.north;
@@ -246,9 +246,9 @@
 	while (last_column == FALSE) {	/* For each strip of LATO columns */
 	    struct bound_box elaboration_box;
 
-	    subzone++;
-	    if (nsubzones > 1)
-		G_message(_("subzone %d of %d"), subzone, nsubzones);
+	    subregion++;
+	    if (nsubregions > 1)
+		G_message(_("subregion %d of %d"), subregion, nsubregions);
 
 	    elaboration_reg.west = elaboration_reg.east;
 	    if (elaboration_reg.west < original_reg.west)	/* First column */

Modified: grass/trunk/vector/lidar/v.outlier/main.c
===================================================================
--- grass/trunk/vector/lidar/v.outlier/main.c	2010-02-17 08:18:12 UTC (rev 41060)
+++ grass/trunk/vector/lidar/v.outlier/main.c	2010-02-17 17:05:36 UTC (rev 41061)
@@ -38,7 +38,7 @@
     /* Variables' declarations */
     int nsplx_adj, nsply_adj;
     int nsubregion_col, nsubregion_row;
-    int subzone = 0, nsubzones = 0;
+    int subregion = 0, nsubregions = 0;
     double N_extension, E_extension, orloE, orloN;
     int dim_vect, nparameters, BW, npoints;
     double mean, lambda;
@@ -274,10 +274,10 @@
     P_get_orlo(P_BILINEAR, &dims, passoE, passoN);
     P_set_dim(&dims, passoE, passoN, &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 subzones */
+    /* calculate number of subregions */
     orloE = dims.latoE - dims.overlap - 2 * dims.orlo_v;
     orloN = dims.latoN - dims.overlap - 2 * dims.orlo_h;
 
@@ -292,7 +292,7 @@
     if (nsubregion_row < 0)
 	nsubregion_row = 0;
 
-    nsubzones = nsubregion_row * nsubregion_col;
+    nsubregions = nsubregion_row * nsubregion_col;
 
     elaboration_reg.south = original_reg.north;
     last_row = FALSE;
@@ -328,9 +328,9 @@
 
 	while (last_column == FALSE) {	/* For each column */
 
-	    subzone++;
-	    if (nsubzones > 1)
-		G_message(_("subzone %d of %d"), subzone, nsubzones);
+	    subregion++;
+	    if (nsubregions > 1)
+		G_message(_("subregion %d of %d"), subregion, nsubregions);
 
 	    P_set_regions(&elaboration_reg, &general_box, &overlap_box, dims,
 			  GENERAL_COLUMN);
@@ -421,7 +421,7 @@
 	    }			/*! END IF; npoints > 0 */
 	    else {
 		G_free(observ);
-		G_warning(_("No data within this subzone. "
+		G_warning(_("No data within this subregion. "
 			    "Consider changing the spline step."));
 	    }
 	}			/*! END WHILE; last_column = TRUE */

Modified: grass/trunk/vector/lidar/v.surf.bspline/main.c
===================================================================
--- grass/trunk/vector/lidar/v.surf.bspline/main.c	2010-02-17 08:18:12 UTC (rev 41060)
+++ grass/trunk/vector/lidar/v.surf.bspline/main.c	2010-02-17 17:05:36 UTC (rev 41061)
@@ -40,7 +40,7 @@
     /* Variable declarations */
     int nsply, nsplx, nrows, ncols, nsplx_adj, nsply_adj;
     int nsubregion_col, nsubregion_row, subregion_row, subregion_col;
-    int subzone = 0, nsubzones = 0;
+    int subregion = 0, nsubregions = 0;
     int last_row, last_column, grid, bilin, ext, flag_auxiliar, cross;	/* booleans */
     double passoN, passoE, lambda, mean;
     double N_extension, E_extension, orloE, orloN;
@@ -412,10 +412,10 @@
     P_get_orlo(bilin, &dims, passoE, passoN);
     P_set_dim(&dims, passoE, passoN, &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 subzones */
+    /* calculate number of subregions */
     orloE = dims.latoE - dims.overlap - 2 * dims.orlo_v;
     orloN = dims.latoN - dims.overlap - 2 * dims.orlo_h;
 
@@ -430,7 +430,7 @@
     if (nsubregion_row < 0)
 	nsubregion_row = 0;
 
-    nsubzones = nsubregion_row * nsubregion_col;
+    nsubregions = nsubregion_row * nsubregion_col;
 
     /* Creating line and categories structs */
     points = Vect_new_line_struct();
@@ -475,9 +475,9 @@
 	    int npoints = 0;
 
 	    subregion_col++;
-	    subzone++;
-	    if (nsubzones > 1)
-		G_message(_("subzone %d of %d"), subzone, nsubzones);
+	    subregion++;
+	    if (nsubregions > 1)
+		G_message(_("subregion %d of %d"), subregion, nsubregions);
 
 	    P_set_regions(&elaboration_reg, &general_box, &overlap_box, dims,
 			  GENERAL_COLUMN);
@@ -678,7 +678,7 @@
 	    }
 	    else {
 		G_free(observ);
-		G_warning(_("No data within this subzone. "
+		G_warning(_("No data within this subregion. "
 			    "Consider changing the spline step."));
 	    }
 	}			/*! END WHILE; last_column = TRUE */



More information about the grass-commit mailing list