[GRASS-SVN] r53168 - in grass/branches/releasebranch_6_4/gui: scripts wxpython/lmgr wxpython/scripts

[svn_grass at osgeo.org]

Author: martinl
Date: 2012-09-12 01:50:45 -0700 (Wed, 12 Sep 2012)
New Revision: 53168

Added:
   grass/branches/releasebranch_6_4/gui/scripts/d.rast3d.py
Removed:
   grass/branches/releasebranch_6_4/gui/wxpython/scripts/d.rast3d.py
Modified:
   grass/branches/releasebranch_6_4/gui/wxpython/lmgr/layertree.py
Log:
wxGUI: attemt to fix #1729 (Add 3d raster does not open GUI)
       (backport r53163 from devbr6)


Copied: grass/branches/releasebranch_6_4/gui/scripts/d.rast3d.py (from rev 53163, grass/branches/develbranch_6/gui/scripts/d.rast3d.py)
===================================================================
--- grass/branches/releasebranch_6_4/gui/scripts/d.rast3d.py	                        (rev 0)
+++ grass/branches/releasebranch_6_4/gui/scripts/d.rast3d.py	2012-09-12 08:50:45 UTC (rev 53168)
@@ -0,0 +1,36 @@
+#!/usr/bin/env python
+#
+############################################################################
+#
+# MODULE:       d.rast3d
+#
+# AUTHOR(S):    Martin Landa <landa.martin gmail.com>
+#
+# PURPOSE:	Wrapper for wxGUI to add 3D raster map into layer tree
+#
+# COPYRIGHT:	(C) 2008, 2010, 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.
+#
+#############################################################################
+
+#%module
+#% description: Displays user-specified 3D raster map in the active graphics frame.
+#% keywords: display, raster3d
+#%end
+
+#%option
+#% key: map
+#% type: string
+#% gisprompt: old,grid3,3d-raster
+#% description: 3D raster map to be displayed
+#% required : yes
+#%end
+
+from grass.script import core as grass
+
+if __name__ == "__main__":
+    options, flags = grass.parser()
+    main()

Modified: grass/branches/releasebranch_6_4/gui/wxpython/lmgr/layertree.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/lmgr/layertree.py	2012-09-11 16:10:34 UTC (rev 53167)
+++ grass/branches/releasebranch_6_4/gui/wxpython/lmgr/layertree.py	2012-09-12 08:50:45 UTC (rev 53168)
@@ -987,7 +987,7 @@
                 cmd.append('-o')
                          
         elif ltype == '3d-raster':
-            cmd = ['d.rast3d']
+            cmd = ['d.rast3d.py']
                                         
         elif ltype == 'rgb':
             cmd = ['d.rgb']

Deleted: grass/branches/releasebranch_6_4/gui/wxpython/scripts/d.rast3d.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/scripts/d.rast3d.py	2012-09-11 16:10:34 UTC (rev 53167)
+++ grass/branches/releasebranch_6_4/gui/wxpython/scripts/d.rast3d.py	2012-09-12 08:50:45 UTC (rev 53168)
@@ -1,36 +0,0 @@
-#!/usr/bin/env python
-#
-############################################################################
-#
-# MODULE:       d.rast3d
-#
-# AUTHOR(S):    Martin Landa <landa.martin gmail.com>
-#
-# PURPOSE:	Wrapper for wxGUI to add 3D raster map into layer tree
-#
-# COPYRIGHT:	(C) 2008, 2010 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.
-#
-#############################################################################
-
-#%module
-#% description: Displays 3D raster map layer.
-#% keywords: display, raster3d
-#%end
-
-#%option
-#% key: map
-#% type: string
-#% gisprompt: old,grid3,3d-raster
-#% description: 3D raster map to be displayed
-#% required : yes
-#%end
-
-from grass.script import core as grass
-
-if __name__ == "__main__":
-    options, flags = grass.parser()
-    main()