Changeset 4449 for trunk

Timestamp:

May 29, 2020 11:31:32 AM (4 years ago)

Author:

vondreele

Message:

fix atom pick routine in structure drawing

File:

• trunk/GSASIIplot.py (modified) (1 diff)

trunk/GSASIIplot.py

@@ -8190 +8190 @@
         if Add:
             Indx = GetSelectedAtoms()
-        try:
-            if G2frame.phaseDisplay.GetPageText(getSelection()) == 'Map peaks':
-                for i,peak in enumerate(mapPeaks):
-                    x,y,z = peak[1:4]
-                    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)
-        except:
+        if G2frame.phaseDisplay.GetPageText(getSelection()) == 'Map peaks':
+            for i,peak in enumerate(mapPeaks):
+                x,y,z = peak[1:4]
+                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)
+        else:
             cx = drawingData['atomPtrs'][0]
             for i,atom in enumerate(drawAtoms):