Browse Source

Several tiny improvements to 3D modules and docs.

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@56073 15284696-431f-4ddb-bdfa-cd5b030d7da7
Soeren Gebbert 12 years ago
parent
commit
e813c64418

+ 1 - 1
lib/gis/parser_standard_options.c

@@ -370,7 +370,7 @@ struct Option *G_define_standard_option(int opt)
         Opt->required = NO;
         Opt->required = NO;
         Opt->multiple = NO;
         Opt->multiple = NO;
         Opt->answer = "default";
         Opt->answer = "default";
-        Opt->options = "default,rle,none";
+        Opt->options = "default,zip,none";
         Opt->description =
         Opt->description =
             _("The compression method used in the output raster3d map");
             _("The compression method used in the output raster3d map");
 	break;
 	break;

+ 1 - 1
lib/raster/cell_stats.c

@@ -45,7 +45,7 @@ void Rast_init_cell_stats(struct Cell_stats *s)
 }
 }
 
 
 /*!
 /*!
- * \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
  * The <i>n</i> CELL values in the <i>data</i> array are inserted (and
  * counted) in the Cell_stats structure.
  * counted) in the Cell_stats structure.

+ 1 - 0
raster3d/r3.in.ascii/main.c

@@ -354,6 +354,7 @@ int main(int argc, char *argv[])
 
 
     /* write input name to map history */
     /* write input name to map history */
     Rast3d_read_history(output, G_mapset(), &history);
     Rast3d_read_history(output, G_mapset(), &history);
+    Rast_command_history(&history);
     Rast_set_history(&history, HIST_DATSRC_1, input);
     Rast_set_history(&history, HIST_DATSRC_1, input);
     Rast3d_write_history(output, &history);
     Rast3d_write_history(output, &history);
 
 

+ 13 - 7
raster3d/r3.in.bin/main.c

@@ -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 <stdlib.h>
 #include <string.h>
 #include <string.h>

+ 1 - 1
raster3d/r3.out.ascii/main.c

@@ -9,7 +9,7 @@
  *
  *
  * PURPOSE:      Converts a 3D raster map layer into an ASCII text file  
  * 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
  *               This program is free software under the GNU General Public
  *   	    	License (>=v2). Read the file COPYING that comes with GRASS
  *   	    	License (>=v2). Read the file COPYING that comes with GRASS

+ 14 - 5
raster3d/raster3dintro.html

@@ -3,7 +3,8 @@
 GRASS GIS is one of the few GIS software packages with volume data support.
 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
 Here data are stored as a 3D raster with a unit volume called a voxel
 (volume pixel). Voxels are designed to support representations of
 (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>
 <p>
 
 
 GRASS GIS 3D raster maps use the same coordinate system as
 GRASS GIS 3D raster maps use the same coordinate system as
@@ -21,8 +22,9 @@ with <a href="r3.in.ascii.html">r3.in.ascii</a> or the data can be retiled using
 
 
 <h3>3D Raster (voxel) import</h3>
 <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>). 
 from 3D point vector data (<a href="v.to.rast3.html">v.to.rast3</a>). 
 Always the full map is imported.
 Always the full map is imported.
 Volumes can also be created based on 2D elevation map(s) and value raster map(s)
 Volumes can also be created based on 2D elevation map(s) and value raster map(s)
@@ -69,6 +71,15 @@ or 2D raster maps can be also extracted.
 
 
 <h3>3D raster export</h3>
 <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>).
 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 
 VTK files can be visualized with the 
 <em><a href="http://www.vtk.org">VTK Toolkit</a></em>, 
 <em><a href="http://www.vtk.org">VTK Toolkit</a></em>, 
@@ -80,8 +91,6 @@ GRASS vector maps can be exported to VTK with <a href="v.out.vtk.html">v.out.vtk
 Alternatively, GRASS 3D raster maps can be imported and exported from/to Vis5D
 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>).
 (<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.
 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>
 <h3>See also</h3>