[GRASS-SVN] r33474 - grass/trunk/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: glynn
Date: 2008-09-17 02:54:59 -0400 (Wed, 17 Sep 2008)
New Revision: 33474

Modified:
   grass/trunk/gui/wxpython/gui_modules/mapdisp.py
   grass/trunk/gui/wxpython/gui_modules/nviz.py
   grass/trunk/gui/wxpython/gui_modules/nviz_mapdisp.py
   grass/trunk/gui/wxpython/gui_modules/nviz_tools.py
   grass/trunk/gui/wxpython/gui_modules/vdigit.py
Log:
Change grass6 -> grass7
Remove PyOpenGL references


Modified: grass/trunk/gui/wxpython/gui_modules/mapdisp.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/mapdisp.py	2008-09-17 03:35:56 UTC (rev 33473)
+++ grass/trunk/gui/wxpython/gui_modules/mapdisp.py	2008-09-17 06:54:59 UTC (rev 33474)
@@ -2677,11 +2677,6 @@
                         "included with this build "
                         "of wxPython! Switching back to "
                         "2D display mode.\n\nDetails: %s" % nviz.errorMsg)
-            if not nviz.haveOpenGL:
-                msg = _("Unable to start Nviz. The OpenGL package "
-                        "was not found. You can get it "
-                        "at http://PyOpenGL.sourceforge.net. "
-                        "Switching back to 2D display mode.\n\nDetails: %s" % nviz.errorMsg)
             if not nviz.haveNviz:
                 msg = _("Unable to start Nviz. Python extension "
                         "for Nviz was not found or loaded properly. "

Modified: grass/trunk/gui/wxpython/gui_modules/nviz.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/nviz.py	2008-09-17 03:35:56 UTC (rev 33473)
+++ grass/trunk/gui/wxpython/gui_modules/nviz.py	2008-09-17 06:54:59 UTC (rev 33474)
@@ -29,18 +29,11 @@
 except ImportError, e:
     haveGLCanvas = False
     errorMsg = e
-try:
-    from OpenGL.GL import *
-    from OpenGL.GLUT import *
-    haveOpenGL = True
-except ImportError, e:
-    haveOpenGL = False
-    errorMsg = e
 
 import globalvar
 try:
     sys.path.append(os.path.join(globalvar.ETCWXDIR, "nviz"))
-    import grass6_wxnviz as wxnviz
+    import grass7_wxnviz as wxnviz
     haveNviz = True
 except ImportError, e:
     haveNviz = False

Modified: grass/trunk/gui/wxpython/gui_modules/nviz_mapdisp.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/nviz_mapdisp.py	2008-09-17 03:35:56 UTC (rev 33473)
+++ grass/trunk/gui/wxpython/gui_modules/nviz_mapdisp.py	2008-09-17 06:54:59 UTC (rev 33474)
@@ -37,7 +37,7 @@
 from goutput import wxCmdOutput as wxCmdOutput
 
 sys.path.append(os.path.join(globalvar.ETCWXDIR, "nviz"))
-import grass6_wxnviz as wxnviz
+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	2008-09-17 03:35:56 UTC (rev 33473)
+++ grass/trunk/gui/wxpython/gui_modules/nviz_tools.py	2008-09-17 06:54:59 UTC (rev 33474)
@@ -30,7 +30,7 @@
 from nviz_mapdisp import wxUpdateProperties as wxUpdateProperties
 
 sys.path.append(os.path.join(globalvar.ETCWXDIR, "nviz"))
-import grass6_wxnviz as wxnviz
+import grass7_wxnviz as wxnviz
 
 class NvizToolWindow(wx.Frame):
     """Experimental window for Nviz tools

Modified: grass/trunk/gui/wxpython/gui_modules/vdigit.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/vdigit.py	2008-09-17 03:35:56 UTC (rev 33473)
+++ grass/trunk/gui/wxpython/gui_modules/vdigit.py	2008-09-17 06:54:59 UTC (rev 33474)
@@ -1303,7 +1303,7 @@
 
 class CDisplayDriver(AbstractDisplayDriver):
     """
-    Display driver using grass6_wxdriver module
+    Display driver using grass7_wxdriver module
     """
     def __init__(self, parent, mapwindow):
         """Initialization