Changeset 2657

Timestamp:

Jan 22, 2017 5:00:14 PM (5 years ago)

Author:

toby

Message:

deal with dead grids

Location:

trunk

Files:

• GSASIIgrid.py (modified) (2 diffs)
• GSASIIpwdGUI.py (modified) (6 diffs)

trunk/GSASIIgrid.py

@@ -4011 +4011 @@
     depVarDict.update({var:val for var,val in data[name].get('newCellDict',{}).values()})
 
+    G2frame.dataFrame.currentGrids = []
     G2frame.dataDisplay = G2G.GSGrid(parent=G2frame.dataFrame)
     G2frame.SeqTable = G2G.Table(
@@ -4429 +4430 @@
         # save or finish processing of outstanding events
         for grid in G2frame.dataFrame.currentGrids:  # complete any open wx.Grid edits
-            if grid.IsCellEditControlEnabled(): # complete any grid edits in progress
-                if GSASIIpath.GetConfigValue('debug'): print 'Completing grid edit in',grid
-                grid.HideCellEditControl()
-                grid.DisableCellEditControl()
+            #if GSASIIpath.GetConfigValue('debug'): print 'Testing grid edit in',grid
+            try: 
+                if grid.IsCellEditControlEnabled(): # complete any grid edits in progress
+                    if GSASIIpath.GetConfigValue('debug'): print 'Completing grid edit in',grid
+                    grid.HideCellEditControl()
+                    grid.DisableCellEditControl()
+            except:
+                pass
         if G2frame.dataFrame.GetLabel() == 'Comments': # save any recently entered comments 
             try:

trunk/GSASIIpwdGUI.py

@@ -879 +879 @@
     G2frame.PeakTable = G2G.Table(data['peaks'],rowLabels=rowLabels,colLabels=colLabels,types=Types)
     G2frame.dataFrame.SetLabel('Peak List')
+    G2frame.dataFrame.currentGrids = []
     G2frame.dataDisplay = G2G.GSGrid(parent=G2frame.dataFrame)
     G2frame.dataDisplay.SetTable(G2frame.PeakTable, True)
@@ -904 +905 @@
     if 'nPeaks' not in data[1]:
         data[1].update({'nPeaks':0,'peaksList':[]})
+    G2frame.dataFrame.currentGrids = []
     
     def OnBackFlagCopy(event):
@@ -1239 +1241 @@
         topSizer.Add((5,0),0)
         peaksSizer.Add(topSizer)
+        G2frame.dataFrame.currentGrids = []
         if data[1]['nPeaks']:
             peaksSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,' Peak list:'),0,WACV)       
@@ -2621 +2624 @@
     G2frame.IndexPeaksTable = G2G.Table(data[0],rowLabels=rowLabels,colLabels=colLabels,types=Types)
     G2frame.dataFrame.SetLabel('Index Peak List')
+    G2frame.dataFrame.currentGrids = []
     G2frame.dataDisplay = G2G.GSGrid(parent=G2frame.dataFrame)                
     G2frame.dataDisplay.SetTable(G2frame.IndexPeaksTable, True)
@@ -3300 +3304 @@
         mainSizer.Add(ssSizer,0)
 
+    G2frame.dataFrame.currentGrids = []
     if cells:
         mainSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label='\n Indexing Result:'),0,WACV)
@@ -3587 +3592 @@
     G2frame.dataDisplay = G2G.GSNoteBook(parent=G2frame.dataFrame,size=G2frame.dataFrame.GetClientSize())
     G2frame.refTable = {}
+    G2frame.dataFrame.currentGrids = []
     for tabnum,phase in enumerate(phases):
         if len(data[phase]):