Changeset 985

Timestamp:

Jul 10, 2013 4:25:58 AM (10 years ago)

Author:

vondreele

Message:

remove glFreeType & add gltext - works much better
implement gltext - works in 64 bit python/opengl
needs a bit of work for model rotation

Location:

trunk

Files:

• GSASIIplot.py (modified) (7 diffs)
• glFreeType.py (deleted)
• gltext.py (added)

trunk/GSASIIplot.py

@@ -40 +40 @@
 from  OpenGL.GL import *
 from OpenGL.GLU import *
-#from OpenGL.GLUT import *
+from OpenGL.GLUT import *
 from OpenGL.GLE import *
-import glFreeType
+import gltext
 from matplotlib.backends.backend_wx import _load_bitmap
 from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as Canvas
@@ -2696 +2696 @@
     Bl = np.array([0,0,255])
     Or = np.array([255,128,0])
-    our_font = getFont()
+#    our_font = getFont()
     uBox = np.array([[0,0,0],[1,0,0],[1,1,0],[0,1,0],[0,0,1],[1,0,1],[1,1,1],[0,1,1]])
     uEdges = np.array([
@@ -3308 +3308 @@
         glColor3fv(color)
         glRasterPos3f(0,0,0)
-#        our_font.glPrint(300,300,label)
-#        for c in list(label):
-#            glutBitmapCharacter(GLUT_BITMAP_8_BY_13,ord(c))
+        if bool(glutBitmapCharacter):       #seems to only exist in 32 bit Windows
+            for c in list(label):
+                glutBitmapCharacter(GLUT_BITMAP_8_BY_13,ord(c))
+        else:
+            text = gltext.TextElement(text=label,font=Font)
+            text.draw_text(scale=0.025)
+#           our_font.glPrint(0,0,label)
         glEnable(GL_LIGHTING)
         glPopMatrix()
@@ -3554 +3558 @@
         view = False
         altDown = False
+    Font = Page.GetFont()
     Page.SetFocus()
     Page.Choice = None
@@ -3614 +3619 @@
     uEdges = np.array([[uBox[0],uBox[1]],[uBox[0],uBox[2]],[uBox[0],uBox[3]]])
     uColors = [Rd,Gr,Bl]
-    our_font = getFont()
     if rbType == 'Vector':
         atNames = [str(i)+':'+Ty for i,Ty in enumerate(rbData['rbTypes'])]
@@ -3789 +3793 @@
         glColor3f(1.0,1.0,1.0)
         glRasterPos3f(0,0,0)
-#        our_font.glPrint(0,0,label)
-#        for c in list(label):
-#            glutBitmapCharacter(GLUT_BITMAP_8_BY_13,ord(c))
+        if bool(glutBitmapCharacter):
+            for c in list(label):
+                glutBitmapCharacter(GLUT_BITMAP_8_BY_13,ord(c))
+        else:
+            text = gltext.TextElement(text=label,font=Font)
+            text.draw_text(scale=0.025)
         glEnable(GL_LIGHTING)
         glPopMatrix()
@@ -3846 +3853 @@
         altDown = False
     Page.SetFocus()
+    Font = Page.GetFont()
     Page.canvas.Bind(wx.EVT_MOUSEWHEEL, OnMouseWheel)
     Page.canvas.Bind(wx.EVT_LEFT_DOWN, OnMouseDown)