Changeset 2476 for trunk/GSASIIplot.py

Timestamp:

Sep 22, 2016 11:42:28 AM (6 years ago)

Author:

vondreele

Message:

Add new feature to structure plots - display an hkl plane or stack of planes with a phase offset.
fix lighting issues for planes/polygons

File:

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

trunk/GSASIIplot.py

@@ -4749 +4749 @@
 def PlotStructure(G2frame,data,firstCall=False):
     '''Crystal structure plotting package. Can show structures as balls, sticks, lines,
-    thermal motion ellipsoids and polyhedra
+    thermal motion ellipsoids and polyhedra. Magnetic moments shown as black/red 
+    arrows according to spin state
     '''
 
@@ -5211 +5212 @@
         glEnable(GL_LIGHT0)
         glLightModeli(GL_LIGHT_MODEL_TWO_SIDE,0)
-        glLightfv(GL_LIGHT0,GL_AMBIENT,[.5,.5,.5,1])
+        glLightfv(GL_LIGHT0,GL_AMBIENT,[.8,.8,.8,1])
         glLightfv(GL_LIGHT0,GL_DIFFUSE,[.8,.8,.8,1])
-        glLightfv(GL_LIGHT0,GL_SPECULAR,[1,1,1,1])
+#        glLightfv(GL_LIGHT0,GL_SPECULAR,[1,1,1,1])
+#        glLightfv(GL_LIGHT0,GL_POSITION,[0,0,1,1])
         
     def GetRoll(newxy,rhoshape):
@@ -5404 +5406 @@
         glColor4ubv([0,0,0,0])
         glDisable(GL_COLOR_MATERIAL)
+        
+    def RenderPlane(plane,color):
+        fade = list(color) + [.25,]
+        glMaterialfv(GL_FRONT_AND_BACK,GL_AMBIENT_AND_DIFFUSE,fade)
+        glShadeModel(GL_FLAT)
+        glEnable(GL_BLEND)
+        glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA)
+        glPushMatrix()
+        glShadeModel(GL_SMOOTH)
+        glPolygonMode(GL_FRONT_AND_BACK,GL_FILL)
+        glFrontFace(GL_CW)
+        glBegin(GL_TRIANGLE_FAN)
+        for vertex in plane:
+            glVertex3fv(vertex)
+        glEnd()
+        glPopMatrix()
+        glDisable(GL_BLEND)
+        glShadeModel(GL_SMOOTH)
                 
     def RenderSphere(x,y,z,radius,color):
@@ -5518 +5538 @@
         glPushMatrix()
         glTranslate(x,y,z)
-        glMaterialfv(GL_FRONT_AND_BACK,GL_DIFFUSE,color)
+        glMaterialfv(GL_FRONT_AND_BACK,GL_AMBIENT_AND_DIFFUSE,color)
         glShadeModel(GL_SMOOTH)
         glMultMatrixf(B4mat.T)
@@ -5599 +5619 @@
 #useful debug?        
 #        if caller:
-#            print caller
+#            print caller,generalData['Name']
 # end of useful debug
         mapData = generalData['Map']
@@ -5666 +5686 @@
         glMultMatrixf(A4mat.T)
         glTranslate(-Tx,-Ty,-Tz)
-        if drawingData['unitCellBox']:
-            RenderBox()
         if drawingData['showABC']:
             x,y,z = drawingData['viewPoint'][0]
@@ -5820 +5838 @@
                 Backbone = Backbones[chain]
                 RenderBackbone(Backbone,BackboneColor,bondR)
+        if drawingData['unitCellBox']:
+            RenderBox()
+            if drawingData['Plane'][1]:
+                H,phase,stack,phase,color = drawingData['Plane']
+                Planes = G2lat.PlaneIntercepts(Amat,Bmat,H,phase,stack)
+                for plane in Planes:
+                    RenderPlane(plane,color)
 #        print time.time()-time0
         try: