Changeset 2657
- Timestamp:
- Jan 22, 2017 5:00:14 PM (6 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIgrid.py
r2656 r2657 4011 4011 depVarDict.update({var:val for var,val in data[name].get('newCellDict',{}).values()}) 4012 4012 4013 G2frame.dataFrame.currentGrids = [] 4013 4014 G2frame.dataDisplay = G2G.GSGrid(parent=G2frame.dataFrame) 4014 4015 G2frame.SeqTable = G2G.Table( … … 4429 4430 # save or finish processing of outstanding events 4430 4431 for grid in G2frame.dataFrame.currentGrids: # complete any open wx.Grid edits 4431 if grid.IsCellEditControlEnabled(): # complete any grid edits in progress 4432 if GSASIIpath.GetConfigValue('debug'): print 'Completing grid edit in',grid 4433 grid.HideCellEditControl() 4434 grid.DisableCellEditControl() 4432 #if GSASIIpath.GetConfigValue('debug'): print 'Testing grid edit in',grid 4433 try: 4434 if grid.IsCellEditControlEnabled(): # complete any grid edits in progress 4435 if GSASIIpath.GetConfigValue('debug'): print 'Completing grid edit in',grid 4436 grid.HideCellEditControl() 4437 grid.DisableCellEditControl() 4438 except: 4439 pass 4435 4440 if G2frame.dataFrame.GetLabel() == 'Comments': # save any recently entered comments 4436 4441 try: -
trunk/GSASIIpwdGUI.py
r2654 r2657 879 879 G2frame.PeakTable = G2G.Table(data['peaks'],rowLabels=rowLabels,colLabels=colLabels,types=Types) 880 880 G2frame.dataFrame.SetLabel('Peak List') 881 G2frame.dataFrame.currentGrids = [] 881 882 G2frame.dataDisplay = G2G.GSGrid(parent=G2frame.dataFrame) 882 883 G2frame.dataDisplay.SetTable(G2frame.PeakTable, True) … … 904 905 if 'nPeaks' not in data[1]: 905 906 data[1].update({'nPeaks':0,'peaksList':[]}) 907 G2frame.dataFrame.currentGrids = [] 906 908 907 909 def OnBackFlagCopy(event): … … 1239 1241 topSizer.Add((5,0),0) 1240 1242 peaksSizer.Add(topSizer) 1243 G2frame.dataFrame.currentGrids = [] 1241 1244 if data[1]['nPeaks']: 1242 1245 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) 2622 2625 G2frame.dataFrame.SetLabel('Index Peak List') 2626 G2frame.dataFrame.currentGrids = [] 2623 2627 G2frame.dataDisplay = G2G.GSGrid(parent=G2frame.dataFrame) 2624 2628 G2frame.dataDisplay.SetTable(G2frame.IndexPeaksTable, True) … … 3300 3304 mainSizer.Add(ssSizer,0) 3301 3305 3306 G2frame.dataFrame.currentGrids = [] 3302 3307 if cells: 3303 3308 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()) 3588 3593 G2frame.refTable = {} 3594 G2frame.dataFrame.currentGrids = [] 3589 3595 for tabnum,phase in enumerate(phases): 3590 3596 if len(data[phase]):
Note: See TracChangeset
for help on using the changeset viewer.