Changeset 4465 for trunk

Timestamp:

Jun 5, 2020 10:26:26 AM (2 years ago)

Author:

vondreele

Message:

fix atom selection from figure for Atoms - now it the same as for Draw Atoms & Map peaks. Left mouse button selects atom, RB adds to selection.

File:

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

trunk/GSASIIplot.py

@@ -8191 +8191 @@
             Indx = GetSelectedAtoms()
         if G2frame.phaseDisplay.GetPageText(getSelection()) == 'Map peaks':
-            for i,peak in enumerate(mapPeaks):
+            for i,peak in enumerate(atomList):
                 x,y,z = peak[1:4]
                 X,Y,Z = GLU.gluProject(x,y,z,Model,Proj,View)
@@ -8204 +8204 @@
                     except:
                         SetSelectedAtoms(i,Add)
+            return
+        elif G2frame.phaseDisplay.GetPageText(getSelection()) == 'Draw Atoms':
+            atomList = drawAtoms
+            cx = G2phG.getAtomPtrs(data,True)[0]
         else:
-            cx = drawingData['atomPtrs'][0]
-            for i,atom in enumerate(drawAtoms):
-                x,y,z = atom[cx:cx+3]
-                X,Y,Z = GLU.gluProject(x,y,z,Model,Proj,View)
-                XY = [int(X),int(View[3]-Y)]
-                if np.allclose(xy,XY,atol=10) and Z < Zmax:
-                    Zmax = Z
-                    try:
-                        Indx.remove(i)
-                        ClearSelectedAtoms()
-                        for Id in Indx:
-                            SetSelectedAtoms(Id,Add)
-                    except:
-                        SetSelectedAtoms(i,Add)
+            atomList = data['Atoms']
+            cx = G2phG.getAtomPtrs(data)[0]
+        for i,atom in enumerate(atomList):
+            x,y,z = atom[cx:cx+3]
+            X,Y,Z = GLU.gluProject(x,y,z,Model,Proj,View)
+            XY = [int(X),int(View[3]-Y)]
+            if np.allclose(xy,XY,atol=10) and Z < Zmax:
+                Zmax = Z
+                try:
+                    Indx.remove(i)
+                    ClearSelectedAtoms()
+                    for Id in Indx:
+                        SetSelectedAtoms(Id,Add)
+                except:
+                    SetSelectedAtoms(i,Add)
                                        
     def OnMouseDown(event):
@@ -8391 +8396 @@
                 for i,atom in enumerate(atomData):
                     if atom[-1] == Id:
-                        G2frame.phaseDisplay.GetPage(page).SelectRow(i)      #this is the Atoms grid in Atoms
+                        G2frame.phaseDisplay.GetPage(page).SelectRow(i,Add)      #this is the Atoms grid in Atoms
                   
     def GetSelectedAtoms():