Changeset 935 for trunk/GSASIIplot.py

Timestamp:

May 29, 2013 9:31:23 AM (10 years ago)

Author:

vondreele

Message:

improve label plotting - now a fixed offset from atom in drawing plane
improve plot performance change glShadeModel to GL_FLAT while plotting density map points, & bond lines, etc.

File:

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

trunk/GSASIIplot.py

@@ -3193 +3193 @@
                 
     def RenderLines(x,y,z,Bonds,color):
+        glShadeModel(GL_FLAT)
         xyz = np.array([x,y,z])
         glEnable(GL_COLOR_MATERIAL)
@@ -3206 +3207 @@
         glPopMatrix()
         glDisable(GL_COLOR_MATERIAL)
+        glShadeModel(GL_SMOOTH)
         
     def RenderPolyhedra(x,y,z,Faces,color):
@@ -3224 +3226 @@
 
     def RenderMapPeak(x,y,z,color,den):
+        glShadeModel(GL_FLAT)
         xyz = np.array([x,y,z])
         glEnable(GL_COLOR_MATERIAL)
@@ -3237 +3240 @@
         glPopMatrix()
         glDisable(GL_COLOR_MATERIAL)
+        glShadeModel(GL_SMOOTH)
         
     def RenderBackbone(Backbone,BackboneColor,radius):
@@ -3254 +3258 @@
         glDisable(GL_LIGHTING)
         glColor3fv(color)
-        glRasterPos3f(r,r,r)
+        glRasterPos3f(0,0,0)
         for c in list(label):
             glutBitmapCharacter(GLUT_BITMAP_8_BY_13,ord(c))
@@ -3261 +3265 @@
         
     def RenderMap(rho,rhoXYZ,indx,Rok):
+        glShadeModel(GL_FLAT)
         cLevel = drawingData['contourLevel']
         XYZ = []
@@ -3278 +3283 @@
                     RC.append([0.1*alpha,Gr])
         RenderDots(XYZ,RC)
+        glShadeModel(GL_SMOOTH)
                             
     def Draw(caller=''):
@@ -3433 +3439 @@
                     
             if atom[cs+1] == 'type':
-                RenderLabel(x,y,z,atom[ct],radius,Gr)
+                RenderLabel(x,y,z,'  '+atom[ct],radius,Gr)
             elif atom[cs+1] == 'name':
-                RenderLabel(x,y,z,atom[ct-1],radius,Gr)
+                RenderLabel(x,y,z,'  '+atom[ct-1],radius,Gr)
             elif atom[cs+1] == 'number':
-                RenderLabel(x,y,z,str(iat),radius,Gr)
+                RenderLabel(x,y,z,'  '+str(iat),radius,Gr)
             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,Gr)
             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,Gr)
             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,Gr)
 #        glDisable(GL_BLEND)
         if len(rhoXYZ):
@@ -3462 +3468 @@
             for ind,[x,y,z] in enumerate(XYZ):
                 aType = testRBObj['rbAtTypes'][ind]
-                name = aType+str(ind)
+                name = '  '+aType+str(ind)
                 color = np.array(testRBObj['AtInfo'][aType][1])
                 RenderSphere(x,y,z,0.2,color/255.)
@@ -3473 +3479 @@
             for ind,[x,y,z] in enumerate(XYZ):
                 aType = atTypes[ind]
-                name = aType+str(ind)
+                name = '  '+aType+str(ind)
                 color = np.array(MCSA['AtInfo'][aType][1])
                 RenderSphere(x,y,z,0.2,color/255.)
@@ -3729 +3735 @@
         glPopMatrix()
                 
-    def RenderLabel(x,y,z,label,r):       
+    def RenderLabel(x,y,z,label):       
         glPushMatrix()
         glTranslate(x,y,z)
         glDisable(GL_LIGHTING)
         glColor3f(1.0,1.0,1.0)
-        glRasterPos3f(r,r,r)
+        glRasterPos3f(0,0,0)
         for c in list(label):
             glutBitmapCharacter(GLUT_BITMAP_8_BY_13,ord(c))
@@ -3774 +3780 @@
             RenderSphere(x,y,z,radius,color)
             RenderBonds(x,y,z,Bonds[iat],0.05,color)
-            RenderLabel(x,y,z,atNames[iat],radius)
+            RenderLabel(x,y,z,'  '+atNames[iat])
         Page.canvas.SwapBuffers()