Changeset 2135 for trunk/GSASIIplot.py

Timestamp:

Jan 22, 2016 2:38:54 PM (7 years ago)

Author:

vondreele

Message:

more fixes to peak exports to get correct FWHM
refactor Merge GUI

File:

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

trunk/GSASIIplot.py

@@ -771 +771 @@
         for i,ref in enumerate(hklRef):
             h,k,l = ref[:3]
-            X,Y,Z = gluProject(h,k,l,Model,Proj,View)
-            XY = [int(X),int(Y)]
-            if np.allclose(xy,XY,atol=10) and Z < Zmax:
-                Zmax = Z
+            try:
+                X,Y,Z = gluProject(h,k,l,Model,Proj,View)
+                XY = [int(X),int(Y)]
+                if np.allclose(xy,XY,atol=10) and Z < Zmax:
+                    Zmax = Z
+                    return [int(h),int(k),int(l)]
+            except ValueError:
                 return [int(h),int(k),int(l)]
+                
                         
     def SetTranslation(newxy):
@@ -905 +909 @@
         glDisable(GL_COLOR_MATERIAL)
         
-    def RenderUnitVectors(x,y,z):
+    def RenderUnitVectors(x,y,z,labxyz=['','','']):
         xyz = np.array([x,y,z])
         glEnable(GL_COLOR_MATERIAL)
@@ -918 +922 @@
             glVertex3fv(line[1])
         glEnd()
+        glRotate(180,1,0,0)             #fix to flip about x-axis
+        for ix,txt in enumerate(labxyz):
+            if txt:
+                pos = uEdges[ix][1]
+                glTranslate(pos[0],-1.5*pos[1],-pos[2])
+                text = gltext.TextElement(text=txt,font=Font)
+                text.draw_text(scale=0.05)
+                glTranslate(-pos[0],1.5*pos[1],pos[2])
         glPopMatrix()
         glColor4ubv([0,0,0,0])
@@ -984 +996 @@
         else:
             RenderUnitVectors(x,y,z)
-        RenderUnitVectors(0,0,0)
+        RenderUnitVectors(0,0,0,labxyz=['h','k','l'])
         RenderDots(HKL,RC)
         time0 = time.time()