[GRASS-SVN] r32588 - in grass/trunk/raster3d: base r3.cross.rast
r3.gwflow r3.in.ascii r3.out.vtk r3.stats r3.to.rast
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Aug 6 18:06:47 EDT 2008
Author: neteler
Date: 2008-08-06 18:06:47 -0400 (Wed, 06 Aug 2008)
New Revision: 32588
Modified:
grass/trunk/raster3d/base/r3.mask.main.c
grass/trunk/raster3d/r3.cross.rast/main.c
grass/trunk/raster3d/r3.gwflow/main.c
grass/trunk/raster3d/r3.in.ascii/main.c
grass/trunk/raster3d/r3.out.vtk/main.c
grass/trunk/raster3d/r3.out.vtk/writeVTKData.c
grass/trunk/raster3d/r3.stats/main.c
grass/trunk/raster3d/r3.to.rast/main.c
Log:
fixed unlucky formatted messages (thanks to Glynn)
Modified: grass/trunk/raster3d/base/r3.mask.main.c
===================================================================
--- grass/trunk/raster3d/base/r3.mask.main.c 2008-08-06 22:06:12 UTC (rev 32587)
+++ grass/trunk/raster3d/base/r3.mask.main.c 2008-08-06 22:06:47 UTC (rev 32588)
@@ -156,8 +156,7 @@
if (G3d_maskFileExists())
- G_fatal_error(_
- ("Cannot create mask file: G3D_MASK already exists!\n Use 'g.remove rast3d=G3D_MASK' to remove the existing mask."));
+ G_fatal_error(_("Cannot create mask file: G3D_MASK already exists!\n Use 'g.remove rast3d=G3D_MASK' to remove the existing mask."));
setParams();
if (G_parser(argc, argv))
Modified: grass/trunk/raster3d/r3.cross.rast/main.c
===================================================================
--- grass/trunk/raster3d/r3.cross.rast/main.c 2008-08-06 22:06:12 UTC (rev 32587)
+++ grass/trunk/raster3d/r3.cross.rast/main.c 2008-08-06 22:06:47 UTC (rev 32588)
@@ -296,8 +296,7 @@
/*If not equal, set the 2D windows correct */
if (rows != region.rows || cols != region.cols) {
G_message
- (_
- ("The 2d and 3d region settings are different. I will use the g3d settings to adjust the 2d region."));
+ (_("The 2d and 3d region settings are different. I will use the g3d settings to adjust the 2d region."));
G_get_set_window(&window2d);
window2d.ns_res = region.ns_res;
window2d.ew_res = region.ew_res;
Modified: grass/trunk/raster3d/r3.gwflow/main.c
===================================================================
--- grass/trunk/raster3d/r3.gwflow/main.c 2008-08-06 22:06:12 UTC (rev 32587)
+++ grass/trunk/raster3d/r3.gwflow/main.c 2008-08-06 22:06:47 UTC (rev 32588)
@@ -190,14 +190,11 @@
solver = param.solver->answer;
if (strcmp(solver, N_SOLVER_DIRECT_LU) == 0 && param.sparse->answer)
- G_fatal_error(_
- ("The direct LU solver do not work with sparse matrices"));
+ G_fatal_error(_("The direct LU solver do not work with sparse matrices"));
if (strcmp(solver, N_SOLVER_DIRECT_GAUSS) == 0 && param.sparse->answer)
- G_fatal_error(_
- ("The direct Gauss solver do not work with sparse matrices"));
+ G_fatal_error(_("The direct Gauss solver do not work with sparse matrices"));
if (strcmp(solver, N_SOLVER_DIRECT_CHOLESKY) == 0 && param.sparse->answer)
- G_fatal_error(_
- ("The direct cholesky solver do not work with sparse matrices"));
+ G_fatal_error(_("The direct cholesky solver do not work with sparse matrices"));
@@ -299,8 +296,7 @@
N_solver_cholesky(les);
if (les == NULL)
- G_fatal_error(_
- ("Unable to create and solve the linear equation system"));
+ G_fatal_error(_("Unable to create and solve the linear equation system"));
/*write the result to the output file and copy the values to the data->phead array */
Modified: grass/trunk/raster3d/r3.in.ascii/main.c
===================================================================
--- grass/trunk/raster3d/r3.in.ascii/main.c 2008-08-06 22:06:12 UTC (rev 32587)
+++ grass/trunk/raster3d/r3.in.ascii/main.c 2008-08-06 22:06:47 UTC (rev 32588)
@@ -188,8 +188,7 @@
for (x = 0; x < region->cols; x++) {
if (fscanf(fp, "%lf", &value) != 1) {
if (feof(fp))
- G_warning(_
- ("End of file reached while still loading data."));
+ G_warning(_("End of file reached while still loading data."));
G_debug(0,
"missing data at col=%d row=%d depth=%d last_value=[%.4f]",
x + 1, region->rows - y, z + 1, value);
Modified: grass/trunk/raster3d/r3.out.vtk/main.c
===================================================================
--- grass/trunk/raster3d/r3.out.vtk/main.c 2008-08-06 22:06:12 UTC (rev 32587)
+++ grass/trunk/raster3d/r3.out.vtk/main.c 2008-08-06 22:06:47 UTC (rev 32588)
@@ -164,21 +164,18 @@
for (i = 0; i < 3; i++) {
if (param.vectormaps->answers[i] != NULL) {
if (NULL == G_find_grid3(param.vectormaps->answers[i], ""))
- G3d_fatalError(_
- ("Requested g3d vector map <%s> not found"),
+ G3d_fatalError(_("Requested g3d vector map <%s> not found"),
param.vectormaps->answers[i]);
}
else {
- G3d_fatalError(_
- ("Please provide three g3d vector maps [x,y,z]"));
+ G3d_fatalError(_("Please provide three g3d vector maps [x,y,z]"));
}
}
}
if (param.input->answers == NULL && param.rgbmaps->answers == NULL &&
param.vectormaps->answers == NULL) {
- G_warning(_
- ("No g3d data, RGB or xyz-vector maps are provided! Will only write the geometry."));
+ G_warning(_("No g3d data, RGB or xyz-vector maps are provided! Will only write the geometry."));
}
return;
@@ -451,8 +448,7 @@
/*If not equal, set the 2D windows correct */
if (rows != region.rows || cols != region.cols) {
- G_message(_
- ("The 2d and 3d region settings are different. The g3d settings are used to adjust the 2d region."));
+ G_message(_("The 2d and 3d region settings are different. The g3d settings are used to adjust the 2d region."));
G_get_set_window(&window2d);
window2d.ns_res = region.ns_res;
window2d.ew_res = region.ew_res;
@@ -546,8 +542,7 @@
/* Close the 3d raster map */
if (!G3d_closeCell(in->map)) {
in->map = NULL;
- fatal_error(_
- ("Error closing 3d raster map, the VTK file may be incomplete."),
+ fatal_error(_("Error closing 3d raster map, the VTK file may be incomplete."),
in);
}
Modified: grass/trunk/raster3d/r3.out.vtk/writeVTKData.c
===================================================================
--- grass/trunk/raster3d/r3.out.vtk/writeVTKData.c 2008-08-06 22:06:12 UTC (rev 32587)
+++ grass/trunk/raster3d/r3.out.vtk/writeVTKData.c 2008-08-06 22:06:47 UTC (rev 32588)
@@ -427,8 +427,7 @@
0.0);
/*Test of value range, the data should be 1 byte gray values */
if (value > 255 || value < 0) {
- G_warning(_
- ("Wrong 3d raster map values! Values should in between 0 and 255!\n"));
+ G_warning(_("Wrong 3d raster map values! Values should in between 0 and 255!\n"));
fprintf(fp, "0 ");
}
else {
@@ -461,8 +460,7 @@
0.0);
/*Test of value range, the data should be 1 byte gray values */
if (value > 255 || value < 0) {
- G_warning(_
- ("Wrong 3d raster map values! Values should in between 0 and 255!\n"));
+ G_warning(_("Wrong 3d raster map values! Values should in between 0 and 255!\n"));
fprintf(fp, "0 ");
}
else {
Modified: grass/trunk/raster3d/r3.stats/main.c
===================================================================
--- grass/trunk/raster3d/r3.stats/main.c 2008-08-06 22:06:12 UTC (rev 32587)
+++ grass/trunk/raster3d/r3.stats/main.c 2008-08-06 22:06:47 UTC (rev 32588)
@@ -603,8 +603,7 @@
/* break if the wrong number of subranges are given */
if (nsteps <= 0)
- G_fatal_error(_
- ("The number of subranges has to be equal or greater than 1"));
+ G_fatal_error(_("The number of subranges has to be equal or greater than 1"));
infile = inputfile->answer;
Modified: grass/trunk/raster3d/r3.to.rast/main.c
===================================================================
--- grass/trunk/raster3d/r3.to.rast/main.c 2008-08-06 22:06:12 UTC (rev 32587)
+++ grass/trunk/raster3d/r3.to.rast/main.c 2008-08-06 22:06:47 UTC (rev 32588)
@@ -310,8 +310,7 @@
G_message(_("Raster map %i Filename: %s"), i + 1, RasterFileName);
if (G_find_cell2(RasterFileName, ""))
- G_message(_
- ("Raster map %d Filename: %s already exists. Will be overwritten!"),
+ G_message(_("Raster map %d Filename: %s already exists. Will be overwritten!"),
i + 1, RasterFileName);
if (output_type == FCELL_TYPE)
More information about the grass-commit
mailing list