wxGUI/nviz: update screenshots in the manual + cosmetics

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@43028 15284696-431f-4ddb-bdfa-cd5b030d7da7

gui/wxpython/docs/wxGUI.Nviz.html

@@ -1,19 +1,21 @@
 <h2>DESCRIPTION</h2>
 
-<b>Note:</b> <em>wxGUI Nviz extension is currently under development. Not
+<b>Note:</b> <em>wxNviz is currently under development. Not
 all functionality is implemented.</em>
 
 <p>
-<b>wxGUI Nviz extension</b> allows users to realistically render multiple
+<b>wxNviz</b> is a <em><a href="wxGUI.html">wxGUI</a></em> <b>3D view
+mode</b> which 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).
 
 <p>
-To start the wxGUI Nviz extension, choose '3D view' from the map toolbar.
+To start the wxGUI 3D view mode, choose '3D view' from the map
+toolbar.
 <p>
-Nviz is emphasized on the ease and speed of viewer positioning and
+wxNviz is emphasized on the ease and speed of viewer positioning and
 provided flexibility for using a wide range of data. A low resolution
 surface or wire grid (optional) provides real-time viewer positioning
 capabilities. Coarse and fine resolution controls allow the user to
@@ -22,11 +24,11 @@ of elevation provides the ability to use various data types for the
 vertical dimension.
 
 <p>
-For each session of Nviz, you might want the same set of 2D/3D raster
-and vector data, view parameters, or other attributes. For consistency
-between sessions, you can store this information in
-the <em>workspace</em> file (gxw). Workspace file contains information
-to restore "state" of the system in 2D and if Nviz is enabled also in
+For each session of wxNviz, you might want the same set of 2D/3D
+raster and vector data, view parameters, or other attributes. For
+consistency between sessions, you can store this information in the
+GRASS <em>workspace</em> file (gxw). Workspace contains information to
+restore "state" of the system in 2D and if wxNviz is enabled also in
 the 3D display mode.
 
 <h2>Data visualization</h2>
@@ -87,24 +89,25 @@ attributes:
     light emitted from the current volume. Range from 0 to 255.</li>
 </ul>
 
-<h2>Nviz Toolbox Window</h2>
+<h2>Toolbox</h2>
 
-The toolbox window has currently three tabs:
+The 3D view toolbox is integrated in the Layer Manager. The toolbox
+has several tabs:
 
 <ul>
-  <li>View<li>
-  <li>Layer properties<li>
-  <li>Settings</li>
+  <li><b>View</b> for view controling,</li>
+  <li><b>Data</b> for data properties,</li>
+  <li><b>Appearance</b> for appearance settings (lighting, fringes, ...).</li>
 </ul>
 
 <h3>View</h3>
 
 You can use this panel to set the <em>position, direction, and
   perspective</em> of the view. The position box shows a puck with a
-direction line pointing to the center. The direction line indicates
-the look direction (azimuth). You click and drag the puck to change
-the current eye position. The box annotations are North, South,
-East, and West. You can also set exact position using <em>Look
+  direction line pointing to the center. The direction line indicates
+  the look direction (azimuth). You click and drag the puck to change
+  the current eye position. The box annotations are North, South,
+  East, and West. You can also set exact position using <em>Look
   at</em> choice control.
 
 <center>
@@ -116,20 +119,20 @@ twist value to rotate the scene about the horizontal axis. An angle of
 0 is flat. The scene rotates between -90 and 90 degrees.
 
 <p>
-  You can also adjusts the vertical exaggeration of the surface. As an
-  example, if the easting and northing are in meters and the elevation
-  in feet, a vertical exaggeration of 0.305 would produce a true
-  (unexaggerated) surface.
+You can also adjusts the vertical exaggeration of the surface. As an
+example, if the easting and northing are in meters and the elevation
+in feet, a vertical exaggeration of 0.305 would produce a true
+(unexaggerated) surface.
   
 <p>
-  <em>Reset</em> returns all current settings to their default values.
+<em>Reset</em> returns all current settings to their default values.
 
-<h3>Surface properties</h3>
+<h3>Data properties (surface)</h3>
 
 This panel controls how loaded surfaces are drawn. The top half of the
 panel has options to set, unset or modify attributes of the current
-surface.The bottom half has drawing style options, masking or changing
-surface position in the space.
+surface. The bottom half has drawing style options, masking or
+changing surface position in the space.
 
 <center>
   <br><img src="wxGUI_nviz_tools_surface.jpg" border="1"><br><br>
@@ -140,10 +143,10 @@ realistic). You can set draw <b>mode</b> to <em>coarse</em> (fast
 display mode), <em>fine</em> (draws surface as filled polygons with
 fine resolution) or <em>both</em> (which combines coarse and fine
 mode). Additionally set coarse <b>style</b> to <em>wire</em> to draw
-the surface as wire mesh (you can also choose color of the
-wire) or <em>surface</em> to draw the surface using coarse resolution
-filled polygons.  This is a low resolution version of the polygon
-surface style.
+the surface as wire mesh (you can also choose color of the wire)
+or <em>surface</em> to draw the surface using coarse resolution filled
+polygons. This is a low resolution version of the polygon surface
+style.
 
 E.g. surface is drawn as a wire mesh if you set <b>mode</b>
 to <em>coarse</em> and <b>style</b> to <em>wire</em>. Note that it
