Changeset 789

Timestamp:

Oct 18, 2012 3:27:45 PM (10 years ago)

Author:

vondreele

Message:

different solution to the move atom problem - works better

File:

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

trunk/GSASIIphsGUI.py

@@ -1111 +1111 @@
                         if 'Atoms' in data['Drawing']:
                             DrawAtomsReplaceByID(data['Drawing'],atomData[r],ID)
-                    FillAtomsGrid()
+                    Paint()
                     
         def ChangeAtomCell(event):
@@ -1175 +1175 @@
                 if 'Atoms' in data['Drawing']:
                     DrawAtomsReplaceByID(data['Drawing'],atomData[r],ID)
-                    FindBondsDraw()
+                wx.CallAfter(Paint)
 
         def AtomTypeSelect(event):
@@ -1191 +1191 @@
                 PE.Destroy()
                 SetupGeneral()
-                FillAtomsGrid()
+                Paint()
                 value = Atoms.GetCellValue(r,c)
                 atomData[r][c] = value
@@ -1203 +1203 @@
         def RowSelect(event):
             r,c =  event.GetRow(),event.GetCol()
+            if not event.AltDown():
+                Atoms.frm = -1
+                G2frame.dataFrame.SetStatusText('')                    
             if r < 0 and c < 0:
                 if Atoms.IsSelection():
@@ -1220 +1223 @@
                     for row in range(ibeg,r+1):
                         Atoms.SelectRow(row,True)
+                elif event.AltDown():
+                    if Atoms.frm < 0:           #pick atom to be moved
+                        Atoms.frm = r
+                        Atoms.SelectRow(r,True)
+                        n = colLabels.index('Name')
+                        G2frame.dataFrame.SetStatusText('Atom '+atomData[r][n]+' is to be moved')
+                    else:                       #move it
+                        item = atomData.pop(Atoms.frm)
+                        atomData.insert(r,item)
+                        Atoms.frm = -1
+                        G2frame.dataFrame.SetStatusText('')
+                        Paint()
                 else:
                     Atoms.ClearSelection()
@@ -1239 +1254 @@
                     Atoms.SelectCol(c,True)
                     
-        def OnRowMove(event):
-            frm = event.GetMoveRow()
-            to = event.GetBeforeRow()
-            print frm,to
-            if frm == to:
-                return
-            item = atomData.pop(frm)
-            atomData.insert(to,item)
-            wx.CallAfter(Paint)
-            
         def Paint():
         
@@ -1258 +1263 @@
             atomTable = G2gd.Table(table,rowLabels=rowLabels,colLabels=colLabels,types=Types)
             Atoms.SetTable(atomTable, True)
+            Atoms.frm = -1            
             colType = colLabels.index('Type')
             colSS = colLabels.index('site sym')
@@ -1302 +1308 @@
         Atoms.Bind(wg.EVT_GRID_LABEL_LEFT_CLICK, RowSelect)
         Atoms.Bind(wg.EVT_GRID_LABEL_RIGHT_CLICK, ChangeSelection)
-        wgmove.GridRowMover(Atoms)
-        Atoms.Bind(wgmove.EVT_GRID_ROW_MOVE,OnRowMove)
         Atoms.SetMargins(0,0)
         Paint()