Changeset 33474


Ignore:
Timestamp:
Sep 16, 2008, 11:54:59 PM (16 years ago)
Author:
glynn
Message:

Change grass6 -> grass7
Remove PyOpenGL references

Location:
grass/trunk/gui/wxpython/gui_modules
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • grass/trunk/gui/wxpython/gui_modules/mapdisp.py

    r33399 r33474  
    26782678                        "of wxPython! Switching back to "
    26792679                        "2D display mode.\n\nDetails: %s" % nviz.errorMsg)
    2680             if not nviz.haveOpenGL:
    2681                 msg = _("Unable to start Nviz. The OpenGL package "
    2682                         "was not found. You can get it "
    2683                         "at http://PyOpenGL.sourceforge.net. "
    2684                         "Switching back to 2D display mode.\n\nDetails: %s" % nviz.errorMsg)
    26852680            if not nviz.haveNviz:
    26862681                msg = _("Unable to start Nviz. Python extension "

  • grass/trunk/gui/wxpython/gui_modules/nviz.py

    r32871 r33474  
    3030    haveGLCanvas = False
    3131    errorMsg = e
    32 try:
    33     from OpenGL.GL import *
    34     from OpenGL.GLUT import *
    35     haveOpenGL = True
    36 except ImportError, e:
    37     haveOpenGL = False
    38     errorMsg = e
    3932
    4033import globalvar
    4134try:
    4235    sys.path.append(os.path.join(globalvar.ETCWXDIR, "nviz"))
    43     import grass6_wxnviz as wxnviz
     36    import grass7_wxnviz as wxnviz
    4437    haveNviz = True
    4538except ImportError, e:

  • grass/trunk/gui/wxpython/gui_modules/nviz_mapdisp.py

    r33320 r33474  
    3838
    3939sys.path.append(os.path.join(globalvar.ETCWXDIR, "nviz"))
    40 import grass6_wxnviz as wxnviz
     40import grass7_wxnviz as wxnviz
    4141
    4242wxUpdateProperties, EVT_UPDATE_PROP = NewEvent()

  • grass/trunk/gui/wxpython/gui_modules/nviz_tools.py

    r33320 r33474  
    3131
    3232sys.path.append(os.path.join(globalvar.ETCWXDIR, "nviz"))
    33 import grass6_wxnviz as wxnviz
     33import grass7_wxnviz as wxnviz
    3434
    3535class NvizToolWindow(wx.Frame):

  • grass/trunk/gui/wxpython/gui_modules/vdigit.py

    r33399 r33474  
    13041304class CDisplayDriver(AbstractDisplayDriver):
    13051305    """
    1306     Display driver using grass6_wxdriver module
     1306    Display driver using grass7_wxdriver module
    13071307    """
    13081308    def __init__(self, parent, mapwindow):
Note: See TracChangeset for help on using the changeset viewer.