Changeset 1787 for trunk/GSASIIplot.py


Ignore:
Timestamp:
Apr 13, 2015 12:59:34 PM (7 years ago)
Author:
vondreele
Message:

remove user reject HKL selection from Reflection List
implement rule bases user reject for HKLF reflections in Controls
user rejection changes mul to -mul; reflection list shows this in red
implement tool tip on 3Dhkl plots showing hkl indices on each point encountered

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIplot.py

    r1786 r1787  
    703703        Model = glGetDoublev(GL_MODELVIEW_MATRIX)
    704704        Zmax = 1.
     705        xy = [int(xy[0]),int(View[3]-xy[1])]
    705706        for i,ref in enumerate(hklRef):
    706             h,k,l = ref[1:4]
     707            h,k,l = ref[:3]
    707708            X,Y,Z = gluProject(h,k,l,Model,Proj,View)
    708709            XY = [int(X),int(Y)]
    709             print xy,XY
    710             if np.allclose(xy,XY,atol=10):
     710            if np.allclose(xy,XY,atol=10) and Z < Zmax:
    711711                Zmax = Z
    712                 return [h,k,l]
     712                return [int(h),int(k),int(l)]
    713713                       
    714714    def SetTranslation(newxy):
     
    795795                Q = drawingData['Quaternion']
    796796            Draw('move')
    797 #        else:
    798 #            hkl = GetTruePosition(newxy)
     797        else:
     798            hkl = GetTruePosition(newxy)
     799            if hkl:
     800                h,k,l = hkl
     801                Page.canvas.SetToolTipString('%d %d %d'%(h,k,l))
     802                G2frame.G2plotNB.status.SetStatusText('hkl = %d %d %d'%(h,k,l),1)
    799803       
    800804    def OnMouseWheel(event):
Note: See TracChangeset for help on using the changeset viewer.