[GRASS-SVN] r54737 - in grass/trunk/gui/wxpython: mapdisp nviz

[svn_grass at osgeo.org]

Author: martinl
Date: 2013-01-21 10:08:21 -0800 (Mon, 21 Jan 2013)
New Revision: 54737

Modified:
   grass/trunk/gui/wxpython/mapdisp/toolbars.py
   grass/trunk/gui/wxpython/nviz/wxnviz.py
Log:
wxGUI/nviz: fix error handling (needs some refactoring - avoid `nviz.main`)


Modified: grass/trunk/gui/wxpython/mapdisp/toolbars.py
===================================================================
--- grass/trunk/gui/wxpython/mapdisp/toolbars.py	2013-01-21 17:58:20 UTC (rev 54736)
+++ grass/trunk/gui/wxpython/mapdisp/toolbars.py	2013-01-21 18:08:21 UTC (rev 54737)
@@ -89,10 +89,6 @@
             from nviz.main 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)
             
             self.toolId['3d'] = -1
 

Modified: grass/trunk/gui/wxpython/nviz/wxnviz.py
===================================================================
--- grass/trunk/gui/wxpython/nviz/wxnviz.py	2013-01-21 17:58:20 UTC (rev 54736)
+++ grass/trunk/gui/wxpython/nviz/wxnviz.py	2013-01-21 18:08:21 UTC (rev 54737)
@@ -39,16 +39,14 @@
 import wx
 
 from ctypes import *
-try:
-    from grass.lib.gis      import *
-    from grass.lib.raster3d import *
-    from grass.lib.vector   import *
-    from grass.lib.ogsf     import *
-    from grass.lib.nviz     import *
-    from grass.lib.raster   import *
-except ImportError, e:
-    sys.stderr.write(_("3D view mode: %s\n") % e)
-    
+
+from grass.lib.gis      import *
+from grass.lib.raster3d import *
+from grass.lib.vector   import *
+from grass.lib.ogsf     import *
+from grass.lib.nviz     import *
+from grass.lib.raster   import *
+
 from core.debug import Debug
 import grass.script as grass