[GRASS-SVN] r49360 - grass/branches/releasebranch_6_4/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-11-25 12:19:06 -0800 (Fri, 25 Nov 2011)
New Revision: 49360

Modified:
   grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/nviz.py
   grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/toolbars.py
Log:
wxGUI: disable wxNviz for 6.4.2


Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/nviz.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/nviz.py	2011-11-25 20:03:30 UTC (rev 49359)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/nviz.py	2011-11-25 20:19:06 UTC (rev 49360)
@@ -29,7 +29,9 @@
     import nviz_mapdisp
     import nviz_tools
     import wxnviz
-    haveNviz = True
+    # disable wxNviz for 6.4.2
+    # TODO: backport wxNviz from devbr6 *after* releasing 6.4.2
+    haveNviz = False
 except ImportError, err:
     haveNviz = False
     errorMsg = err

Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/toolbars.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/toolbars.py	2011-11-25 20:03:30 UTC (rev 49359)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/toolbars.py	2011-11-25 20:19:06 UTC (rev 49360)
@@ -213,12 +213,12 @@
             self.toolId['3d'] = 1
         else:
             from nviz import errorMsg
-            log.WriteCmdLog(_('3D view mode not available'))
-            log.WriteWarning(_('Reason: %s') % str(errorMsg))
-            log.WriteLog(_('Note that the wxGUI\'s 3D view mode is currently disabled '
-                           'on MS Windows (hopefully this will be fixed soon). '
-                           'Please keep an eye out for updated versions of GRASS. '
-                           'In the meantime you can use "NVIZ" from the File menu.'), wrap = 60)
+            ### log.WriteCmdLog(_('3D view mode not available'))
+            ### log.WriteWarning(_('Reason: %s') % str(errorMsg))
+            ### log.WriteLog(_('Note that the wxGUI\'s 3D view mode is currently disabled '
+            ### 'on MS Windows (hopefully this will be fixed soon). '
+            ### 'Please keep an eye out for updated versions of GRASS. '
+            ### 'In the meantime you can use "NVIZ" from the File menu.'), wrap = 60)
             
             self.toolId['3d'] = -1