Ver código fonte

Convert wxGUI NVIZ module to Python

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@42275 15284696-431f-4ddb-bdfa-cd5b030d7da7
Glynn Clements 15 anos atrás
pai
commit
03c30ad488

+ 3 - 3
gui/wxpython/Makefile

@@ -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 @@ ETCDIR = $(ETC)/gui/wxpython
 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

+ 3 - 2
gui/wxpython/gui_modules/nviz_mapdisp.py

@@ -37,8 +37,9 @@ from goutput import wxCmdOutput
 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()

+ 4 - 3
gui/wxpython/gui_modules/nviz_tools.py

@@ -31,8 +31,9 @@ from preferences import globalSettings as UserSettings
 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 @@ class ViewPositionWindow(wx.Window):
             self.mapWindow.view['pos']['y'] = ycoord
                
         event = wxUpdateView(zExag=True)
-        wx.PostEvent(self.mapWindow, event)
+        wx.PostEvent(self.mapWindow, event)

+ 6 - 5
gui/wxpython/gui_modules/workspace.py

@@ -36,11 +36,12 @@ import utils
 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):