Explorar o código

nviz2: svn prop set fix, vdigit and nviz extension renamed for grass7
vdigit-related bug fixed


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@31947 15284696-431f-4ddb-bdfa-cd5b030d7da7

Martin Landa %!s(int64=17) %!d(string=hai) anos
pai
achega
a12e93c027

+ 1 - 0
gui/wxpython/gui_modules/__init__.py

@@ -12,6 +12,7 @@ all = [ "dbm",
         "mapdisp",
         "menudata",
         "menuform",
+        "nviz",
         "preferences",
         "profile",
         "render",

+ 1 - 1
gui/wxpython/gui_modules/nviz.py

@@ -47,7 +47,7 @@ from preferences import globalSettings as UserSettings
 try:
     nvizPath = os.path.join(globalvar.ETCWXDIR, "nviz")
     sys.path.append(nvizPath)
-    import grass6_wxnviz as wxnviz
+    import grass7_wxnviz as wxnviz
     haveNviz = True
 except ImportError:
     haveNviz = False

+ 1 - 1
gui/wxpython/gui_modules/vdigit.py

@@ -50,7 +50,7 @@ from preferences import globalSettings as UserSettings
 try:
     digitPath = os.path.join(globalvar.ETCWXDIR, "vdigit")
     sys.path.append(digitPath)
-    import grass6_wxvdigit as wxvdigit
+    import grass7_wxvdigit as wxvdigit
     GV_LINES = wxvdigit.GV_LINES
     digitErr = ''
 except ImportError, err:

+ 1 - 1
gui/wxpython/gui_modules/wxgui_utils.py

@@ -400,7 +400,7 @@ class LayerTree(CT.CustomTreeCtrl):
             return
 
         if not self.mapdisplay.toolbars['vdigit']: # enable tool
-            self.mapdisplay.AddToolbar("digit")
+            self.mapdisplay.AddToolbar('vdigit')
         else: # tool already enabled
             pass
 

+ 1 - 1
gui/wxpython/nviz/Makefile

@@ -2,7 +2,7 @@ MODULE_TOPDIR = ../../..
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 
-LIB_NAME = grass6_wxnviz
+LIB_NAME = grass7_wxnviz
 SOURCES := $(wildcard *.cpp) $(LIB_NAME)_wrap.cpp
 SHLIB_OBJS := $(patsubst %.cpp, $(OBJDIR)/%.o, $(SOURCES))
 

+ 1 - 1
gui/wxpython/nviz/nviz.i

@@ -1,6 +1,6 @@
 /* File: nviz.i */
 
-%module grass6_wxnviz
+%module grass7_wxnviz
 %{
 #include <grass/gsurf.h>
 #include <grass/gstypes.h>

+ 1 - 1
gui/wxpython/vdigit/Makefile

@@ -2,7 +2,7 @@ MODULE_TOPDIR = ../../..
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 
-LIB_NAME = grass6_wxvdigit
+LIB_NAME = grass7_wxvdigit
 SOURCES := $(wildcard *.cpp) $(LIB_NAME)_wrap.cpp
 SHLIB_OBJS := $(patsubst %.cpp, $(OBJDIR)/%.o, $(SOURCES))
 

+ 1 - 1
gui/wxpython/vdigit/digit.i

@@ -1,6 +1,6 @@
 /* File: digit.i */
 
-%module grass6_wxvdigit
+%module grass7_wxvdigit
 %{
 #include <grass/gis.h>
 #include <grass/gisdefs.h>