Changeset 2655 for trunk

Timestamp:

Jan 22, 2017 2:35:40 PM (8 years ago)

Author:

toby

Message:

Close out grids before deleting in G2gr.SelectDataTreeItem?; save pointer to grid in G2frame.dataFrame.currentGrid (special handling for Phase tabs in OnPageChanged?); use CallAfter? for SelectDataTreeItem?; fix problem when phs Paint gets called after grid is deleted

Location:

trunk

Files:

• GSASII.py (modified) (1 diff)
• GSASIIctrls.py (modified) (1 diff)
• GSASIIgrid.py (modified) (3 diffs)
• GSASIIphsGUI.py (modified) (7 diffs)

trunk/GSASII.py ¶

@@ -2495 +2495 @@
                 self.G2plotNB.nb.GetPage(pltNum)
             item = event.GetItem()
-            wx.Yield()
-            G2gd.SelectDataTreeItem(self,item)
+            wx.CallAfter(G2gd.SelectDataTreeItem,self,item)
             if self.oldFocus: # Why do this?
                 self.oldFocus.SetFocus()

trunk/GSASIIctrls.py ¶

@@ -2738 +2738 @@
     '''
     def __init__(self, parent, name=''):
-        wg.Grid.__init__(self,parent,-1,name=name)                    
-        #self.SetSize(parent.GetClientSize())
-        # above removed to speed drawing of initial grid
-        # does not appear to be needed
+        wg.Grid.__init__(self,parent,-1,name=name)
+        parent.TopLevelParent.currentGrid = self      # save a reference to the grid in the Frame
             
     def Clear(self):

trunk/GSASIIgrid.py ¶

@@ -4423 +4423 @@
     Also Called in GSASIIphsGUI.UpdatePhaseData by OnTransform callback. 
     '''
-    if G2frame.PickIdText == G2frame.GetTreeItemsList(item):
+    if G2frame.PickIdText == G2frame.GetTreeItemsList(item): # don't redo the current data tree item 
         return
-    wx.Yield()
     oldPage = None # will be set later if already on a Phase item
     if G2frame.dataFrame:
-        SetDataMenuBar(G2frame)
-        # save comments or notebook contents before clearing the window contents
-        if G2frame.dataFrame.GetLabel() == 'Comments':
+        # save or finish processing of outstanding events
+        if G2frame.dataFrame.currentGrid:  # complete any open wx.Grid edits
+            if G2frame.dataFrame.currentGrid.IsCellEditControlEnabled(): # complete any grid edits in progress
+                if GSASIIpath.GetConfigValue('debug'): print 'Completing grid edit in',G2frame.dataFrame.currentGrid
+                G2frame.dataFrame.currentGrid.HideCellEditControl()
+                G2frame.dataFrame.currentGrid.DisableCellEditControl()
+        if G2frame.dataFrame.GetLabel() == 'Comments': # save any recently entered comments 
             try:
                 data = [G2frame.dataDisplay.GetValue()]
@@ -4438 +4441 @@
             except:     #clumsy but avoids dead window problem when opening another project
                 pass
-        elif G2frame.dataFrame.GetLabel() == 'Notebook':
+        elif G2frame.dataFrame.GetLabel() == 'Notebook': # save any recent notebook entries
             try:
                 data = [G2frame.dataDisplay.GetValue()]
@@ -4456 +4459 @@
         G2frame.dataFrame.PhaseUserSize = None
         
+    SetDataMenuBar(G2frame)
     G2frame.dataFrame.Raise()            
+    G2frame.dataFrame.currentGrid = None # this will be a pointer to a grid placed in the frame
     G2frame.PickId = item
     G2frame.PickIdText = None

trunk/GSASIIphsGUI.py ¶

@@ -150 +150 @@
     Called only from :meth:`GSASIIgrid.SelectDataTreeItem`,
     which in turn is called from :meth:`GSASII.GSASII.OnDataTreeSelChanged`
-    when a Phase tree item is selected.
+    when a Phase tree item is selected. This creates all tabs on the page and fills
+    their contents. Routine OnPageChanged is called each time a tab is pressed
+    and updates the contents of the tab's page.
 
     :param wx.frame G2frame: the main GSAS-II frame object
@@ -1694 +1696 @@
                 rowLabels.append(str(i))
             atomTable = G2G.Table(table,rowLabels=rowLabels,colLabels=colLabels,types=Types)
-            Atoms.SetTable(atomTable, True)
+            try:
+                Atoms.SetTable(atomTable, True)    # Paint may be called after the Grid has been deleted
+            except:
+                return
             Atoms.frm = -1            
             colType = colLabels.index('Type')
@@ -7912 +7917 @@
         text = G2frame.dataDisplay.GetPageText(page)
         G2frame.dataDisplayPhaseText = text
-        G2frame.dataFrame.helpKey = text # BHT: use name of Phase tab for help lookup
+        G2frame.dataFrame.helpKey = text # use name of Phase tab for help lookup
+        G2frame.dataFrame.currentGrid = None
         if text == 'General':
             G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.DataGeneral)
@@ -7923 +7929 @@
             G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.AtomsMenu)
             FillAtomsGrid(Atoms)
+            G2frame.dataFrame.currentGrid = Atoms
         elif text == 'Layers':
             G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.LayerData)
@@ -7937 +7944 @@
             G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.DrawAtomsMenu)
             UpdateDrawAtoms()
+            G2frame.dataFrame.currentGrid = drawAtoms
             wx.CallAfter(G2plt.PlotStructure,G2frame,data,firstCall=True)
         elif text == 'RB Models':
@@ -7944 +7952 @@
             G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.MapPeaksMenu)
             FillMapPeaksGrid()
+            G2frame.dataFrame.currentGrid = MapPeaks
             wx.CallAfter(G2plt.PlotStructure,G2frame,data,firstCall=True)
         elif text == 'MC/SA':
@@ -7956 +7965 @@
             G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.PawleyMenu)
             FillPawleyReflectionsGrid()
+            G2frame.dataFrame.currentGrid = G2frame.PawleyRefl
         else:
             G2gd.SetDataMenuBar(G2frame)