[GRASS-SVN] r55513 - in grass/trunk/raster3d: r3.gwflow r3.in.ascii r3.mkdspf r3.null r3.out.ascii r3.out.bin r3.out.netcdf r3.out.vtk r3.retile r3.showdspf r3.support r3.timestamp r3.to.rast
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Mar 25 01:38:44 PDT 2013
Author: neteler
Date: 2013-03-25 01:38:43 -0700 (Mon, 25 Mar 2013)
New Revision: 55513
Modified:
grass/trunk/raster3d/r3.gwflow/main.c
grass/trunk/raster3d/r3.in.ascii/r3.in.ascii.html
grass/trunk/raster3d/r3.mkdspf/calc_linefax.c
grass/trunk/raster3d/r3.mkdspf/main.c
grass/trunk/raster3d/r3.mkdspf/r3_find.c
grass/trunk/raster3d/r3.null/main.c
grass/trunk/raster3d/r3.out.ascii/main.c
grass/trunk/raster3d/r3.out.bin/main.c
grass/trunk/raster3d/r3.out.netcdf/main.c
grass/trunk/raster3d/r3.out.vtk/writeVTKData.c
grass/trunk/raster3d/r3.out.vtk/writeVTKHead.c
grass/trunk/raster3d/r3.retile/main.c
grass/trunk/raster3d/r3.showdspf/r3_find.c
grass/trunk/raster3d/r3.support/check.c
grass/trunk/raster3d/r3.support/main.c
grass/trunk/raster3d/r3.timestamp/r3.timestamp.main.c
grass/trunk/raster3d/r3.to.rast/main.c
Log:
more msg standardization
Modified: grass/trunk/raster3d/r3.gwflow/main.c
===================================================================
--- grass/trunk/raster3d/r3.gwflow/main.c 2013-03-25 07:31:21 UTC (rev 55512)
+++ grass/trunk/raster3d/r3.gwflow/main.c 2013-03-25 08:38:43 UTC (rev 55513)
@@ -409,7 +409,7 @@
if (!Rast3d_flush_all_tiles(map))
Rast3d_fatal_error("Error flushing tiles with Rast3d_flush_all_tiles");
if (!Rast3d_close(map))
- Rast3d_fatal_error(map, NULL, 0, _("Error closing g3d file"));
+ Rast3d_fatal_error(map, NULL, 0, _("Unable to close 3D raster map"));
return;
}
Modified: grass/trunk/raster3d/r3.in.ascii/r3.in.ascii.html
===================================================================
--- grass/trunk/raster3d/r3.in.ascii/r3.in.ascii.html 2013-03-25 07:31:21 UTC (rev 55512)
+++ grass/trunk/raster3d/r3.in.ascii/r3.in.ascii.html 2013-03-25 08:38:43 UTC (rev 55513)
@@ -13,11 +13,6 @@
<h2>NOTES</h2>
-A detailed description of the input format as well as the supported row/depth
-ordering is available in the <a href="r3.out.ascii.html">r3.out.ascii</a>.
-manual page. The order of the data in the input file does not specifiy the
-data order in the generated output 3D raster map which is in any case
-<em>north -> south, west -> east, bottom -> top</em> order.
The data is automatically imported into the correct internal coordinate system,
that is visualized in the following picture, independently from the specified
ordering in the ASCII input file:
Modified: grass/trunk/raster3d/r3.mkdspf/calc_linefax.c
===================================================================
--- grass/trunk/raster3d/r3.mkdspf/calc_linefax.c 2013-03-25 07:31:21 UTC (rev 55512)
+++ grass/trunk/raster3d/r3.mkdspf/calc_linefax.c 2013-03-25 08:38:43 UTC (rev 55513)
@@ -30,12 +30,12 @@
sscanf(a_max, "%f", &max);
datarange = max - min;
if (datarange <= 0.0)
- G_fatal_error("range error: %f", datarange);
+ G_fatal_error("Range error: %f", datarange);
if (a_levels) {
for (i = 0; a_levels[i]; i++) {
if (i == MAXTHRESH) {
- G_warning("maximum no. of thresholds is %d", MAXTHRESH);
+ G_warning("Maximum no. of thresholds is %d", MAXTHRESH);
break;
}
if (1 != sscanf(a_levels[i], "%f", &(linefax->tvalue[i]))) {
@@ -66,7 +66,7 @@
if (do_interval) {
for (i = 0, tval = min; tval <= max; i++, tval = min + (i * interval)) {
if (i == MAXTHRESH) {
- G_warning("maximum no. of thresholds is %d", MAXTHRESH);
+ G_warning("Maximum no. of thresholds is %d", MAXTHRESH);
break;
}
linefax->tvalue[i] = tval;
@@ -79,7 +79,7 @@
fprintf(stderr, "threshold values: ");
for (i = 0; i < linefax->nthres; i++)
fprintf(stderr, "%f ", linefax->tvalue[i]);
- G_message("\nNo. of thresholds: %i", linefax->nthres + 1);
+ G_message("No. of thresholds: %i", linefax->nthres + 1);
}
Modified: grass/trunk/raster3d/r3.mkdspf/main.c
===================================================================
--- grass/trunk/raster3d/r3.mkdspf/main.c 2013-03-25 07:31:21 UTC (rev 55512)
+++ grass/trunk/raster3d/r3.mkdspf/main.c 2013-03-25 08:38:43 UTC (rev 55513)
@@ -164,10 +164,10 @@
*/
if (NULL == g3map)
- G_fatal_error(_("Error opening grid3 file [%s]"), name->answer);
+ G_fatal_error(_("Unable to open 3D raster map <%s>"), name->answer);
if (0 == Rast3d_range_load(g3map))
- G_fatal_error(_("Error reading range for [%s]"), name->answer);
+ G_fatal_error(_("Unable to read range of 3D raster map <%s>"), name->answer);
/* TODO: look at this - should use current 3dregion rather than
region represented by original 3dgrid file */
@@ -196,7 +196,7 @@
/* open display file for writing */
sprintf(element, "grid3/%s/dsp", name->answer);
if ((Headfax.dspfoutfp = G_fopen_new(element, dspout)) == NULL)
- G_fatal_error(_("Error opening display file [%s]"), dspout);
+ G_fatal_error(_("Unable to open display file <%s>"), dspout);
/* write display file header info */
/* have to adjust dimensions -dpg */
Modified: grass/trunk/raster3d/r3.mkdspf/r3_find.c
===================================================================
--- grass/trunk/raster3d/r3.mkdspf/r3_find.c 2013-03-25 07:31:21 UTC (rev 55512)
+++ grass/trunk/raster3d/r3.mkdspf/r3_find.c 2013-03-25 08:38:43 UTC (rev 55513)
@@ -31,7 +31,7 @@
const char *check_get_any_dspname(const char *dspf, const char *g3f, const char *mset)
{
if (!G_find_raster3d(g3f, ""))
- G_fatal_error("[%s] 3D raster map not found", g3f);
+ G_fatal_error("3D raster map <%s> not found", g3f);
if (mset) { /* otherwise must be reading only */
if (g3_find_dsp_file(g3f, dspf, mset)) { /* already exists */
Modified: grass/trunk/raster3d/r3.null/main.c
===================================================================
--- grass/trunk/raster3d/r3.null/main.c 2013-03-25 07:31:21 UTC (rev 55512)
+++ grass/trunk/raster3d/r3.null/main.c 2013-03-25 08:38:43 UTC (rev 55513)
@@ -165,7 +165,7 @@
Rast3d_unlock_all(mapOut);
if (!Rast3d_close(map))
- Rast3d_fatal_error(_("Unable to close raster map"));
+ Rast3d_fatal_error(_("Unable to close 3D raster map <%s>"), name);
if (!Rast3d_close(mapOut))
Rast3d_fatal_error(_("modifyNull: Unable to close tmp file"));
}
Modified: grass/trunk/raster3d/r3.out.ascii/main.c
===================================================================
--- grass/trunk/raster3d/r3.out.ascii/main.c 2013-03-25 07:31:21 UTC (rev 55512)
+++ grass/trunk/raster3d/r3.out.ascii/main.c 2013-03-25 08:38:43 UTC (rev 55513)
@@ -337,7 +337,7 @@
RASTER3D_TILE_SAME_AS_FILE, RASTER3D_USE_CACHE_DEFAULT);
if (map == NULL)
- Rast3d_fatal_error(_("Error opening 3d raster map <%s>"), input);
+ Rast3d_fatal_error(_("Unable to open 3D raster map <%s>"), input);
/* Open the output ascii file */
fp = openAscii(output, region);
Modified: grass/trunk/raster3d/r3.out.bin/main.c
===================================================================
--- grass/trunk/raster3d/r3.out.bin/main.c 2013-03-25 07:31:21 UTC (rev 55512)
+++ grass/trunk/raster3d/r3.out.bin/main.c 2013-03-25 08:38:43 UTC (rev 55513)
@@ -311,7 +311,7 @@
RASTER3D_TILE_SAME_AS_FILE, RASTER3D_USE_CACHE_DEFAULT);
if (map == NULL)
- Rast3d_fatal_error(_("Error opening 3d raster map <%s>"),
+ Rast3d_fatal_error(_("Unable to open 3D raster map <%s>"),
parm.input->answer);
/* open bin file for writing */
Modified: grass/trunk/raster3d/r3.out.netcdf/main.c
===================================================================
--- grass/trunk/raster3d/r3.out.netcdf/main.c 2013-03-25 07:31:21 UTC (rev 55512)
+++ grass/trunk/raster3d/r3.out.netcdf/main.c 2013-03-25 08:38:43 UTC (rev 55513)
@@ -613,7 +613,7 @@
RASTER3D_USE_CACHE_DEFAULT);
if (map == NULL)
- G_fatal_error(_("Error opening 3d raster map <%s>"),
+ G_fatal_error(_("Unable to open 3D raster map <%s>"),
param.input->answer);
/* Create netCDF file */
Modified: grass/trunk/raster3d/r3.out.vtk/writeVTKData.c
===================================================================
--- grass/trunk/raster3d/r3.out.vtk/writeVTKData.c 2013-03-25 07:31:21 UTC (rev 55512)
+++ grass/trunk/raster3d/r3.out.vtk/writeVTKData.c 2013-03-25 08:38:43 UTC (rev 55513)
@@ -438,7 +438,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!"));
fprintf(fp, "0 ");
} else {
Modified: grass/trunk/raster3d/r3.out.vtk/writeVTKHead.c
===================================================================
--- grass/trunk/raster3d/r3.out.vtk/writeVTKHead.c 2013-03-25 07:31:21 UTC (rev 55512)
+++ grass/trunk/raster3d/r3.out.vtk/writeVTKHead.c 2013-03-25 08:38:43 UTC (rev 55513)
@@ -37,7 +37,7 @@
double scale)
{
G_debug(3,
- _("write_vtk_structured_point_header: Writing VTKStructuredPoint-Header"));
+ "write_vtk_structured_point_header: Writing VTKStructuredPoint-Header");
/*Simple vtk ASCII header */
@@ -93,7 +93,7 @@
RASTER3D_Region region)
{
G_debug(3,
- _("write_vtk_structured_grid_header: Writing VTKStructuredGrid-Header"));
+ "write_vtk_structured_grid_header: Writing VTKStructuredGrid-Header");
fprintf(fp, "# vtk DataFile Version 3.0\n");
fprintf(fp, "GRASS GIS 7 Export\n");
fprintf(fp, "ASCII\n");
@@ -115,7 +115,7 @@
RASTER3D_Region region)
{
G_debug(3,
- _("write_vtk_unstructured_grid_header: Writing VTKUnstructuredGrid-Header"));
+ "write_vtk_unstructured_grid_header: Writing VTKUnstructuredGrid-Header");
fprintf(fp, "# vtk DataFile Version 3.0\n");
fprintf(fp, "GRASS GIS 7 Export\n");
fprintf(fp, "ASCII\n");
Modified: grass/trunk/raster3d/r3.retile/main.c
===================================================================
--- grass/trunk/raster3d/r3.retile/main.c 2013-03-25 07:31:21 UTC (rev 55512)
+++ grass/trunk/raster3d/r3.retile/main.c 2013-03-25 08:38:43 UTC (rev 55513)
@@ -11,8 +11,8 @@
* COPYRIGHT: (C) 2011 by the GRASS Development Team
*
* This program is free software under the GNU General Public
- * License (>=v2). Read the file COPYING that comes with GRASS
- * for details.
+ * License (>=v2). Read the file COPYING that comes with GRASS
+ * for details.
*
*****************************************************************************/
#include <stdio.h>
@@ -46,7 +46,7 @@
/* Close files and exit */
if (map != NULL) {
if (!Rast3d_close(map))
- Rast3d_fatal_error(_("Unable to close the 3d raster map"));
+ Rast3d_fatal_error(_("Unable to close the 3D raster map"));
}
if (fd != NULL) {
@@ -105,12 +105,12 @@
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
- G_debug(3, "Open 3d raster map <%s>", param.input->answer);
+ G_debug(3, "Open 3D raster map <%s>", param.input->answer);
mapset = G_find_raster3d(param.input->answer, "");
if (mapset == NULL)
- Rast3d_fatal_error(_("3d raster map <%s> not found"),
+ Rast3d_fatal_error(_("3D raster map <%s> not found"),
param.input->answer);
/*Set the defaults */
@@ -124,7 +124,7 @@
RASTER3D_TILE_SAME_AS_FILE, RASTER3D_NO_CACHE);
if (map == NULL)
- Rast3d_fatal_error(_("Unable to open 3d raster map <%s>"),
+ Rast3d_fatal_error(_("Unable to open 3D raster map <%s>"),
param.input->answer);
/* Get the tile dimension */
@@ -145,7 +145,7 @@
/* Close files and exit */
if (!Rast3d_close(map))
- fatal_error(map, NULL, 0, _("Error closing 3d raster map"));
+ fatal_error(map, NULL, 0, _("Error closing 3D raster map"));
map = NULL;
Modified: grass/trunk/raster3d/r3.showdspf/r3_find.c
===================================================================
--- grass/trunk/raster3d/r3.showdspf/r3_find.c 2013-03-25 07:31:21 UTC (rev 55512)
+++ grass/trunk/raster3d/r3.showdspf/r3_find.c 2013-03-25 08:38:43 UTC (rev 55513)
@@ -36,7 +36,7 @@
static char dspout[200];
if (!G_find_raster3d(g3f, "")) {
- fprintf(stderr, "[%s] 3D raster map not found\n", g3f);
+ fprintf(stderr, "3D raster map <%s> not found", g3f);
return (NULL);
}
Modified: grass/trunk/raster3d/r3.support/check.c
===================================================================
--- grass/trunk/raster3d/r3.support/check.c 2013-03-25 07:31:21 UTC (rev 55512)
+++ grass/trunk/raster3d/r3.support/check.c 2013-03-25 08:38:43 UTC (rev 55513)
@@ -17,7 +17,7 @@
struct FPRange fprange;
int cats_ok;
- G_message(_("\n Updating statistics for [%s]"), name);
+ G_message(_("Updating statistics for <%s>"), name);
/* Get category status and max */
cats_ok = (Rast3d_read_cats(name, "", &cats) >= 0);
@@ -33,8 +33,7 @@
/* Update categories if needed */
if (!cats_ok) {
- G_message(_(" Updating the number of categories for "
- "[%s]\n\n"), name);
+ G_message(_("Updating the number of categories for <%s>"), name);
Rast3d_write_cats(name, &cats);
}
Rast_free_cats(&cats);
Modified: grass/trunk/raster3d/r3.support/main.c
===================================================================
--- grass/trunk/raster3d/r3.support/main.c 2013-03-25 07:31:21 UTC (rev 55512)
+++ grass/trunk/raster3d/r3.support/main.c 2013-03-25 08:38:43 UTC (rev 55513)
@@ -131,7 +131,7 @@
infile = raster->answer;
mapset = G_find_raster3d(infile, G_mapset()); /* current mapset only for editing */
if (!mapset || strcmp(mapset, G_mapset()) != 0)
- G_fatal_error(_("Raster3d map <%s> not found in current mapset"), infile);
+ G_fatal_error(_("3D raster map <%s> not found"), infile);
if (title_opt->answer) {
strncpy(title, title_opt->answer, MAX_TITLE_LEN);
Modified: grass/trunk/raster3d/r3.timestamp/r3.timestamp.main.c
===================================================================
--- grass/trunk/raster3d/r3.timestamp/r3.timestamp.main.c 2013-03-25 07:31:21 UTC (rev 55512)
+++ grass/trunk/raster3d/r3.timestamp/r3.timestamp.main.c 2013-03-25 08:38:43 UTC (rev 55513)
@@ -67,8 +67,7 @@
mapset = G_find_raster3d(name, "");
if (mapset == NULL) {
- G_fatal_error(_("Raster3d map <%s> not found %s"), name,
- modify ? "in current mapset" : "");
+ G_fatal_error(_("3D raster map <%s> not found"), name);
exit(EXIT_FAILURE);
}
@@ -86,7 +85,7 @@
}
if(G_scan_timestamp(&ts, date->answer) != 1)
- G_fatal_error("Timestamp format is invalid");
+ G_fatal_error(_("Timestamp format is invalid"));
G_write_raster3d_timestamp(name, &ts);
exit(EXIT_SUCCESS);
Modified: grass/trunk/raster3d/r3.to.rast/main.c
===================================================================
--- grass/trunk/raster3d/r3.to.rast/main.c 2013-03-25 07:31:21 UTC (rev 55512)
+++ grass/trunk/raster3d/r3.to.rast/main.c 2013-03-25 08:38:43 UTC (rev 55513)
@@ -216,7 +216,7 @@
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
- G_debug(3, _("Open 3D raster map <%s>"), param.input->answer);
+ G_debug(3, "Open 3D raster map <%s>", param.input->answer);
if (NULL == G_find_raster3d(param.input->answer, ""))
Rast3d_fatal_error(_("3D raster map <%s> not found"),
@@ -234,7 +234,7 @@
RASTER3D_DEFAULT_WINDOW, RASTER3D_TILE_SAME_AS_FILE,
RASTER3D_USE_CACHE_DEFAULT);
if (map == NULL)
- Rast3d_fatal_error(_("Error opening 3D raster map <%s>"),
+ Rast3d_fatal_error(_("Unable to open 3D raster map <%s>"),
param.input->answer);
@@ -258,7 +258,7 @@
RASTER3D_USE_CACHE_DEFAULT);
if (map == NULL)
- Rast3d_fatal_error(_("Error opening 3D raster map <%s>"),
+ Rast3d_fatal_error(_("Unable to open 3D raster map <%s>"),
param.input->answer);
}
More information about the grass-commit
mailing list