[GRASS-SVN] r48538 - in grass/trunk: gui/wxpython/docs
gui/wxpython/gui_modules gui/wxpython/icons gui/wxpython/xml
visualization/nviz2/cmd
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Sep 28 09:39:16 EDT 2011
Author: martinl
Date: 2011-09-28 06:39:16 -0700 (Wed, 28 Sep 2011)
New Revision: 48538
Modified:
grass/trunk/gui/wxpython/docs/wxGUI.Nviz.html
grass/trunk/gui/wxpython/gui_modules/nviz_mapdisp.py
grass/trunk/gui/wxpython/gui_modules/toolbars.py
grass/trunk/gui/wxpython/icons/icon.py
grass/trunk/gui/wxpython/xml/menudata.xml
grass/trunk/visualization/nviz2/cmd/Makefile
grass/trunk/visualization/nviz2/cmd/main.c
grass/trunk/visualization/nviz2/cmd/nviz_cmd.html
Log:
nviz_cmd -> m.nviz.image (pass 1)
Modified: grass/trunk/gui/wxpython/docs/wxGUI.Nviz.html
===================================================================
--- grass/trunk/gui/wxpython/docs/wxGUI.Nviz.html 2011-09-28 12:12:41 UTC (rev 48537)
+++ grass/trunk/gui/wxpython/docs/wxGUI.Nviz.html 2011-09-28 13:39:16 UTC (rev 48538)
@@ -389,7 +389,7 @@
See also <a href="http://grass.osgeo.org/wiki/WxNVIZ">wiki</a> page.
<br><br>
-Command-line module <em><a href="nviz_cmd.html">nviz_cmd</a></em>.
+Command-line module <em><a href="m.nviz.image.html">m.nviz.image</a></em>.
<br><br>
Original <a href="nviz.html">TCL/TK-based</a> Nviz.
Modified: grass/trunk/gui/wxpython/gui_modules/nviz_mapdisp.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/nviz_mapdisp.py 2011-09-28 12:12:41 UTC (rev 48537)
+++ grass/trunk/gui/wxpython/gui_modules/nviz_mapdisp.py 2011-09-28 13:39:16 UTC (rev 48538)
@@ -1892,8 +1892,8 @@
self.nvizDefault.SetVectorLinesDefaultProp(data['vector']['lines'])
def NvizCmdCommand(self):
- """!Generate command for nviz_cmd according to current state"""
- cmd = 'nviz_cmd '
+ """!Generate command for m.nviz.image according to current state"""
+ cmd = 'm.nviz.image '
rasters = []
vectors = []
Modified: grass/trunk/gui/wxpython/gui_modules/toolbars.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/toolbars.py 2011-09-28 12:12:41 UTC (rev 48537)
+++ grass/trunk/gui/wxpython/gui_modules/toolbars.py 2011-09-28 13:39:16 UTC (rev 48538)
@@ -1305,7 +1305,7 @@
def _toolbarData(self):
"""!Toolbar data"""
icons = Icons['nviz']
- return self._getToolbarData((("nviz_cmd", icons['nviz_cmd'],
+ return self._getToolbarData((("nvizCmd", icons['nvizCmd'],
self.OnNvizCmd),
(None, ),
("settings", icons["settings"],
@@ -1315,7 +1315,7 @@
)
def OnNvizCmd(self, event):
- """!Show nviz_cmd command"""
+ """!Show m.nviz.image command"""
self.lmgr.GetLayerTree().GetMapDisplay().GetWindow().OnNvizCmd()
def OnHelp(self, event):
Modified: grass/trunk/gui/wxpython/icons/icon.py
===================================================================
--- grass/trunk/gui/wxpython/icons/icon.py 2011-09-28 12:12:41 UTC (rev 48537)
+++ grass/trunk/gui/wxpython/icons/icon.py 2011-09-28 13:39:16 UTC (rev 48538)
@@ -346,9 +346,9 @@
'zoomOut': MetaIcon(img = iconSet.get('zoom-out', wx.ART_ERROR),
label = _('Zoom out'),
desc = _('Click mouse to unzoom')),
- 'nviz_cmd': MetaIcon(img = iconSet.get('script-save', wx.ART_ERROR),
- label = _('Generate command for nviz_cmd'),
- desc = _('Generate command for nviz_cmd based on current state')),
+ 'nvizCmd': MetaIcon(img = iconSet.get('script-save', wx.ART_ERROR),
+ label = _('Generate command for m.nviz.image'),
+ desc = _('Generate command for m.nviz.image based on current state')),
'settings': MetaIcon(img = iconSet.get('3d-settings', wx.ART_ERROR),
label = _('3D view mode settings'),
desc = _('Show 3D view mode settings dialog')),
Modified: grass/trunk/gui/wxpython/xml/menudata.xml
===================================================================
--- grass/trunk/gui/wxpython/xml/menudata.xml 2011-09-28 12:12:41 UTC (rev 48537)
+++ grass/trunk/gui/wxpython/xml/menudata.xml 2011-09-28 13:39:16 UTC (rev 48538)
@@ -715,11 +715,11 @@
<command>nviz</command>
</menuitem>
<menuitem>
- <label>NVIZ (non-interactive)</label>
+ <label>3D image rendering</label>
<help>Creates a 3D rendering of GIS data.</help>
<keywords>visualization,raster,vector,raster3d</keywords>
<handler>OnMenuCmd</handler>
- <command>nviz_cmd</command>
+ <command>m.nviz.image</command>
</menuitem>
<separator />
<menuitem>
Modified: grass/trunk/visualization/nviz2/cmd/Makefile
===================================================================
--- grass/trunk/visualization/nviz2/cmd/Makefile 2011-09-28 12:12:41 UTC (rev 48537)
+++ grass/trunk/visualization/nviz2/cmd/Makefile 2011-09-28 13:39:16 UTC (rev 48538)
@@ -1,6 +1,6 @@
MODULE_TOPDIR = ../../..
-PGM = nviz_cmd
+PGM = m.nviz.image
ifeq ($(OPENGL_X11),1)
OGL_LIBS := $(OPENGLULIB) $(OPENGLLIB) $(XLIBPATH) $(XLIB) -lXmu -lXext $(XEXTRALIBS) $(MATHLIB)
Modified: grass/trunk/visualization/nviz2/cmd/main.c
===================================================================
--- grass/trunk/visualization/nviz2/cmd/main.c 2011-09-28 12:12:41 UTC (rev 48537)
+++ grass/trunk/visualization/nviz2/cmd/main.c 2011-09-28 13:39:16 UTC (rev 48538)
@@ -1,9 +1,10 @@
/****************************************************************************
*
- * MODULE: nviz_cmd
+ * MODULE: m.nviz.image
*
* AUTHOR(S): Martin Landa <landa.martin gmail.com> (Google SoC 2008/2010)
+ * Anna Kratochvilova (Google SoC 2011)
*
* PURPOSE: Renders GIS data in 3D space.
*
Modified: grass/trunk/visualization/nviz2/cmd/nviz_cmd.html
===================================================================
--- grass/trunk/visualization/nviz2/cmd/nviz_cmd.html 2011-09-28 12:12:41 UTC (rev 48537)
+++ grass/trunk/visualization/nviz2/cmd/nviz_cmd.html 2011-09-28 13:39:16 UTC (rev 48538)
@@ -1,6 +1,6 @@
<h2>DESCRIPTION</h2>
-<em>nviz_cmd</em> allows users to realistically render multiple
+<em>m.nviz.image</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
@@ -12,7 +12,7 @@
<div class="code"><pre>
g.region rast=elevation
-nviz_cmd elevation_map=elevation output=elev perspective=15
+m.nviz.image elevation_map=elevation output=elev perspective=15
</pre></div>
<h2>SEE ALSO</h2>
More information about the grass-commit
mailing list