Changeset 985
- Timestamp:
- Jul 10, 2013 4:25:58 AM (10 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 1 deleted
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIplot.py
r984 r985 40 40 from OpenGL.GL import * 41 41 from OpenGL.GLU import * 42 #from OpenGL.GLUT import *42 from OpenGL.GLUT import * 43 43 from OpenGL.GLE import * 44 import gl FreeType44 import gltext 45 45 from matplotlib.backends.backend_wx import _load_bitmap 46 46 from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as Canvas … … 2696 2696 Bl = np.array([0,0,255]) 2697 2697 Or = np.array([255,128,0]) 2698 our_font = getFont()2698 # our_font = getFont() 2699 2699 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]]) 2700 2700 uEdges = np.array([ … … 3308 3308 glColor3fv(color) 3309 3309 glRasterPos3f(0,0,0) 3310 # our_font.glPrint(300,300,label) 3311 # for c in list(label): 3312 # glutBitmapCharacter(GLUT_BITMAP_8_BY_13,ord(c)) 3310 if bool(glutBitmapCharacter): #seems to only exist in 32 bit Windows 3311 for c in list(label): 3312 glutBitmapCharacter(GLUT_BITMAP_8_BY_13,ord(c)) 3313 else: 3314 text = gltext.TextElement(text=label,font=Font) 3315 text.draw_text(scale=0.025) 3316 # our_font.glPrint(0,0,label) 3313 3317 glEnable(GL_LIGHTING) 3314 3318 glPopMatrix() … … 3554 3558 view = False 3555 3559 altDown = False 3560 Font = Page.GetFont() 3556 3561 Page.SetFocus() 3557 3562 Page.Choice = None … … 3614 3619 uEdges = np.array([[uBox[0],uBox[1]],[uBox[0],uBox[2]],[uBox[0],uBox[3]]]) 3615 3620 uColors = [Rd,Gr,Bl] 3616 our_font = getFont()3617 3621 if rbType == 'Vector': 3618 3622 atNames = [str(i)+':'+Ty for i,Ty in enumerate(rbData['rbTypes'])] … … 3789 3793 glColor3f(1.0,1.0,1.0) 3790 3794 glRasterPos3f(0,0,0) 3791 # our_font.glPrint(0,0,label) 3792 # for c in list(label): 3793 # glutBitmapCharacter(GLUT_BITMAP_8_BY_13,ord(c)) 3795 if bool(glutBitmapCharacter): 3796 for c in list(label): 3797 glutBitmapCharacter(GLUT_BITMAP_8_BY_13,ord(c)) 3798 else: 3799 text = gltext.TextElement(text=label,font=Font) 3800 text.draw_text(scale=0.025) 3794 3801 glEnable(GL_LIGHTING) 3795 3802 glPopMatrix() … … 3846 3853 altDown = False 3847 3854 Page.SetFocus() 3855 Font = Page.GetFont() 3848 3856 Page.canvas.Bind(wx.EVT_MOUSEWHEEL, OnMouseWheel) 3849 3857 Page.canvas.Bind(wx.EVT_LEFT_DOWN, OnMouseDown)
Note: See TracChangeset
for help on using the changeset viewer.