@@ -159,10 +162,9 @@ draws the surfaces with flat shading with one color for every two
 cells. The surface appears faceted.
 
 <p>
-  To set given draw settings for all loaded surfaces press button
-  "All".
+To set given draw settings for all loaded surfaces press button "All".
 
-<h3>Vector properties</h3>
+<h3>Data properties (vector)</h3>
 
 This panel controls how loaded 2D or 3D vector data are drawn.
 
@@ -191,16 +193,16 @@ applies to wire-frame markers). Currently are implemented these
 markers:
 
 <ul>
-  <li><b>x</b> sets the current points markers to a 2D "X";</li>
-  <li><b>sphere</b> - solid 3D sphere;</li>
-  <li><b>diamond</b> - solid 3D diamond;</li>
-  <li><b>cube</b> - solid 3D cube;</li>
-  <li><b>box</b> - hollow 3D cube;</li>
-  <li><b>gyroscope</b> - hollow 3D sphere;</li>
-  <li><b>asterisk</b> - 3D line-star;</li>
+  <li><b>x</b> sets the current points markers to a 2D "X",</li>
+  <li><b>sphere</b> - solid 3D sphere,</li>
+  <li><b>diamond</b> - solid 3D diamond,</li>
+  <li><b>cube</b> - solid 3D cube,</li>
+  <li><b>box</b> - hollow 3D cube,</li>
+  <li><b>gyroscope</b> - hollow 3D sphere,</li>
+  <li><b>asterisk</b> - 3D line-star.</li>
 </ul>
  
-<h3>Volume properties</h3>
+<h3>Data properties (volume)</h3>
 
 This panel controls how loaded volumes are drawn. Volume can be drawn
 in two different modes: <b>isosurface</b> or <b>slice</b>. The top
@@ -222,7 +224,7 @@ visualization modes:
 
 <ul>
   <li><b>isosurface</b> - the levels of values for drawing the
-  volume(s) as isosurfaces;</li>
+  volume(s) as isosurfaces,</li>
   <li>and <b>slice</b> - the levels of values for drawing the volume
   as cross-sections.</li>
 </ul>
@@ -239,14 +241,11 @@ parameters, or to set the background color of the Map Display Window
 
 <ul>
   <li>Improve intuitive navigation (mouse, fly mode)</li>
-  <li>Interactive lighting controls</li>
   <li>Animation capabilities</li>
-  <li>Data querying and measuring</li>
   <li>Arbitrary cutting planes</li>
   <li>Labels, decoration, etc.</li>
   <li>Scripting capabilities</li>
   <li>Better workspace support (view settings, lighting)
-  <li>Image Dump</li>
   <li>Surface - mask by zero/elevation, more interactive positioning</li>
   <li>Vector points - implement display mode flat/surface for 2D points</li>
   <li>Volume - slice draw mode</li>
@@ -254,7 +253,7 @@ parameters, or to set the background color of the Map Display Window
 </ul>
 
 <p>
-<b>Please note that the wxGUI Nviz extension is under active development and
+<b>Please note that wxNviz is under active development and
 distributed as &quot;Experimental Prototype&quot;.</b>
 
 <h2>SEE ALSO</h2>
@@ -269,7 +268,11 @@ Original <a href="nviz.html">TCL/TK-based</a> Nviz.
 
 <h2>AUTHORS</h2>
 
-Martin Landa, Google Summer of Code 2008 (Mentor: Michael Barton)
+Martin
+Landa, <a href="http://grass.osgeo.org/wiki/WxNviz_GSoC_2008">Google
+Summer of Code 2008</a> (mentor: Michael Barton)
+and <a href="http://grass.osgeo.org/wiki/WxNviz_GSoC_2010">Google
+Summer of Code 2008</a> (mentor: Helena Mitasova)
 
 <p>
 <i>$Date$</i>

gui/wxpython/gui_modules/globalvar.py

@@ -135,7 +135,7 @@ else:
     EXT_BIN = ''
     EXT_SCT = ''
 
-def GetGRASSCmds(bin=True, scripts=True, gui_scripts=True):
+def GetGRASSCmds(bin = True, scripts = True, gui_scripts = True):
     """!Create list of all available GRASS commands to use when
     parsing string from the command line
     """
@@ -150,9 +150,9 @@ def GetGRASSCmds(bin=True, scripts=True, gui_scripts=True):
         
         # add special call for setting vector colors
         cmd.append('vcolors')
-    if scripts is True:
+    if scripts:
         cmd = cmd + os.listdir(os.path.join(gisbase, 'scripts')) 
-    if gui_scripts is True:
+    if gui_scripts:
         os.environ["PATH"] = os.getenv("PATH") + os.pathsep + os.path.join(gisbase, 'etc', 'gui', 'scripts')
         cmd = cmd + os.listdir(os.path.join(gisbase, 'etc', 'gui', 'scripts'))
        
@@ -166,7 +166,7 @@ def GetGRASSCmds(bin=True, scripts=True, gui_scripts=True):
 """@brief Collected GRASS-relared binaries/scripts"""
 grassCmd = {}
 grassCmd['all'] = GetGRASSCmds()
-grassCmd['script'] = GetGRASSCmds(bin=False)
+grassCmd['script'] = GetGRASSCmds(bin = False)
 
 """@Toolbar icon size"""
 toolbarSize = (24, 24)