[GRASS-SVN] r47718 - grass/branches/develbranch_6/raster3d/r3.out.ascii

svn_grass at osgeo.org svn_grass at osgeo.org
Wed Aug 17 17:21:11 EDT 2011


Author: neteler
Date: 2011-08-17 14:21:11 -0700 (Wed, 17 Aug 2011)
New Revision: 47718

Modified:
   grass/branches/develbranch_6/raster3d/r3.out.ascii/description.html
   grass/branches/develbranch_6/raster3d/r3.out.ascii/main.c
Log:
Milena Nowotarska: i18n cleanup; HTML cleanup

Modified: grass/branches/develbranch_6/raster3d/r3.out.ascii/description.html
===================================================================
--- grass/branches/develbranch_6/raster3d/r3.out.ascii/description.html	2011-08-17 21:20:56 UTC (rev 47717)
+++ grass/branches/develbranch_6/raster3d/r3.out.ascii/description.html	2011-08-17 21:21:11 UTC (rev 47718)
@@ -1,21 +1,22 @@
-<H2>DESCRIPTION</H2>
+<h2>DESCRIPTION</h2>
 
-Outputs <I>G3D</I> maps in <I>ascii</I> format.  <I>map</I> is
-a valid G3D map in the current mapset.  <I>output</I> is the name of
-an ascii file which will be written in the current working directory.
-If <I>output</I> is not specified then <B>stdout</B> is used.  The
-<I>-h</I> flag may be used to suppress header information. The module is
-sensitive to region settings (set with g.region).
+Outputs 3D raster maps in ASCII 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 an ASCII file which will be written in the 
+current working directory.
+<p>
+If <em>output</em> is not specified then standard output (stdout) is used. The
+<em>-h</em> flag may be used to suppress header information. The module is
+sensitive to region settings (set with <em>g.region</em>).
 
+<h2>NOTES</h2>
+The default format for the ASCII file is equivalent to that required
+by <em>r3.in.ascii</em>. In particular, files output by
+<em>r3.out.ascii</em> with header information may be converted back to
+3D raster maps with <em>r3.in.ascii</em>.
 
-<H2>NOTES</H2>
-The default format for the ascii file is equivalent to that required
-by <EM>r3.in.ascii</EM>.  In particular, files output by
-<EM>r3.out.ascii</EM> with header information may be converted back to
-G3D maps with <EM>r3.in.ascii</EM>.
-
-<P>
-The format for the ascii file is:
+<p>
+The format for the ASCII file is:
 <pre>
 north:   <i>floating point</i>
 south:   <i>floating point</i>
@@ -28,7 +29,7 @@
 levels:  <i>integer</i>
 </pre>
 
-The header is followed by cell values in <EM>floating point</EM> format.
+The header is followed by cell values in <em>floating point</em> format.
 Cell values are output as a series of horizontal slices in row-major
 order.  That is, 
 
@@ -36,20 +37,18 @@
   (x, y, z)       (x + 1, y, z)     ...     (x + cols, y, z)
 (x, y + 1, z)   (x + 1, y + 1, z)   ...   (x + cols, y + 1, z)
 
-  and so on
-
+and so on.
 </pre>
 
-
-<P>
-One level maps can be imported with r.in.ascii (Raster 2D) after removing
+<p>
+One level maps can be imported with <em>r.in.ascii</em> (Raster 2D) after removing
 the header lines "top", "bottom" and "levels".
 
-<H2>SEE ALSO</H2>
-<EM><A HREF="r3.in.ascii.html">r3.in.ascii</A></EM><br>
-<EM><A HREF="g.region.html">g.region</A></EM><br>
+<h2>SEE ALSO</h2>
+<em><a href="r3.in.ascii.html">r3.in.ascii</a></em><br>
+<em><a href="g.region.html">g.region</a></em><br>
 
-<H2>AUTHORS</H2>
+<h2>AUTHORS</h2>
 Roman Waupotitsch, Michael Shapiro, 
 Helena Mitasova, Bill Brown, Lubos Mitas, Jaro Hofierka
 

Modified: grass/branches/develbranch_6/raster3d/r3.out.ascii/main.c
===================================================================
--- grass/branches/develbranch_6/raster3d/r3.out.ascii/main.c	2011-08-17 21:20:56 UTC (rev 47717)
+++ grass/branches/develbranch_6/raster3d/r3.out.ascii/main.c	2011-08-17 21:21:11 UTC (rev 47718)
@@ -55,7 +55,7 @@
     if (map != NULL) {
 	/* should unopen map here! */
 	if (!G3d_closeCell(map))
-	    fatalError(_("Error closing 3d raster map"));
+	    fatalError(_("Unable to close 3D raster map"));
 
     }
 
@@ -73,7 +73,7 @@
     param.input->required = YES;
     param.input->gisprompt = "old,grid3,3d-raster";
     param.input->multiple = NO;
-    param.input->description = _("3d raster map to be converted to ASCII");
+    param.input->description = _("3D raster map to be converted to ASCII");
 
     param.output = G_define_option();
     param.output->key = "output";
@@ -104,7 +104,7 @@
 
     param.mask = G_define_flag();
     param.mask->key = 'm';
-    param.mask->description = _("Use G3D mask (if exists) with input map");
+    param.mask->description = _("Use 3D raster mask (if exists) with input map");
 }
 
 /*---------------------------------------------------------------------------*/
@@ -243,7 +243,7 @@
     module = G_define_module();
     module->keywords = _("raster3d, voxel, export");
     module->description =
-	_("Converts a 3D raster map layer into an ASCII text file");
+	_("Converts a 3D raster map layer into an ASCII text file.");
 
     /* Get parameters from user */
     setParams();
@@ -256,7 +256,7 @@
     getParams(&input, &output, &decim);
 
     if (NULL == G_find_grid3(input, ""))
-	G3d_fatalError(_("Requested 3d raster map not found"));
+	G3d_fatalError(_("3D raster map <%s> not found"), input);
 
     /*  map = G3d_openCellOld(input, G_find_grid3(input, ""), G3D_DEFAULT_WINDOW,
        G3D_TILE_SAME_AS_FILE,
@@ -265,7 +265,7 @@
     map = G3d_openCellOld(input, G_find_grid3(input, ""), G3D_DEFAULT_WINDOW,
 			  G3D_TILE_SAME_AS_FILE, G3D_USE_CACHE_DEFAULT);
     if (map == NULL)
-	G3d_fatalError(_("Error opening 3d raster map"));
+	G3d_fatalError(_("Unable to open 3D raster map <%s>"), input);
 
     /* Figure out the region from the map */
     /*  G3d_getRegionStructMap(map, &region); */
@@ -297,12 +297,12 @@
 
     /* Close files and exit */
     if (!G3d_closeCell(map))
-	fatalError(_("Error closing 3d raster map"));
+	fatalError(_("Unable to close 3D raster map"));
 
     map = NULL;
     if (output)
 	if (fclose(fp))
-	    fatalError(_("Error closing new ASCII file"));
+	    fatalError(_("Unable to close new ASCII file"));
 
     return 0;
 }



More information about the grass-commit mailing list