Changeset 987 for trunk/GSASIIplot.py

Timestamp:

Jul 11, 2013 3:12:11 AM (10 years ago)

Author:

vondreele

Message:

GLUT eliminated! Now use gltext for all atom labelling

File:

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

trunk/GSASIIplot.py

@@ -40 +40 @@
 from  OpenGL.GL import *
 from OpenGL.GLU import *
-from OpenGL.GLUT import *
 from OpenGL.GLE import *
 import gltext
@@ -2686 +2685 @@
     Rd = np.array([255,0,0])
     Gr = np.array([0,255,0])
+    wxGreen = wx.Color(0,255,0)
     Bl = np.array([0,0,255])
     Or = np.array([255,128,0])
+    wxOrange = wx.Color(255,128,0)
     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([
@@ -3292 +3293 @@
         glDisable(GL_COLOR_MATERIAL)
         
-    def RenderLabel(x,y,z,label,r,color):       
+    def RenderLabel(x,y,z,label,r,color,matRot):
+        '''
+        color wx.Color object
+        '''       
         glPushMatrix()
         glTranslate(x,y,z)
         glMultMatrixf(B4mat.T)
         glDisable(GL_LIGHTING)
-        glColor3fv(color)
         glRasterPos3f(0,0,0)
-        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)
+        glMultMatrixf(matRot)
+        glRotate(180,1,0,0)             #fix to flip about x-axis
+        text = gltext.Text(text=label,font=Font,foreground=color)
+        text.draw_text(scale=0.025)
         glEnable(GL_LIGHTING)
         glPopMatrix()
@@ -3484 +3484 @@
                     
             if atom[cs+1] == 'type':
-                RenderLabel(x,y,z,'  '+atom[ct],radius,Gr)
+                RenderLabel(x,y,z,'  '+atom[ct],radius,wxGreen,matRot)
             elif atom[cs+1] == 'name':
-                RenderLabel(x,y,z,'  '+atom[ct-1],radius,Gr)
+                RenderLabel(x,y,z,'  '+atom[ct-1],radius,wxGreen,matRot)
             elif atom[cs+1] == 'number':
-                RenderLabel(x,y,z,'  '+str(iat),radius,Gr)
+                RenderLabel(x,y,z,'  '+str(iat),radius,wxGreen,matRot)
             elif atom[cs+1] == 'residue' and atom[ct-1] == 'CA':
-                RenderLabel(x,y,z,'  '+atom[ct-4],radius,Gr)
+                RenderLabel(x,y,z,'  '+atom[ct-4],radius,wxGreen,matRot)
             elif atom[cs+1] == '1-letter' and atom[ct-1] == 'CA':
-                RenderLabel(x,y,z,'  '+atom[ct-3],radius,Gr)
+                RenderLabel(x,y,z,'  '+atom[ct-3],radius,wxGreen,matRot)
             elif atom[cs+1] == 'chain' and atom[ct-1] == 'CA':
-                RenderLabel(x,y,z,'  '+atom[ct-2],radius,Gr)
+                RenderLabel(x,y,z,'  '+atom[ct-2],radius,wxGreen,matRot)
 #        glDisable(GL_BLEND)
         if len(rhoXYZ):
@@ -3517 +3517 @@
                 RenderSphere(x,y,z,0.2,color/255.)
                 RenderBonds(x,y,z,rbBonds[ind],0.03,Gr)
-                RenderLabel(x,y,z,name,0.2,Or)
+                RenderLabel(x,y,z,name,0.2,wxOrange,matRot)
         if len(mcsaModels) > 1 and pageName == 'MC/SA':             #skip the default MD entry
             for ind,[x,y,z] in enumerate(mcsaXYZ):
@@ -3525 +3525 @@
                 RenderSphere(x,y,z,0.2,color/255.)
                 RenderBonds(x,y,z,mcsaBonds[ind],0.03,Gr)
-                RenderLabel(x,y,z,name,0.2,Or)
+                RenderLabel(x,y,z,name,0.2,wxOrange,matRot)
         if Backbones:
             for chain in Backbones:
@@ -3778 +3778 @@
         glPopMatrix()
                 
-    def RenderLabel(x,y,z,label):       
+    def RenderLabel(x,y,z,label,matRot):       
         glPushMatrix()
         glTranslate(x,y,z)
         glDisable(GL_LIGHTING)
-        glColor3f(1.0,1.0,1.0)
         glRasterPos3f(0,0,0)
-        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)
+        glMultMatrixf(matRot)
+        glRotate(180,1,0,0)             #fix to flip about x-axis
+        text = gltext.TextElement(text=label,font=Font,foreground=wx.WHITE)
+        text.draw_text(scale=0.025)
         glEnable(GL_LIGHTING)
         glPopMatrix()
@@ -3827 +3824 @@
             RenderSphere(x,y,z,radius,color)
             RenderBonds(x,y,z,Bonds[iat],0.05,color)
-            RenderLabel(x,y,z,'  '+atNames[iat])
+            RenderLabel(x,y,z,'  '+atNames[iat],matRot)
         Page.canvas.SwapBuffers()