Просмотр исходного кода

wxGUI/nviz: fix error handling (needs some refactoring - avoid `nviz.main`)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@54737 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 12 лет назад
Родитель
Сommit
1897b1edeb
2 измененных файлов с 8 добавлено и 14 удалено
  1. 0 4
      gui/wxpython/mapdisp/toolbars.py
  2. 8 10
      gui/wxpython/nviz/wxnviz.py

+ 0 - 4
gui/wxpython/mapdisp/toolbars.py

@@ -89,10 +89,6 @@ class MapToolbar(BaseToolbar):
             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
 

+ 8 - 10
gui/wxpython/nviz/wxnviz.py

@@ -39,16 +39,14 @@ except ImportError:
 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