Changeset 750 for trunk/GSASIIphsGUI.py

Timestamp:

Sep 5, 2012 10:43:15 AM (10 years ago)

Author:

vondreele

Message:

put inverse checker back in SearchMap?
add atom rename facility
update of Map peaks when map/peaks are shifted by U/D/L/R key commands

File:

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

trunk/GSASIIphsGUI.py

@@ -1388 +1388 @@
             generalData = data['General']
             colLabels = [Atoms.GetColLabelValue(c) for c in range(Atoms.GetNumberCols())]
-            choices = ['Type','x','y','z','frac','I/A','Uiso']
+            choices = ['Type','Name','x','y','z','frac','I/A','Uiso']
             dlg = wx.SingleChoiceDialog(G2frame,'Select','Atom parameter',choices)
             if dlg.ShowModal() == wx.ID_OK:
@@ -1413 +1413 @@
                     FillAtomsGrid()
                 dlg.Destroy()
+            elif parm in ['Name',]:
+                dlg = wx.MessageDialog(G2frame,'Do you really want to rename the selected atoms?','Rename', 
+                    wx.YES_NO | wx.ICON_QUESTION)
+                try:
+                    result = dlg.ShowModal()
+                    if result == wx.ID_YES:
+                        for r in indx:
+                            El = atomData[r][cid+1]
+                            if len(El) in [2,4]:
+                                atomData[r][cid] = El[:2]+'(%d)'%(r+1)
+                            else:
+                                atomData[r][cid] = El[:1]+'(%d)'%(r+1)
+                    FillAtomsGrid()
+                finally:
+                    dlg.Destroy()
+                    
             elif parm in ['I/A']:
                 choices = ['Isotropic','Anisotropic']
@@ -3966 +3982 @@
             colLabels = ['mag','x','y','z','dzero']
             Types = 5*[wg.GRID_VALUE_FLOAT+':10,4',]
-            MapPeaksTable = G2gd.Table(mapPeaks,rowLabels=rowLabels,colLabels=colLabels,types=Types)
-            MapPeaks.SetTable(MapPeaksTable, True)
+            G2frame.MapPeaksTable = G2gd.Table(mapPeaks,rowLabels=rowLabels,colLabels=colLabels,types=Types)
+            MapPeaks.SetTable(G2frame.MapPeaksTable, True)
             MapPeaks.Bind(wg.EVT_GRID_LABEL_LEFT_CLICK, RowSelect)
             for r in range(MapPeaks.GetNumberRows()):