[GRASS-SVN] r56073 - in grass/trunk: lib/gis lib/raster raster3d raster3d/r3.in.ascii raster3d/r3.in.bin raster3d/r3.out.ascii
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu May 2 01:19:52 PDT 2013
Author: huhabla
Date: 2013-05-02 01:19:52 -0700 (Thu, 02 May 2013)
New Revision: 56073
Modified:
grass/trunk/lib/gis/parser_standard_options.c
grass/trunk/lib/raster/cell_stats.c
grass/trunk/raster3d/r3.in.ascii/main.c
grass/trunk/raster3d/r3.in.bin/main.c
grass/trunk/raster3d/r3.out.ascii/main.c
grass/trunk/raster3d/raster3dintro.html
Log:
Several tiny improvements to 3D modules and docs.
Modified: grass/trunk/lib/gis/parser_standard_options.c
===================================================================
--- grass/trunk/lib/gis/parser_standard_options.c 2013-05-02 08:17:56 UTC (rev 56072)
+++ grass/trunk/lib/gis/parser_standard_options.c 2013-05-02 08:19:52 UTC (rev 56073)
@@ -370,7 +370,7 @@
Opt->required = NO;
Opt->multiple = NO;
Opt->answer = "default";
- Opt->options = "default,rle,none";
+ Opt->options = "default,zip,none";
Opt->description =
_("The compression method used in the output raster3d map");
break;
Modified: grass/trunk/lib/raster/cell_stats.c
===================================================================
--- grass/trunk/lib/raster/cell_stats.c 2013-05-02 08:17:56 UTC (rev 56072)
+++ grass/trunk/lib/raster/cell_stats.c 2013-05-02 08:19:52 UTC (rev 56073)
@@ -45,7 +45,7 @@
}
/*!
- * \brief Sdd data to cell stats
+ * \brief Add data to cell stats
*
* The <i>n</i> CELL values in the <i>data</i> array are inserted (and
* counted) in the Cell_stats structure.
Modified: grass/trunk/raster3d/r3.in.ascii/main.c
===================================================================
--- grass/trunk/raster3d/r3.in.ascii/main.c 2013-05-02 08:17:56 UTC (rev 56072)
+++ grass/trunk/raster3d/r3.in.ascii/main.c 2013-05-02 08:19:52 UTC (rev 56073)
@@ -354,6 +354,7 @@
/* write input name to map history */
Rast3d_read_history(output, G_mapset(), &history);
+ Rast_command_history(&history);
Rast_set_history(&history, HIST_DATSRC_1, input);
Rast3d_write_history(output, &history);
Modified: grass/trunk/raster3d/r3.in.bin/main.c
===================================================================
--- grass/trunk/raster3d/r3.in.bin/main.c 2013-05-02 08:17:56 UTC (rev 56072)
+++ grass/trunk/raster3d/r3.in.bin/main.c 2013-05-02 08:19:52 UTC (rev 56073)
@@ -1,13 +1,19 @@
-/*
- * r3.in.bin
+/****************************************************************************
*
- * Copyright (C) 2000, 2012 by the GRASS Development Team
- * Author: Bob Covill <bcovill tekmap.ns.ca>
+ * MODULE: r3.in.bin
*
- * This program is free software under the GPL (>=v2)
- * Read the file COPYING coming with GRASS for details.
+ * AUTHOR(S): Soeren Gebbert
+ * Based on r.in.bin from: Bob Covill
*
- */
+ * PURPOSE: Imports a binary raster file into a GRASS 3D raster map.
+ *
+ * COPYRIGHT: (C) 2012 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.
+ *
+ *****************************************************************************/
#include <stdlib.h>
#include <string.h>
Modified: grass/trunk/raster3d/r3.out.ascii/main.c
===================================================================
--- grass/trunk/raster3d/r3.out.ascii/main.c 2013-05-02 08:17:56 UTC (rev 56072)
+++ grass/trunk/raster3d/r3.out.ascii/main.c 2013-05-02 08:19:52 UTC (rev 56073)
@@ -9,7 +9,7 @@
*
* PURPOSE: Converts a 3D raster map layer into an ASCII text file
*
- * COPYRIGHT: (C) 2005 by the GRASS Development Team
+ * COPYRIGHT: (C) 2005 - 2012 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
Modified: grass/trunk/raster3d/raster3dintro.html
===================================================================
--- grass/trunk/raster3d/raster3dintro.html 2013-05-02 08:17:56 UTC (rev 56072)
+++ grass/trunk/raster3d/raster3dintro.html 2013-05-02 08:19:52 UTC (rev 56073)
@@ -3,7 +3,8 @@
GRASS GIS is one of the few GIS software packages with volume data support.
Here data are stored as a 3D raster with a unit volume called a voxel
(volume pixel). Voxels are designed to support representations of
-trivariate continuous fields.
+trivariate continuous fields. The vertical dimension supports spatial and temporal units.
+Hence space time voxel cubes with different temporal resolutions can be created and processed.
<p>
GRASS GIS 3D raster maps use the same coordinate system as
@@ -21,8 +22,9 @@
<h3>3D Raster (voxel) import</h3>
-The module <a href="r3.in.ascii.html">r3.in.ascii</a> supports
-generic x,y,z import. Alternatively, volumes can be generated
+The modules <a href="r3.in.ascii.html">r3.in.ascii</a> and
+ <a href="r3.in.bin.html">r3.in.bin</a> supports
+generic x,y,z ASCII and binary array import. Alternatively, volumes can be generated
from 3D point vector data (<a href="v.to.rast3.html">v.to.rast3</a>).
Always the full map is imported.
Volumes can also be created based on 2D elevation map(s) and value raster map(s)
@@ -69,6 +71,15 @@
<h3>3D raster export</h3>
+The modules <a href="r3.out.ascii.html">r3.out.ascii</a> and
+ <a href="r3.out.bin.html">r3.out.bin</a> support the export of
+ 3D raster maps as ASCII or binary files. The output of these modules
+ can be imported with the coresponding import modules noted above.
+<p>
+NetCDF export of 3D raster maps can be performed using the module
+<a href="r3.out.netcdf.html">r3.out.netcdf</a>. It supports 3D raster maps
+with spatial and temporal vertical dimension (Space time voxel cubes).
+<p>
GRASS 3D raster maps can be exported to VTK (<a href="r3.out.vtk.html">r3.out.vtk</a>).
VTK files can be visualized with the
<em><a href="http://www.vtk.org">VTK Toolkit</a></em>,
@@ -80,8 +91,6 @@
Alternatively, GRASS 3D raster maps can be imported and exported from/to Vis5D
(<a href="r3.in.v5d.html">r3.in.v5d</a>, <a href="r3.out.v5d.html">r3.out.v5d</a>).
Note that Vis5D is limited in the number of supported volumes.
-<p>
-Finally, export to 3D ASCII is also available (<a href="r3.out.ascii.html">r3.out.ascii</a>).
<h3>See also</h3>
More information about the grass-commit
mailing list