[GRASS-SVN] r31947 - in grass/trunk: gui/wxpython/gui_modules gui/wxpython/nviz gui/wxpython/vdigit visualization/nviz2/cmd

svn_grass at osgeo.org svn_grass at osgeo.org
Wed Jul 2 03:12:17 EDT 2008


Author: martinl
Date: 2008-07-02 03:12:16 -0400 (Wed, 02 Jul 2008)
New Revision: 31947

Modified:
   grass/trunk/gui/wxpython/gui_modules/__init__.py
   grass/trunk/gui/wxpython/gui_modules/nviz.py
   grass/trunk/gui/wxpython/gui_modules/vdigit.py
   grass/trunk/gui/wxpython/gui_modules/wxgui_utils.py
   grass/trunk/gui/wxpython/nviz/
   grass/trunk/gui/wxpython/nviz/Makefile
   grass/trunk/gui/wxpython/nviz/nviz.i
   grass/trunk/gui/wxpython/vdigit/
   grass/trunk/gui/wxpython/vdigit/Makefile
   grass/trunk/gui/wxpython/vdigit/digit.i
   grass/trunk/visualization/nviz2/cmd/local_proto.h
Log:
nviz2: svn prop set fix, vdigit and nviz extension renamed for grass7
vdigit-related bug fixed


Modified: grass/trunk/gui/wxpython/gui_modules/__init__.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/__init__.py	2008-07-02 00:58:01 UTC (rev 31946)
+++ grass/trunk/gui/wxpython/gui_modules/__init__.py	2008-07-02 07:12:16 UTC (rev 31947)
@@ -12,6 +12,7 @@
         "mapdisp",
         "menudata",
         "menuform",
+        "nviz",
         "preferences",
         "profile",
         "render",

Modified: grass/trunk/gui/wxpython/gui_modules/nviz.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/nviz.py	2008-07-02 00:58:01 UTC (rev 31946)
+++ grass/trunk/gui/wxpython/gui_modules/nviz.py	2008-07-02 07:12:16 UTC (rev 31947)
@@ -47,7 +47,7 @@
 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

Modified: grass/trunk/gui/wxpython/gui_modules/vdigit.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/vdigit.py	2008-07-02 00:58:01 UTC (rev 31946)
+++ grass/trunk/gui/wxpython/gui_modules/vdigit.py	2008-07-02 07:12:16 UTC (rev 31947)
@@ -50,7 +50,7 @@
 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:

Modified: grass/trunk/gui/wxpython/gui_modules/wxgui_utils.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/wxgui_utils.py	2008-07-02 00:58:01 UTC (rev 31946)
+++ grass/trunk/gui/wxpython/gui_modules/wxgui_utils.py	2008-07-02 07:12:16 UTC (rev 31947)
@@ -400,7 +400,7 @@
             return
 
         if not self.mapdisplay.toolbars['vdigit']: # enable tool
-            self.mapdisplay.AddToolbar("digit")
+            self.mapdisplay.AddToolbar('vdigit')
         else: # tool already enabled
             pass
 


Property changes on: grass/trunk/gui/wxpython/nviz
___________________________________________________________________
Name: svn:ignore
   - *.tmp.html
*OBJ*
grass6_wxnviz*

   + *.tmp.html
*OBJ*
*wxnviz.i
*wxnviz.py
*wxnviz_wrap.cpp


Modified: grass/trunk/gui/wxpython/nviz/Makefile
===================================================================
--- grass/trunk/gui/wxpython/nviz/Makefile	2008-07-02 00:58:01 UTC (rev 31946)
+++ grass/trunk/gui/wxpython/nviz/Makefile	2008-07-02 07:12:16 UTC (rev 31947)
@@ -2,7 +2,7 @@
 
 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))
 

Modified: grass/trunk/gui/wxpython/nviz/nviz.i
===================================================================
--- grass/trunk/gui/wxpython/nviz/nviz.i	2008-07-02 00:58:01 UTC (rev 31946)
+++ grass/trunk/gui/wxpython/nviz/nviz.i	2008-07-02 07:12:16 UTC (rev 31947)
@@ -1,6 +1,6 @@
 /* File: nviz.i */
 
-%module grass6_wxnviz
+%module grass7_wxnviz
 %{
 #include <grass/gsurf.h>
 #include <grass/gstypes.h>


Property changes on: grass/trunk/gui/wxpython/vdigit
___________________________________________________________________
Name: svn:ignore
   - *.so
OBJ.*
grass6_wxvdigit.i
grass6_wxvdigit.py
grass6_wxvdigit_wrap.cpp

   + *.so
OBJ.*
*wxvdigit.i
*wxvdigit.py
*wxvdigit_wrap.cpp


Modified: grass/trunk/gui/wxpython/vdigit/Makefile
===================================================================
--- grass/trunk/gui/wxpython/vdigit/Makefile	2008-07-02 00:58:01 UTC (rev 31946)
+++ grass/trunk/gui/wxpython/vdigit/Makefile	2008-07-02 07:12:16 UTC (rev 31947)
@@ -2,7 +2,7 @@
 
 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))
 

Modified: grass/trunk/gui/wxpython/vdigit/digit.i
===================================================================
--- grass/trunk/gui/wxpython/vdigit/digit.i	2008-07-02 00:58:01 UTC (rev 31946)
+++ grass/trunk/gui/wxpython/vdigit/digit.i	2008-07-02 07:12:16 UTC (rev 31947)
@@ -1,6 +1,6 @@
 /* File: digit.i */
 
-%module grass6_wxvdigit
+%module grass7_wxvdigit
 %{
 #include <grass/gis.h>
 #include <grass/gisdefs.h>


Property changes on: grass/trunk/visualization/nviz2/cmd/local_proto.h
___________________________________________________________________
Name: svn:mime-type
   - text/x-chrc
   + text/x-chdr



More information about the grass-commit mailing list