[GRASS-SVN] r62876 - in grass/branches/releasebranch_7_0: man raster/r.colors raster3d/r3.out.vtk temporal temporal/t.rast.to.rast3 temporal/t.rast3d.algebra temporal/t.rast3d.extract temporal/t.rast3d.mapcalc temporal/t.rast3d.univar temporal/t.unregister vector/v.vol.rst vector/v.what.rast3
svn_grass at osgeo.org
svn_grass at osgeo.org
Sun Nov 23 14:39:42 PST 2014
Author: neteler
Date: 2014-11-23 14:39:42 -0800 (Sun, 23 Nov 2014)
New Revision: 62876
Modified:
grass/branches/releasebranch_7_0/man/build_html.py
grass/branches/releasebranch_7_0/raster/r.colors/r.colors.html
grass/branches/releasebranch_7_0/raster3d/r3.out.vtk/r3.out.vtk.html
grass/branches/releasebranch_7_0/temporal/
grass/branches/releasebranch_7_0/temporal/t.rast.to.rast3/t.rast.to.rast3.html
grass/branches/releasebranch_7_0/temporal/t.rast.to.rast3/t.rast.to.rast3.py
grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/t.rast3d.algebra.py
grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/t.rast3d.extract.html
grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/t.rast3d.extract.py
grass/branches/releasebranch_7_0/temporal/t.rast3d.mapcalc/t.rast3d.mapcalc.html
grass/branches/releasebranch_7_0/temporal/t.rast3d.univar/t.rast3d.univar.html
grass/branches/releasebranch_7_0/temporal/t.rast3d.univar/t.rast3d.univar.py
grass/branches/releasebranch_7_0/temporal/t.unregister/t.unregister.html
grass/branches/releasebranch_7_0/temporal/t.unregister/t.unregister.py
grass/branches/releasebranch_7_0/vector/v.vol.rst/v.vol.rst.html
grass/branches/releasebranch_7_0/vector/v.what.rast3/v.what.rast3.html
Log:
manual: 3d raster -> 3D raster
Modified: grass/branches/releasebranch_7_0/man/build_html.py
===================================================================
--- grass/branches/releasebranch_7_0/man/build_html.py 2014-11-23 22:32:44 UTC (rev 62875)
+++ grass/branches/releasebranch_7_0/man/build_html.py 2014-11-23 22:39:42 UTC (rev 62876)
@@ -219,7 +219,7 @@
<li class="toc"><a class="toc" href="full_index.html#m">Miscellaneous commands (m.*)</a></li>
<li class="toc"><a class="toc" href="full_index.html#ps">PostScript commands (ps.*)</a></li>
<li class="toc"><a class="toc" href="full_index.html#r">Raster commands (r.*)</a></li>
-<li class="toc"><a class="toc" href="full_index.html#r3">3d raster commands (r3.*)</a></li>
+<li class="toc"><a class="toc" href="full_index.html#r3">3D raster commands (r3.*)</a></li>
<li class="toc"><a class="toc" href="full_index.html#t">Temporal commands (t.*)</a></li>
<li class="toc"><a class="toc" href="full_index.html#v">Vector commands (v.*)</a></li>
<li class="toc"><a class="toc" href="wxGUI.html">wxGUI Graphical User Interface</a></li>
Modified: grass/branches/releasebranch_7_0/raster/r.colors/r.colors.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.colors/r.colors.html 2014-11-23 22:32:44 UTC (rev 62875)
+++ grass/branches/releasebranch_7_0/raster/r.colors/r.colors.html 2014-11-23 22:39:42 UTC (rev 62876)
@@ -9,7 +9,7 @@
<p>The <b>rast</b> option allows user to specify a raster map <i>name</i>
from which to copy the color map.
-<p>The <b>volume</b> option allows user to specify a volume (3d raster)
+<p>The <b>volume</b> option allows user to specify a volume (3D raster)
map <i>name</i> from which to copy the color map.
<p>The <b>-e</b> flag equalizes the original raster's color table. It can
Modified: grass/branches/releasebranch_7_0/raster3d/r3.out.vtk/r3.out.vtk.html
===================================================================
--- grass/branches/releasebranch_7_0/raster3d/r3.out.vtk/r3.out.vtk.html 2014-11-23 22:32:44 UTC (rev 62875)
+++ grass/branches/releasebranch_7_0/raster3d/r3.out.vtk/r3.out.vtk.html 2014-11-23 22:39:42 UTC (rev 62876)
@@ -103,7 +103,7 @@
r.in.onearth -l output=Sat tmband=IR1
r.in.onearth -l output=Sat tmband=IR2
-#Convert the 2d maps to 3d raster maps with r.to.rast3
+#Convert the 2D maps to 3D raster maps with r.to.rast3
r.to.rast3 input=SatLandsatTM_Red output=SatLandsatTM_Red
r.to.rast3 input=SatLandsatTM_IR1 output=SatLandsatTM_IR1
r.to.rast3 input=SatLandsatTM_IR2 output=SatLandsatTM_IR2
Property changes on: grass/branches/releasebranch_7_0/temporal
___________________________________________________________________
Modified: svn:mergeinfo
- /grass/trunk:62868,62873
/grass/trunk/temporal:59684,59915-59916,60017-60018,60024,60026,60173-60174,60213,60547-60548,60732-60733,60817,61031,61066,61071-61072,61083,61096,61141,61157-61158,61179-61180,61186,61191-61194,61215,61239-61243,61274-61275,61282-61288,61301,61429-61433,61455,61457,61732,61734,61759-61762,61806-61807,61848,61885,61955-61957,61983-61985,61997-62000,62016,62021-62022,62025,62111-62113,62120-62121,62179-62180,62182,62343,62361,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62594-62597,62603,62606,62608-62609,62613-62614,62616,62618,62625-62628,62631-62632,62635-62638,62640-62642,62644,62646-62649,62652,62654-62657,62666,62691,62703-62705,62709-62712,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62775,62785,62798,62800-62801,62803,62805,62812,62814-62815,62822,62824,62831,62838,62847,62856,62868,62871,62873
+ /grass/trunk:62868,62873
/grass/trunk/temporal:59684,59915-59916,60017-60018,60024,60026,60173-60174,60213,60547-60548,60732-60733,60817,61031,61066,61071-61072,61083,61096,61141,61157-61158,61179-61180,61186,61191-61194,61215,61239-61243,61274-61275,61282-61288,61301,61429-61433,61455,61457,61732,61734,61759-61762,61806-61807,61848,61885,61955-61957,61983-61985,61997-62000,62016,62021-62022,62025,62111-62113,62120-62121,62179-62180,62182,62343,62361,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62594-62597,62603,62606,62608-62609,62613-62614,62616,62618,62625-62628,62631-62632,62635-62638,62640-62642,62644,62646-62649,62652,62654-62657,62666,62691,62703-62705,62709-62712,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62775,62785,62798,62800-62801,62803,62805,62812,62814-62815,62822,62824,62831,62838,62847,62856,62868,62871,62873,62875
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.to.rast3/t.rast.to.rast3.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.to.rast3/t.rast.to.rast3.html 2014-11-23 22:32:44 UTC (rev 62875)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.to.rast3/t.rast.to.rast3.html 2014-11-23 22:39:42 UTC (rev 62876)
@@ -1,13 +1,15 @@
<h2>DESCRIPTION</h2>
-This module is designed to convert a space time raster dataset (STRDS) into a space time voxel cube.
-A space time voxel cube is a 3 dimensional raster map layer (3d raster map or voxel map layer) that as time as
-unit for the z-dimension.
+This module is designed to convert a space time raster dataset (STRDS)
+into a space time voxel cube. A space time voxel cube is a 3
+dimensional raster map layer (3D raster map or voxel map layer) that as
+time as unit for the z-dimension.
<p>
A space time raster dataset that should be converted into a space time
-voxel cube must have a valid temporal topology. Hence, overlapping or inclusion of time stamps is not allowed.
-The granularity of the STRDS is used to set the resolution of the 3d raster map layer
-and to sample the registered time stamped raster map layers.
+voxel cube must have a valid temporal topology. Hence, overlapping or
+inclusion of time stamps is not allowed. The granularity of the STRDS
+is used to set the resolution of the 3D raster map layer and to sample
+the registered time stamped raster map layers.
<p>
Gaps between raster map layer in the STRDS will
be represented by NULL values in the voxel map layer.
@@ -15,19 +17,25 @@
<h2>NOTE</h2>
-The reference time for all space time voxel cubes is 1900-01-0100:00:00. This allows the alignment
-space time voxel cubes with different granularities.
+The reference time for all space time voxel cubes is
+1900-01-0100:00:00. This allows the alignment space time voxel cubes
+with different granularities.
<p>
-Be aware that the granularity of a STRDS is used to sample time stamped map layers! If you have gaps
-between monthly intervals that have the size of a second, the monthly intervals will be sampled by a second based granularity as well. This may result in millions of space time voxel cube layers!
+Be aware that the granularity of a STRDS is used to sample time stamped
+map layers! If you have gaps between monthly intervals that have the
+size of a second, the monthly intervals will be sampled by a second
+based granularity as well. This may result in millions of space time
+voxel cube layers!
<h2>EXAMPLE</h2>
-This simple example that converts a space time raster dataset that has gaps between its time stamped
-map layers into a space time voxel cube. The time stamped raster map layer have a interval size of three months.
-However, the granularity is one month, since of each gap has an interval size of one month. The resulting
-voxel map layer has 9 depths. Hence, the space time raster dataset is sampled by its granularity resulting
-in 9 layer.
+This simple example that converts a space time raster dataset that has
+gaps between its time stamped map layers into a space time voxel cube.
+The time stamped raster map layer have a interval size of three months.
+However, the granularity is one month, since of each gap has an
+interval size of one month. The resulting voxel map layer has 9 depths.
+Hence, the space time raster dataset is sampled by its granularity
+resulting in 9 layer.
<div class="code"><pre>
g.region s=0 n=80 w=0 e=120 b=0 t=1 res=10 res3=10 -p3
@@ -185,7 +193,6 @@
| |
+----------------------------------------------------------------------------+
-
</pre></div>
<h2>SEE ALSO</h2>
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.to.rast3/t.rast.to.rast3.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.to.rast3/t.rast.to.rast3.py 2014-11-23 22:32:44 UTC (rev 62875)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.to.rast3/t.rast.to.rast3.py 2014-11-23 22:39:42 UTC (rev 62876)
@@ -5,8 +5,8 @@
# MODULE: t.rast.to.rast3
# AUTHOR(S): Soeren Gebbert
#
-# PURPOSE: Convert a space time raster dataset into a 3d raster map
-# COPYRIGHT: (C) 2011 by the GRASS Development Team
+# PURPOSE: Convert a space time raster dataset into a 3D raster map
+# COPYRIGHT: (C) 2011-2014 by the GRASS Development Team
#
# This program is free software under the GNU General Public
# License (version 2). Read the file COPYING that comes with GRASS
@@ -15,7 +15,7 @@
#############################################################################
#%module
-#% description: Converts a space time raster dataset into a 3d raster map.
+#% description: Converts a space time raster dataset into a 3D raster map.
#% keywords: temporal
#% keywords: conversion
#% keywords: raster3d
@@ -115,7 +115,7 @@
try:
grass.run_command("g.region", t=top, b=bottom, tbres=granularity)
except CalledModuleError:
- grass.fatal(_("Unable to set 3d region"))
+ grass.fatal(_("Unable to set 3D region"))
# Create a NULL map to fill the gaps
null_map = "temporary_null_map_%i" % os.getpid()
Modified: grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/t.rast3d.algebra.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/t.rast3d.algebra.py 2014-11-23 22:32:44 UTC (rev 62875)
+++ grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/t.rast3d.algebra.py 2014-11-23 22:39:42 UTC (rev 62876)
@@ -5,7 +5,7 @@
# MODULE: t.rast3d.algebra
# AUTHOR(S): Thomas Leppelt, Soeren Gebbert
#
-# PURPOSE: Provide temporal 3d raster algebra to perform spatial an temporal operations
+# PURPOSE: Provide temporal 3D raster algebra to perform spatial an temporal operations
# for space time datasets by topological relationships to other space time
# datasets.
# COPYRIGHT: (C) 2014 by the GRASS Development Team
@@ -17,7 +17,7 @@
#############################################################################
#%module
-#% description: Apply temporal and spatial operations on space time 3d raster datasets using temporal 3d raster algebra.
+#% description: Apply temporal and spatial operations on space time 3D raster datasets using temporal 3D raster algebra.
#% keywords: temporal
#% keywords: algebra
#%end
@@ -25,7 +25,7 @@
#%option
#% key: expression
#% type: string
-#% description: Algebraic expression for temporal and spatial analysis of space time 3d raster datasets
+#% description: Algebraic expression for temporal and spatial analysis of space time 3D raster datasets
#% required : yes
#%end
Modified: grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/t.rast3d.extract.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/t.rast3d.extract.html 2014-11-23 22:32:44 UTC (rev 62875)
+++ grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/t.rast3d.extract.html 2014-11-23 22:39:42 UTC (rev 62876)
@@ -1,11 +1,10 @@
<h2>DESCRIPTION</h2>
-
The purpose of <b>t.rast3d.extract</b> is to extract a subset of a space
-time 3d raster dataset and to store that subset in a different space time
-3d raster dataset. It has exactly the same functionality as
+time 3D raster dataset and to store that subset in a different space time
+3D raster dataset. It has exactly the same functionality as
<a href="t.rast.extract.html">t.rast.extract</a>. The only difference is the
-that this module works on STR3DS and 3d raster maps.
+that this module works on STR3DS and 3D raster maps.
<p>
Please refer to <a href="t.rast.extract.html">t.rast.extract</a> for documentation
and examples.
Modified: grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/t.rast3d.extract.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/t.rast3d.extract.py 2014-11-23 22:32:44 UTC (rev 62875)
+++ grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/t.rast3d.extract.py 2014-11-23 22:39:42 UTC (rev 62876)
@@ -6,7 +6,7 @@
# AUTHOR(S): Soeren Gebbert
#
# PURPOSE: Extract a subset of a space time 3D raster dataset
-# COPYRIGHT: (C) 2011 by the GRASS Development Team
+# COPYRIGHT: (C) 2011-2014 by the GRASS Development Team
#
# This program is free software under the GNU General Public
# License (version 2). Read the file COPYING that comes with GRASS
Modified: grass/branches/releasebranch_7_0/temporal/t.rast3d.mapcalc/t.rast3d.mapcalc.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast3d.mapcalc/t.rast3d.mapcalc.html 2014-11-23 22:32:44 UTC (rev 62875)
+++ grass/branches/releasebranch_7_0/temporal/t.rast3d.mapcalc/t.rast3d.mapcalc.html 2014-11-23 22:39:42 UTC (rev 62876)
@@ -1,7 +1,7 @@
<h2>DESCRIPTION</h2>
The module <em>t.rast3d.mapcalc</em> provides exact the same functionality as <em>t.rast.mapcalc</em>,
-but for space time 3d raster datasets. Please refer to <a href="t.rast.mapcalc.html">t.rast.mapcalc</a>
+but for space time 3D raster datasets. Please refer to <a href="t.rast.mapcalc.html">t.rast.mapcalc</a>
for documentation.
<p>
It is a simple wrapper for <a href="r3.mapcalc.html">r3.mapcalc</a> enhanced with temporal functions.
Modified: grass/branches/releasebranch_7_0/temporal/t.rast3d.univar/t.rast3d.univar.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast3d.univar/t.rast3d.univar.html 2014-11-23 22:32:44 UTC (rev 62875)
+++ grass/branches/releasebranch_7_0/temporal/t.rast3d.univar/t.rast3d.univar.html 2014-11-23 22:39:42 UTC (rev 62876)
@@ -2,7 +2,7 @@
This module provides the same functionality as
<a href="t.rast.univar.html">t.rast.univar</a>, the only difference is the
-3d raster map layer metadata. Please refer to the manual page of
+3D raster map layer metadata. Please refer to the manual page of
<a href="t.rast.univar.html">t.rast.univar</a> for documentation and examples.
<h2>SEE ALSO</h2>
Modified: grass/branches/releasebranch_7_0/temporal/t.rast3d.univar/t.rast3d.univar.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast3d.univar/t.rast3d.univar.py 2014-11-23 22:32:44 UTC (rev 62875)
+++ grass/branches/releasebranch_7_0/temporal/t.rast3d.univar/t.rast3d.univar.py 2014-11-23 22:39:42 UTC (rev 62876)
@@ -5,8 +5,8 @@
# MODULE: t.rast3d.univar
# AUTHOR(S): Soeren Gebbert
#
-# PURPOSE: Calculates univariate statistics from the non-null cells for each registered 3d
-# raster map of a space time 3d raster dataset
+# PURPOSE: Calculates univariate statistics from the non-null cells for each registered 3D
+# raster map of a space time 3D raster dataset
# COPYRIGHT: (C) 2011-2014, Soeren Gebbert and the GRASS Development Team
#
# This program is free software under the GNU General Public
@@ -16,7 +16,7 @@
#############################################################################
#%module
-#% description: Calculates univariate statistics from the non-null cells for each registered 3d raster map of a space time 3d raster dataset.
+#% description: Calculates univariate statistics from the non-null cells for each registered 3D raster map of a space time 3D raster dataset.
#% keywords: temporal
#% keywords: statistics
#% keywords: raster
Modified: grass/branches/releasebranch_7_0/temporal/t.unregister/t.unregister.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.unregister/t.unregister.html 2014-11-23 22:32:44 UTC (rev 62875)
+++ grass/branches/releasebranch_7_0/temporal/t.unregister/t.unregister.html 2014-11-23 22:39:42 UTC (rev 62876)
@@ -1,6 +1,6 @@
<h2>DESCRIPTION</h2>
-This module is designed to unregister raster, 3d raster and vector map
+This module is designed to unregister raster, 3D raster and vector map
layers from space time datasets and the temporal database.
<p>
@@ -8,7 +8,7 @@
specified as a list of comma separated map names or using a text file,
that contains one map layer name per line. By default the map type that
should be unregistered is set to raster. The option<em>type</em> must
-be used to specify 3d raster or vector map layer types.
+be used to specify 3D raster or vector map layer types.
<h2>INPUT FILE FORMAT</h2>
Modified: grass/branches/releasebranch_7_0/temporal/t.unregister/t.unregister.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.unregister/t.unregister.py 2014-11-23 22:32:44 UTC (rev 62875)
+++ grass/branches/releasebranch_7_0/temporal/t.unregister/t.unregister.py 2014-11-23 22:39:42 UTC (rev 62876)
@@ -6,7 +6,7 @@
# AUTHOR(S): Soeren Gebbert
#
# PURPOSE: Unregister raster, vector and raster3d maps from the temporal database or a specific space time dataset
-# COPYRIGHT: (C) 2011 by the GRASS Development Team
+# COPYRIGHT: (C) 2011-2014 by the GRASS Development Team
#
# This program is free software under the GNU General Public
# License (version 2). Read the file COPYING that comes with GRASS
Modified: grass/branches/releasebranch_7_0/vector/v.vol.rst/v.vol.rst.html
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.vol.rst/v.vol.rst.html 2014-11-23 22:32:44 UTC (rev 62875)
+++ grass/branches/releasebranch_7_0/vector/v.vol.rst/v.vol.rst.html 2014-11-23 22:39:42 UTC (rev 62876)
@@ -4,7 +4,7 @@
3-dimensional point data (e.g. temperature, rainfall data from climatic
stations, concentrations from drill holes etc.) given in a 3-D vector
point file named <b>input</b>. The size of the output
-3d raster map <b>elev</b> is given by the current 3D region. Sometimes, the
+3D raster map <b>elev</b> is given by the current 3D region. Sometimes, the
user
may want to get a 2-D map showing a modelled phenomenon at a
crossection surface. In that case, <b>cellinp</b> and <b>cellout</b>
@@ -17,7 +17,7 @@
gradient defined by horizontal and vertical angles), change of gradient,
Gauss-Kronecker curvature, or mean curvature). These geometric
parameteres are saved as
-3d raster maps <b>gradient, aspect1, aspect2, ncurv, gcurv, mcurv</b>,
+3D raster maps <b>gradient, aspect1, aspect2, ncurv, gcurv, mcurv</b>,
respectively. Maps <b>aspect1</b> and <b>aspect2</b> are in degrees.
<p>At first, data points are checked for identical positions and points
@@ -48,7 +48,7 @@
<p>The user can define a 2D raster map named <b>maskmap</b>, which will
be used as a mask. The interpolation is skipped for 3-dimensional cells
whose 2-dimensional projection has a zero value in the mask. Zero values will
-be assigned to these cells in all output 3d raster maps.
+be assigned to these cells in all output 3D raster maps.
<p>If the number of given points is greater than 700, segmented
processing is used. The region is split into 3-dimensional "box"
segments, each having less than <b>segmax</b> points and interpolation
Modified: grass/branches/releasebranch_7_0/vector/v.what.rast3/v.what.rast3.html
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.what.rast3/v.what.rast3.html 2014-11-23 22:32:44 UTC (rev 62875)
+++ grass/branches/releasebranch_7_0/vector/v.what.rast3/v.what.rast3.html 2014-11-23 22:39:42 UTC (rev 62876)
@@ -1,17 +1,17 @@
<h2>DESCRIPTION</h2>
-<em>v.what.rast3</em> reads 3d raster value for each point in the vector and updates <b>col</b>
+<em>v.what.rast3</em> reads 3D raster value for each point in the vector and updates <b>col</b>
column in vector attribute table by this value. The column should be type double. This module is based on
<a href="v.what.rast.html">v.what.rast</a>.
<br>
If more points have the same category, attribute value is set to NULL.
-If 3d raster values is NULL, attribute value is set to NULL.
+If 3D raster values is NULL, attribute value is set to NULL.
<h2>NOTES</h2>
<h2>EXAMPLES</h2>
-A) Reading values from 3d raster map at position of vector points, writing these values
+A) Reading values from 3D raster map at position of vector points, writing these values
into a column of the attribute table connected to the vector map:
<br>
<div class="code"><pre>
More information about the grass-commit
mailing list