Changeset 4486

Timestamp:

Jun 13, 2020 1:50:27 PM (3 years ago)

Author:

vondreele

Message:

fix status bar atom label problem when picking atoms from drawing

File:

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

trunk/GSASIIplot.py

@@ -8219 +8219 @@
         elif G2frame.phaseDisplay.GetPageText(getSelection()) == 'Draw Atoms':
             atomList = drawAtoms
-            cx = G2phG.getAtomPtrs(data,True)[0]
-            sympt = cx+3
+            cx,ct,cs,cia = G2phG.getAtomPtrs(data,True)
+            cs -= 1  #cs points at style for drawings; want sytsym         
         else:
             atomList = data['Atoms']
-            cx = G2phG.getAtomPtrs(data)[0]
-            sympt = None
+            cx,ct,cs,ciax = G2phG.getAtomPtrs(data)
         for i,atom in enumerate(atomList):
             x,y,z = atom[cx:cx+3]
@@ -8238 +8237 @@
                 except:
                     SetSelectedAtoms(i,Add)
-                    lbl = atom[0]
-                    if sympt:
-                        lbl += ' ' + atom[sympt]
+                    if ct > 1:   # macromolecule
+                        lbl = '%s %s'%(atom[0],atom[3])
+                    else:
+                        lbl = atom[ct-1]
+                    lbl += ' ' + atom[cs]
                     G2frame.G2plotNB.status.SetStatusText(
                             '    Selected atom: {}'.format(lbl),1)