Changeset 4551

Timestamp:

Aug 20, 2020 4:24:29 PM (3 years ago)

Author:

toby

Message:

fix name wipe out bug

Location:

trunk

Files:

• GSASIIphsGUI.py (modified) (2 diffs)
• GSASIIscriptable.py (modified) (1 diff)

trunk/GSASIIphsGUI.py

@@ -3257 +3257 @@
                             choice.append(str(atomData[r][c]))
                     choice.sort()
-                    dlg = wx.SingleChoiceDialog(G2frame,'Select','Name',choice)
+                    dlg = wx.SingleChoiceDialog(G2frame,'Select atom(s) by name',
+                                            'Name Selection',choice)
                     if dlg.ShowModal() == wx.ID_OK:
                         sel = dlg.GetSelection()
@@ -3266 +3267 @@
                             if parms == atomData[row][c]:
                                 Atoms.SelectRow(row,True)
-                    dlg.Destroy()
+                        dlg.Destroy()
+                    else:
+                        dlg.Destroy()
+                        return
                 elif Atoms.GetColLabelValue(c) == 'residue':
                     choice = []

trunk/GSASIIscriptable.py

@@ -3352 +3352 @@
         elif control == 'Reverse Seq':
             return self.data['Controls']['data']['Reverse Seq']
+        elif control == 'seqCopy':
+            return self.data['Controls']['data']['Copy2Next']
         elif control in self.data['Controls']['data']:
             return self.data['Controls']['data'][control]
-        elif control == 'seqCopy':
-            return self.data['Controls']['data']['Copy2Next']
         else:
             G2fil.G2Print('Defined Controls:',self.data['Controls']['data'].keys())