[GRASS-SVN] r42449 - grass/branches/develbranch_6/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-06-02 18:03:29 -0400 (Wed, 02 Jun 2010)
New Revision: 42449

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/nviz.py
   grass/branches/develbranch_6/gui/wxpython/gui_modules/nviz_mapdisp.py
   grass/branches/develbranch_6/gui/wxpython/gui_modules/nviz_tools.py
   grass/branches/develbranch_6/gui/wxpython/gui_modules/workspace.py
Log:
wxGUI: start on missing grass6_nviz module


Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/nviz.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/nviz.py	2010-06-02 21:23:09 UTC (rev 42448)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/nviz.py	2010-06-02 22:03:29 UTC (rev 42449)
@@ -33,7 +33,8 @@
 import globalvar
 try:
     import nviz_mapdisp
-    import nviz_tools
+    sys.path.append(os.path.join(globalvar.ETCWXDIR, "nviz"))
+    import grass6_wxnviz as wxnviz
     haveNviz = True
 except ImportError, e:
     haveNviz = False
@@ -42,7 +43,5 @@
 
 if haveNviz:
     GLWindow = nviz_mapdisp.GLWindow
-    NvizToolWindow = nviz_tools.NvizToolWindow
 else:
     GLWindow = None
-    NvizToolWindow = None

Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/nviz_mapdisp.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/nviz_mapdisp.py	2010-06-02 21:23:09 UTC (rev 42448)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/nviz_mapdisp.py	2010-06-02 22:03:29 UTC (rev 42449)
@@ -37,8 +37,11 @@
 from preferences import globalSettings as UserSettings
 from workspace import Nviz as NvizDefault
 
-sys.path.append(os.path.join(globalvar.ETCWXDIR, "nviz"))
-import grass6_wxnviz as wxnviz
+try:
+    sys.path.append(os.path.join(globalvar.ETCWXDIR, "nviz"))
+    import grass6_wxnviz as wxnviz
+except ImportError:
+    pass
 
 wxUpdateProperties, EVT_UPDATE_PROP = NewEvent()
 wxUpdateView,       EVT_UPDATE_VIEW = NewEvent()

Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/nviz_tools.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/nviz_tools.py	2010-06-02 21:23:09 UTC (rev 42448)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/nviz_tools.py	2010-06-02 22:03:29 UTC (rev 42449)
@@ -38,8 +38,11 @@
 from nviz_mapdisp import wxUpdateView as wxUpdateView
 from nviz_mapdisp import wxUpdateProperties as wxUpdateProperties
 
-sys.path.append(os.path.join(globalvar.ETCWXDIR, "nviz"))
-import grass6_wxnviz as wxnviz
+try:
+    sys.path.append(os.path.join(globalvar.ETCWXDIR, "nviz"))
+    import grass6_wxnviz as wxnviz
+except ImportError:
+    pass
 
 class NvizToolWindow(FN.FlatNotebook):
     """!Nviz (3D view) tools panel

Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/workspace.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/workspace.py	2010-06-02 21:23:09 UTC (rev 42448)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/workspace.py	2010-06-02 22:03:29 UTC (rev 42449)
@@ -36,8 +36,8 @@
 import globalvar
 from preferences import globalSettings as UserSettings
 
-sys.path.append(os.path.join(globalvar.ETCWXDIR, "nviz"))
 try:
+    sys.path.append(os.path.join(globalvar.ETCWXDIR, "nviz"))
     import grass6_wxnviz as wxnviz
 except ImportError:
     wxnviz = None