[GRASS-SVN] r47712 -
grass/branches/develbranch_6/raster3d/r3.in.ascii
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Aug 17 14:32:26 EDT 2011
Author: neteler
Date: 2011-08-17 11:32:26 -0700 (Wed, 17 Aug 2011)
New Revision: 47712
Modified:
grass/branches/develbranch_6/raster3d/r3.in.ascii/description.html
grass/branches/develbranch_6/raster3d/r3.in.ascii/main.c
Log:
Milena Nowotarska: i18n cleanup; HTML cleanup
Modified: grass/branches/develbranch_6/raster3d/r3.in.ascii/description.html
===================================================================
--- grass/branches/develbranch_6/raster3d/r3.in.ascii/description.html 2011-08-17 18:32:15 UTC (rev 47711)
+++ grass/branches/develbranch_6/raster3d/r3.in.ascii/description.html 2011-08-17 18:32:26 UTC (rev 47712)
@@ -1,63 +1,49 @@
-<H2>DESCRIPTION</H2>
-Convert a 3D ASCII raster text file into a (binary) 3D raster map layer.
+<h2>DESCRIPTION</h2>
-<H3>Parameters:</H3>
-<DL>
-<DT><B>type</B>
-<DD>Data type used in the output file
-<DD>Options: default, double, float
+<em>r3.in.ascii</em> allows a user to create a (binary) GRASS 3D raster map
+layer from a 3D ASCII raster input file with (optional) TITLE.
-<DT><B>precision</B>
-<DD>Precision used in the output file
-<DD>Options: default, max, 0-52
-
-<DT><B>compression</B>
-<DD>Note that the <EM>none</EM> option only specifies
-that neither LZW nor RLE is used for compression. It
-does not turn off the compression all together. G3D does
-not support non-compressed files.
-<DD>Options: default, rle, none
-
-<DT><B>tiledimension</B>
-<DD>The dimension of the tiles used in the output file. The format is: XxYxZ
-
-<DT><B>nv</B>
-<DD>Specifies which value to convert to NULL-value. If the specified value is
-<em>none</em>, no conversion is performed. Default is <em>none</em>.
-
-<DT><B>input</B>
-<DD>Path and name of ASCII file to be imported
-
-<DT><B>output</B>
-<DD>Name of the G3D output map
-</DL>
-
-<H2>NOTES</H2>
-The format for the ASCII file:
-<PRE>
-north: <EM>floating point</EM>
-south: <EM>floating point</EM>
-east: <EM>floating point</EM>
-west: <EM>floating point</EM>
-top: <EM>floating point</EM>
-bottom: <EM>floating point</EM>
-rows: <EM>integer</EM>
-cols: <EM>integer</EM>
-levels: <EM>integer</EM>
-</PRE>
-This header is followed by the cell values in <EM>floating point</EM> format
-organized in rows with constant <EM>col</EM> and <EM>level</EM> coordinate.
-The rows are organized by constant <EM>level</EM> coordinate. Individual cell
-values are separated by <EM>space</EM> or <EM>CR</EM>.
-<P>
+<h2>NOTES</h2>
+The format of the 3D ASCII file:
+<pre>
+north: <em>floating point</em>
+south: <em>floating point</em>
+east: <em>floating point</em>
+west: <em>floating point</em>
+top: <em>floating point</em>
+bottom: <em>floating point</em>
+rows: <em>integer</em>
+cols: <em>integer</em>
+levels: <em>integer</em>
+</pre>
+This header is followed by the cell values in <em>floating point</em> format
+organized in rows with constant <em>col</em> and <em>level</em> coordinate.
+The rows are organized by constant <em>level</em> coordinate. Individual cell
+values are separated by <em>space</em> or <em>CR</em>.
+<p>
NOTE: Currently, after the file has been imported, the stored values are
compared with the original data. This feature is used to find bugs in the
library at an early stage and will be turned off as soon as confidence has
built up.
-<H2>EXAMPLES</H2>
+<p>
+Note that for compression the <em>none</em> option only specifies
+that neither LZW nor RLE is used for compression. It
+does not turn off the compression all together. 3D raster maps do
+not support non-compressed files.
-4x3x2 sample. Note lower-left (SW) corner of the bottom level comes first!
+<p>
+The <em>tiledimension</em> parameter defines the dimension of the tiles
+used in the output file. The format is: XxYxZ
+
+<p>
+The <em>nv</em> parameter specifies which value to convert to NULL-value.
+If the specified value is <em>none</em>, no conversion is performed.
+Default is <em>none</em>.
+
+<h2>EXAMPLES</h2>
+
+4x3x2 sample. Note, that lower-left (SW) corner of the bottom level comes first.
This array format, where EW is preserved but NS is flipped, is sometimes
known as "ij" coordinates.
This is opposite to <em>r.in.ascii</em>'s format, which places the SW corner
@@ -81,8 +67,7 @@
x1,y3,z2 x2,y3,z2 x3,y3,z2 x4,y3,z2
</pre></div>
-<P>
-
+<p>
Sample ASCII voxel map with one layer and several rows and columns (Spearfish area):
<div class="code"><pre>
@@ -102,16 +87,16 @@
</pre></div>
-<H2>AUTHORS</H2>
+<h2>AUTHORS</h2>
Roman Waupotitsch, Michael Shapiro,
Helena Mitasova, Bill Brown, Lubos Mitas, Jaro Hofierka
-<H2>SEE ALSO</H2>
-<EM>
-<A HREF="r.in.ascii.html">r.in.ascii</A>,
-<A HREF="r3.out.ascii.html">r3.out.ascii</A>,
-<A HREF="v.to.rast3.html">v.to.rast3</A>
-</EM>
+<h2>SEE ALSO</h2>
+<em>
+<a href="r.in.ascii.html">r.in.ascii</a>,
+<a href="r3.out.ascii.html">r3.out.ascii</a>,
+<a href="v.to.rast3.html">v.to.rast3</a>
+</em>
<p>
<i>Last changed: $Date$</i>
Modified: grass/branches/develbranch_6/raster3d/r3.in.ascii/main.c
===================================================================
--- grass/branches/develbranch_6/raster3d/r3.in.ascii/main.c 2011-08-17 18:32:15 UTC (rev 47711)
+++ grass/branches/develbranch_6/raster3d/r3.in.ascii/main.c 2011-08-17 18:32:26 UTC (rev 47712)
@@ -76,7 +76,7 @@
param.input->required = YES;
param.input->key_desc = "name";
param.input->gisprompt = "old_file,file,input";
- param.input->description = _("Ascii raster map to be imported");
+ param.input->description = _("ASCII raster map to be imported");
param.output = G_define_standard_option(G_OPT_R3_OUTPUT);
@@ -114,7 +114,7 @@
/* to avoid buffer overflows we use snprintf */
G_snprintf(format, 100, "%s %%lf", valueString);
if (fscanf(fp, format, value) != 1) {
- G_debug(0, "bad value for [%s]", valueString);
+ G_debug(3, "bad value for [%s]", valueString);
fatalError("readHeaderString: header value invalid");
}
while (fgetc(fp) != '\n') ;
@@ -175,7 +175,7 @@
region->depths);
G_debug(3,
- "asciiToG3d: writing the 3d raster map, with rows %i cols %i depths %i",
+ "asciiToG3d: writing the 3D raster map, with rows %i cols %i depths %i",
region->rows, region->cols, region->depths);
for (z = 0; z < region->depths; z++) {
@@ -188,7 +188,7 @@
if (fscanf(fp, "%lf", &value) != 1) {
if (feof(fp))
G_warning(_("End of file reached while still loading data."));
- G_debug(0,
+ G_debug(3,
"missing data at col=%d row=%d depth=%d last_value=[%.4f]",
x + 1, region->rows - y, z + 1, value);
fatalError("asciiToG3d: read failed");
@@ -239,7 +239,7 @@
module = G_define_module();
module->keywords = _("raster3d, voxel, import");
module->description =
- _("Convert a 3D ASCII raster text file into a (binary) 3D raster map layer");
+ _("Converts a 3D ASCII raster text file into a (binary) 3D raster map layer.");
setParams();
G3d_setStandard3dInputParams();
@@ -254,7 +254,7 @@
&usePrecisionDefault, &precision,
&useDimensionDefault, &tileX, &tileY,
&tileZ))
- fatalError("main: error getting standard parameters");
+ fatalError("Error getting standard parameters");
fp = openAscii(input, ®ion);
@@ -265,13 +265,13 @@
tileZ);
if (map == NULL)
- fatalError(_("Error opening 3d raster map"));
+ fatalError(_("Unable to open 3D raster map"));
/*Create the new G3D Map */
asciiToG3d(fp, ®ion, convertNull, nullValue);
if (!G3d_closeCell(map))
- fatalError(_("Error closing new 3d raster map"));
+ fatalError(_("Unable to close 3D raster map"));
/* write input name to map history */
G3d_readHistory(output, G_mapset(), &history);
@@ -281,9 +281,9 @@
map = NULL;
if (fclose(fp))
- fatalError(_("Error closing ascii file"));
+ fatalError(_("Unable to close ASCII file"));
- G_done_msg("");
+ G_done_msg(" ");
return EXIT_SUCCESS;
}
More information about the grass-commit
mailing list