[GRASS-SVN] r42275 - in grass/trunk/gui/wxpython: . gui_modules

[svn_grass at osgeo.org]

Author: glynn
Date: 2010-05-17 17:45:20 -0400 (Mon, 17 May 2010)
New Revision: 42275

Modified:
   grass/trunk/gui/wxpython/Makefile
   grass/trunk/gui/wxpython/gui_modules/nviz_mapdisp.py
   grass/trunk/gui/wxpython/gui_modules/nviz_tools.py
   grass/trunk/gui/wxpython/gui_modules/workspace.py
Log:
Convert wxGUI NVIZ module to Python


Modified: grass/trunk/gui/wxpython/Makefile
===================================================================
--- grass/trunk/gui/wxpython/Makefile	2010-05-17 21:44:13 UTC (rev 42274)
+++ grass/trunk/gui/wxpython/Makefile	2010-05-17 21:45:20 UTC (rev 42275)
@@ -1,8 +1,8 @@
 MODULE_TOPDIR = ../..
 
-SUBDIRS = docs vdigit nviz
+SUBDIRS = docs vdigit
 EXTRA_CLEAN_FILES = menustrings.py
-CLEAN_SUBDIRS = vdigit nviz
+CLEAN_SUBDIRS = vdigit
 
 include $(MODULE_TOPDIR)/include/Make/Dir.make
 include $(MODULE_TOPDIR)/include/Make/Doxygen.make
@@ -13,7 +13,7 @@
 SRCFILES := $(wildcard scripts/* compat/* gui_modules/* icons/*.* icons/silk/* images/* xml/*) gis_set.py wxgui.py README
 DSTFILES := $(patsubst %,$(ETCDIR)/%,$(SRCFILES)) $(patsubst %.py,$(ETCDIR)/%.pyc,$(filter %.py,$(SRCFILES)))
 
-DSTDIRS := $(patsubst %,$(ETCDIR)/%,compat gui_modules icons icons/silk images scripts vdigit xml nviz)
+DSTDIRS := $(patsubst %,$(ETCDIR)/%,compat gui_modules icons icons/silk images scripts vdigit xml)
 
 default: $(DSTFILES) menustrings.py
 	$(MAKE) parsubdirs

Modified: grass/trunk/gui/wxpython/gui_modules/nviz_mapdisp.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/nviz_mapdisp.py	2010-05-17 21:44:13 UTC (rev 42274)
+++ grass/trunk/gui/wxpython/gui_modules/nviz_mapdisp.py	2010-05-17 21:45:20 UTC (rev 42275)
@@ -37,8 +37,9 @@
 from preferences import globalSettings as UserSettings
 from workspace import Nviz as NvizDefault
 
-sys.path.append(os.path.join(globalvar.ETCWXDIR, "nviz"))
-import grass7_wxnviz as wxnviz
+import wxnviz
+# sys.path.append(os.path.join(globalvar.ETCWXDIR, "nviz"))
+# import grass7_wxnviz as wxnviz
 
 wxUpdateProperties, EVT_UPDATE_PROP = NewEvent()
 wxUpdateView,       EVT_UPDATE_VIEW = NewEvent()

Modified: grass/trunk/gui/wxpython/gui_modules/nviz_tools.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/nviz_tools.py	2010-05-17 21:44:13 UTC (rev 42274)
+++ grass/trunk/gui/wxpython/gui_modules/nviz_tools.py	2010-05-17 21:45:20 UTC (rev 42275)
@@ -31,8 +31,9 @@
 from nviz_mapdisp import wxUpdateView as wxUpdateView
 from nviz_mapdisp import wxUpdateProperties as wxUpdateProperties
 
-sys.path.append(os.path.join(globalvar.ETCWXDIR, "nviz"))
-import grass7_wxnviz as wxnviz
+import wxnviz
+# sys.path.append(os.path.join(globalvar.ETCWXDIR, "nviz"))
+# import grass7_wxnviz as wxnviz
 
 class NvizToolWindow(wx.Frame):
     """!Experimental window for Nviz tools
@@ -2656,4 +2657,4 @@
             self.mapWindow.view['pos']['y'] = ycoord
                
         event = wxUpdateView(zExag=True)
-        wx.PostEvent(self.mapWindow, event)
\ No newline at end of file
+        wx.PostEvent(self.mapWindow, event)

Modified: grass/trunk/gui/wxpython/gui_modules/workspace.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/workspace.py	2010-05-17 21:44:13 UTC (rev 42274)
+++ grass/trunk/gui/wxpython/gui_modules/workspace.py	2010-05-17 21:45:20 UTC (rev 42275)
@@ -36,11 +36,12 @@
 import globalvar
 from preferences import globalSettings as UserSettings
 
-sys.path.append(os.path.join(globalvar.ETCWXDIR, "nviz"))
-try:
-    import grass7_wxnviz as wxnviz
-except ImportError:
-    wxnviz = None
+#sys.path.append(os.path.join(globalvar.ETCWXDIR, "nviz"))
+#try:
+#    import grass7_wxnviz as wxnviz
+#except ImportError:
+#    wxnviz = None
+import wxnviz
 
 class ProcessWorkspaceFile:
     def __init__(self, tree):