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

svn_grass at osgeo.org svn_grass at osgeo.org
Fri Mar 6 17:13:22 EST 2009


Author: martinl
Date: 2009-03-06 17:13:22 -0500 (Fri, 06 Mar 2009)
New Revision: 36219

Modified:
   grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/nviz_mapdisp.py
   grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/nviz_tools.py
Log:
wxGUI: show error message if nviz extension is not available
    (merge from trunk, r36214) 


Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/nviz_mapdisp.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/nviz_mapdisp.py	2009-03-06 22:12:35 UTC (rev 36218)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/nviz_mapdisp.py	2009-03-06 22:13:22 UTC (rev 36219)
@@ -37,10 +37,7 @@
 from goutput import wxCmdOutput as wxCmdOutput
 
 sys.path.append(os.path.join(globalvar.ETCWXDIR, "nviz"))
-try:
-    import grass6_wxnviz as wxnviz
-except ImportError:
-    pass
+import grass6_wxnviz as wxnviz
 
 wxUpdateProperties, EVT_UPDATE_PROP = NewEvent()
 wxUpdateView,       EVT_UPDATE_VIEW = NewEvent()

Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/nviz_tools.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/nviz_tools.py	2009-03-06 22:12:35 UTC (rev 36218)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/nviz_tools.py	2009-03-06 22:13:22 UTC (rev 36219)
@@ -30,10 +30,7 @@
 from nviz_mapdisp import wxUpdateProperties as wxUpdateProperties
 
 sys.path.append(os.path.join(globalvar.ETCWXDIR, "nviz"))
-try:
-   import grass6_wxnviz as wxnviz
-except ImportError:
-   pass
+import grass6_wxnviz as wxnviz
 
 class NvizToolWindow(wx.Frame):
     """Experimental window for Nviz tools



More information about the grass-commit mailing list