Changeset 2241 for trunk/GSASIIplot.py

Timestamp:

May 6, 2016 9:23:26 AM (7 years ago)

Author:

vondreele

Message:

draw unit cell box for stacking fault drawings & change atom/bond diameters

File:

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

trunk/GSASIIplot.py

@@ -6034 +6034 @@
     Gr = np.array([0,255,0])
     Bl = np.array([0,0,255])
-    uBox = np.array([[0,0,0],[1,0,0],[0,1,0],[0,0,1]])
-    uEdges = np.array([[uBox[0],uBox[1]],[uBox[0],uBox[2]],[uBox[0],uBox[3]]])
-    uColors = [Rd,Gr,Bl]
+    Bc = np.array([0,0,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([
+        [uBox[0],uBox[1]],[uBox[0],uBox[3]],[uBox[0],uBox[4]],[uBox[1],uBox[2]], 
+        [uBox[2],uBox[3]],[uBox[1],uBox[5]],[uBox[2],uBox[6]],[uBox[3],uBox[7]], 
+        [uBox[4],uBox[5]],[uBox[5],uBox[6]],[uBox[6],uBox[7]],[uBox[7],uBox[4]]])
+    uColors = [Rd,Gr,Bl,Wt-Bc, Wt-Bc,Wt-Bc,Wt-Bc,Wt-Bc, Wt-Bc,Wt-Bc,Wt-Bc,Wt-Bc]
     AtInfo = Layers['AtInfo']
     Names = [layer['Name'] for layer in Layers['Layers']]
@@ -6223 +6227 @@
         for line,color in zip(uEdges,uColors):
             glColor3ubv(color)
-            glVertex3fv([0,0,0])
-#            glVertex3fv(-line[1])
+            glVertex3fv(line[0])
             glVertex3fv(line[1])
         glEnd()
@@ -6302 +6305 @@
         glTranslate(-Tx,-Ty,-Tz)
         RenderUnitVectors(0.,0.,0.)
-        radius = 0.2
+        radius = 0.5
+        glShadeModel(GL_SMOOTH)
         for iat,atom in enumerate(XYZ):
             x,y,z = atom
@@ -6308 +6312 @@
             color = np.array(CL)/255.
             RenderSphere(x,y,z,radius,color)
-            RenderBonds(x,y,z,Bonds[iat],0.05,color)
+            RenderBonds(x,y,z,Bonds[iat],0.10,color)
             if Page.labels:
                 RenderLabel(x,y,z,'  '+AtNames[iat],matRot)