[GRASS-SVN] r47736 - grass/trunk/raster3d/r3.out.v5d
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Aug 17 18:27:44 EDT 2011
Author: neteler
Date: 2011-08-17 15:27:44 -0700 (Wed, 17 Aug 2011)
New Revision: 47736
Modified:
grass/trunk/raster3d/r3.out.v5d/main.c
grass/trunk/raster3d/r3.out.v5d/r3.out.v5d.html
Log:
Milena Nowotarska: i18n cleanup; HTML cleanup
Modified: grass/trunk/raster3d/r3.out.v5d/main.c
===================================================================
--- grass/trunk/raster3d/r3.out.v5d/main.c 2011-08-17 22:24:43 UTC (rev 47735)
+++ grass/trunk/raster3d/r3.out.v5d/main.c 2011-08-17 22:27:44 UTC (rev 47736)
@@ -51,7 +51,7 @@
if (map != NULL) {
/* should unopen map here! */
if (!Rast3d_close(map))
- fatalError("Error closing 3d raster map");
+ fatalError(_("Unable to close 3D raster map"));
}
Rast3d_fatal_error(errorMsg);
@@ -69,14 +69,14 @@
param.input->gisprompt = "old,grid3,3d-raster";
param.input->multiple = NO;
param.input->description =
- _("3d raster map to be converted to Vis5d (v5d) file");
+ _("3D raster map to be converted to Vis5D (V5D) file");
param.output = G_define_option();
param.output->key = "output";
param.output->type = TYPE_STRING;
param.output->gisprompt = "new_file,file,output";
param.output->required = YES;
- param.output->description = _("Name for v5d output file");
+ param.output->description = _("Name for V5D output file");
/* param.null_val = G_define_option();
param.null_val->key = "null";
@@ -146,10 +146,10 @@
/* see v5d.h */
if (cols > MAXCOLUMNS)
- G_fatal_error(_("Viz5D allows %d cols, you have %d cols"), MAXCOLUMNS,
+ G_fatal_error(_("Vis5D allows %d columns, %d columns found"), MAXCOLUMNS,
cols);
if (rows > MAXROWS)
- G_fatal_error(_("Viz5D allows %d rows, you have %d rows"), MAXROWS,
+ G_fatal_error(_("Vis5D allows %d rows, %d rows found"), MAXROWS,
rows);
Nl[0] = depths;
@@ -198,9 +198,6 @@
/****************/
g = (float *)G_malloc(rows * cols * Nl[0] * sizeof(float));
- if (!g)
- G_fatal_error(_("Out of memory"));
-
d1p = &d1;
f1p = (float *)&d1;
cnt = 0;
@@ -259,12 +256,12 @@
if (!v5dCreate(fileout, NumTimes, NumVars, rows, cols, Nl, (const char (*)[10])VarName,
TimeStamp, DateStamp, CompressMode, Projection,
ProjArgs, Vertical, VertArgs))
- G_fatal_error(_("Error: couldn't create %s"), fileout);
+ G_fatal_error(_("Unable to create V5D file <%s>"), fileout);
/* Write the v5d file */
if (!v5dWrite(1, 1, g))
- G_fatal_error(_("Error while writing grid. Disk full?"));
+ G_fatal_error(_("Error writing V5D file"));
/* Close the v5d file */
v5dClose();
@@ -290,7 +287,7 @@
G_add_keyword(_("voxel"));
G_add_keyword(_("export"));
module->description =
- _("Converts a 3D raster map into a 3-dimensional Vis5D file.");
+ _("Exports GRASS 3D raster map to 3-dimensional Vis5D file.");
/* Get parameters from user */
setParams();
@@ -309,12 +306,12 @@
trueCoords = coords->answer;
if (NULL == G_find_raster3d(input, ""))
- Rast3d_fatal_error(_("Requested 3d raster map not found"));
+ Rast3d_fatal_error(_("3D raster map <%s> not found"), input);
map = Rast3d_open_cell_old(input, G_find_raster3d(input, ""), RASTER3D_DEFAULT_WINDOW,
RASTER3D_TILE_SAME_AS_FILE, RASTER3D_NO_CACHE);
if (map == NULL)
- Rast3d_fatal_error(_("Error opening 3d raster map"));
+ Rast3d_fatal_error(_("Unable to open 3D raster map <%s>"), input);
/* Use default region */
/* Rast3d_get_region_struct_map(map, ®ion); */
@@ -328,7 +325,7 @@
/* Close files and exit */
if (!Rast3d_close(map))
- fatalError(_("Error closing 3d raster map"));
+ fatalError(_("Unable to close 3D raster map"));
map = NULL;
return (0);
Modified: grass/trunk/raster3d/r3.out.v5d/r3.out.v5d.html
===================================================================
--- grass/trunk/raster3d/r3.out.v5d/r3.out.v5d.html 2011-08-17 22:24:43 UTC (rev 47735)
+++ grass/trunk/raster3d/r3.out.v5d/r3.out.v5d.html 2011-08-17 22:27:44 UTC (rev 47736)
@@ -1,17 +1,22 @@
-<H2>DESCRIPTION</H2>
+<h2>DESCRIPTION</h2>
-Exports <i>RASTER3D</i> grids to <i>v5d</i> format. <i>map</i> is a valid RASTER3D
-grid in the current mapset. <i>output</i> is the name of a v5d file which
-will be written in the current working directory. <a href="http://www.ssec.wisc.edu/~billh/vis5d.html">VIS5D</a>
-is a system for interactive visualization of large 5D gridded data sets
-such as those produced by numerical weather models. One can make isosurfaces,
-contour line slices, colored slices, volume renderings, etc of data in
-a 3D grid, then rotate and animate the images in real time. There's also
-a feature for wind trajectory tracing, a way to make text anotations for
-publications, support for interactive data analysis, etc.
+Exports 3D raster maps to V5D format. The <em>map</em> parameter is a valid
+3D raster map in the current mapset search path. The <em>output</em> parameter is the name
+of a V5D file which will be written in the current working directory.
+<p>
+<a href="http://www.ssec.wisc.edu/~billh/vis5d.html">Vis5D</a> is a system
+for interactive visualization of large 5D gridded data sets such as those
+produced by numerical weather models. The user can make isosurfaces, contour
+line slices, colored slices, volume renderings, etc. of data in a 3D raster map,
+then rotate and animate the images in real time. There's also a feature
+for wind trajectory tracing, a way to make text anotations for publications,
+support for interactive data analysis, etc.
+
<h2>SEE ALSO</h2>
-<i><a href="r3.in.v5d.html">r3.in.v5d</a></i>
+<i><a href="r3.in.v5d.html">r3.in.v5d</a>,
+<a href="r3.out.vtk.html">r3.out.vtk</a>
+</i>
<h2>AUTHOR</h2>
Jaro Hofierka, GeoModel s.r.o., Slovakia
More information about the grass-commit
mailing list