Changeset 1379 for trunk/GSASIIplot.py

Timestamp:

Jun 11, 2014 5:27:13 PM (9 years ago)

Author:

toby

Message:

more wx2.9: partial fix for GL, fails until rotated, etc.

File:

• trunk/GSASIIplot.py (modified) (3 diffs)

trunk/GSASIIplot.py

@@ -83 +83 @@
     def __init__(self,parent,id=-1,dpi=None,**kwargs):
         self.figure = wx.Panel.__init__(self,parent,id=id,**kwargs)
-        if 'win' in sys.platform:           #Windows already double buffered
+        if 'win' in sys.platform:           #Windows (& Mac) already double buffered
             self.canvas = wx.glcanvas.GLCanvas(self,-1,**kwargs)
         else:                               #fix from Jim Hester for X systems
             attribs = (wx.glcanvas.WX_GL_DOUBLEBUFFER,)         
             self.canvas = wx.glcanvas.GLCanvas(self,-1,attribList=attribs,**kwargs)
+        # create GL context for wx > 2.8
+        i,j= wx.__version__.split('.')[0:2]
+        if int(i)+int(j)/10. > 2.8:
+            self.context = wx.glcanvas.GLContext(self.canvas)
+            self.canvas.SetCurrent(self.context)
+        else:
+            self.context = None
         self.camera = {}
         sizer=wx.BoxSizer(wx.VERTICAL)
@@ -4123 +4130 @@
                 RenderBackbone(Backbone,BackboneColor,bondR)
 #        print time.time()-time0
+        if Page.context: Page.canvas.SetCurrent(Page.context)    # wx 2.9 fix
         Page.canvas.SwapBuffers()
-       
+        
     def OnSize(event):
         Draw('size')
@@ -4418 +4426 @@
             RenderBonds(x,y,z,Bonds[iat],0.05,color)
             RenderLabel(x,y,z,'  '+atNames[iat],matRot)
+        if Page.context: Page.canvas.SetCurrent(Page.context)    # wx 2.9 fix
         Page.canvas.SwapBuffers()