[GRASS-SVN] r42409 - in grass/branches/develbranch_6: gui/wxpython/xml visualization/nviz2/cmd

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-05-31 10:08:29 -0400 (Mon, 31 May 2010)
New Revision: 42409

Modified:
   grass/branches/develbranch_6/gui/wxpython/xml/menudata.xml
   grass/branches/develbranch_6/visualization/nviz2/cmd/description.html
   grass/branches/develbranch_6/visualization/nviz2/cmd/main.c
Log:
nviz_cmd: cosmetics in description, some examples, added to wxGUI menu
(merge r42408 from trunk)


Modified: grass/branches/develbranch_6/gui/wxpython/xml/menudata.xml
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/xml/menudata.xml	2010-05-31 13:24:59 UTC (rev 42408)
+++ grass/branches/develbranch_6/gui/wxpython/xml/menudata.xml	2010-05-31 14:08:29 UTC (rev 42409)
@@ -561,8 +561,8 @@
 	  <items>
 	    <menuitem>
 	      <label>Raster to vector</label>
-	      <help>Converts a raster map into a vector map layer.</help>
-	      <keywords>raster</keywords>
+	      <help>Converts a raster map into a vector map.</help>
+	      <keywords>raster,conversion,vectorization</keywords>
 	      <handler>OnMenuCmd</handler>
 	      <command>r.to.vect</command>
 	    </menuitem>
@@ -644,6 +644,13 @@
 	  <handler>OnMenuCmd</handler>
 	  <command>nviz</command>
 	</menuitem>
+	<menuitem>
+	  <label>NVIZ (non-interactive)</label>
+	  <help>Experimental NVIZ CLI prototype.</help>
+	  <keywords>visualization,raster,vector,raster3d</keywords>
+	  <handler>OnMenuCmd</handler>
+	  <command>nviz_cmd</command>
+	</menuitem>
 	<separator />
 	<menuitem>
 	  <label>Bearing/distance to coordinates</label>
@@ -1125,8 +1132,8 @@
 	    <separator />
 	    <menuitem>
 	      <label>Slope and aspect</label>
-	      <help>Generates raster map layers of slope, aspect, curvatures and partial derivatives from a raster map layer of true elevation values. Aspect is calculated counterclockwise from east.</help>
-	      <keywords>raster,terrain analysis</keywords>
+	      <help>Generates raster maps of slope, aspect, curvatures and partial derivatives from a elevation raster map.</help>
+	      <keywords>raster,terrain</keywords>
 	      <handler>OnMenuCmd</handler>
 	      <command>r.slope.aspect</command>
 	    </menuitem>
@@ -1275,7 +1282,7 @@
 	    </menuitem>
 	    <menuitem>
 	      <label>Watershed analysis</label>
-	      <help>Creates watershed basins.</help>
+	      <help>Watershed basin analysis program</help>
 	      <keywords>raster,hydrology</keywords>
 	      <handler>OnMenuCmd</handler>
 	      <command>r.watershed</command>
@@ -2329,7 +2336,7 @@
 	<separator />
 	<menuitem>
 	  <label>Update area attributes from raster</label>
-	  <help>Calculates univariate statistics from a GRASS raster map based on vector polygons and uploads statistics to new attribute columns.</help>
+	  <help>Calculates univariate statistics from a raster map based on vector polygons and uploads statistics to new attribute columns.</help>
 	  <keywords>vector,raster,statistics</keywords>
 	  <handler>OnMenuCmd</handler>
 	  <command>v.rast.stats</command>

Modified: grass/branches/develbranch_6/visualization/nviz2/cmd/description.html
===================================================================
--- grass/branches/develbranch_6/visualization/nviz2/cmd/description.html	2010-05-31 13:24:59 UTC (rev 42408)
+++ grass/branches/develbranch_6/visualization/nviz2/cmd/description.html	2010-05-31 14:08:29 UTC (rev 42409)
@@ -1,19 +1,29 @@
 <h2>DESCRIPTION</h2>
 
-Experimental CLI prototype of NVIZ.
+<em>nviz_cmd</em> allows users to realistically render multiple
+<em>surfaces</em> (raster data) in a 3D space, optionally using
+thematic coloring, draping 2D <em>vector</em> data over the surfaces,
+displaying 3D vector data in the space, and visualization
+of <em>volume</em> data (3D raster data) from the command line.
 
-<p>
-TODO
+<h2>EXAMPLE</h2>
 
+Render elevation map in a 3D space.
+
+<div class="code"><pre>
+g.region rast=elevation
+nviz_cmd elevation_map=elevation output=elev perspective=15
+</pre></div>
+
 <h2>SEE ALSO</h2>
 
 <em>
-<a HREF="nviz.html">TCL/TK-based NVIZ</a>
+<a HREF="wxGUI.Nviz.html">wxGUI 3D Viewer</a>
 </em>
 
 <h2>AUTHOR</h2>
 
-Martin Landa (Google Summer of Code 2008)
+Martin Landa (Google Summer of Code 2008/2010)
 
 <p>
 <i>Last changed: $Date$</i>

Modified: grass/branches/develbranch_6/visualization/nviz2/cmd/main.c
===================================================================
--- grass/branches/develbranch_6/visualization/nviz2/cmd/main.c	2010-05-31 13:24:59 UTC (rev 42408)
+++ grass/branches/develbranch_6/visualization/nviz2/cmd/main.c	2010-05-31 14:08:29 UTC (rev 42409)
@@ -5,7 +5,7 @@
  *               
  * AUTHOR(S):    Martin Landa <landa.martin gmail.com> (Google SoC 2008/2010)
  *               
- * PURPOSE:      Experimental NVIZ CLI prototype
+ * PURPOSE:      Renders GIS data in 3D space.
  *               
  * COPYRIGHT:    (C) 2008,2010 by the GRASS Development Team
  *
@@ -44,7 +44,10 @@
 
     module = G_define_module();
     module->keywords = _("visualization, raster, vector, raster3d");
-    module->description = _("Experimental NVIZ CLI prototype.");
+    module->label = _("Allows rendering GIS data is a 3D space.");
+    module->description = _("Renders surfaces (raster data), "
+			    "2D/3D vector data, and "
+			    "volumes (3D raster data) in a 3D space.");
 
     params = (struct GParams *)G_malloc(sizeof(struct GParams));