Changeset 994

Timestamp:

Jul 17, 2013 9:08:29 AM (9 years ago)

Author:

vondreele

Message:

put back in oldPage stuff inadvertently deleted from GSASIIphsGUI

Location:

trunk

Files:

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

trunk/GSASIIgrid.py

@@ -130 +130 @@
 ] = [wx.NewId() for item in range(1)]
 
-[ wxID_SELECTPHASE,wxID_SELECTPAGE,
-] = [wx.NewId() for item in range(2)]
+[ wxID_SELECTPHASE,
+] = [wx.NewId() for item in range(1)]
 
 [ wxID_PDFCOPYCONTROLS, wxID_PDFSAVECONTROLS, wxID_PDFLOADCONTROLS, 
@@ -2136 +2136 @@
 
     def ChangeSelection(self,page):
-        # in the wx.Notebook ChangeSelection is like SetSelection, but it
+        # in wx.Notebook ChangeSelection is like SetSelection, but it
         # does not invoke the event related to pressing the tab button
         # I don't see a way to do that in aui.

trunk/GSASIIphsGUI.py

@@ -4916 +4916 @@
         '''This is called when an item is selected from the Select page menu
         '''
-        for page in G2frame.dataDisplay.gridList: # clear out all grids, forcing edits in progress to complete
-            page.ClearGrid()
-        wx.Frame.Unbind(G2frame.dataFrame,wx.EVT_SIZE) # ignore size events during this routine
         page = event.GetId()
-#        print 'Select',page
         G2frame.dataDisplay.SetSelection(page)
         
@@ -4931 +4927 @@
         wx.Frame.Unbind(G2frame.dataFrame,wx.EVT_SIZE) # ignore size events during this routine
         page = event.GetSelection()
-#        print 'Tab',page
+        print 'Tab',page
         ChangePage(page)
         
     def ChangePage(page):
         text = G2frame.dataDisplay.GetPageText(page)
-#        print page,text
-        if text == 'Atoms':
+        print page,text
+        if text == 'General':
+            G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.DataGeneral)
+            FillSelectPageMenu(G2frame.dataFrame.DataGeneral)
+            G2frame.dataFrame.Bind(wx.EVT_MENU, OnFourierMaps, id=G2gd.wxID_FOURCALC)
+            G2frame.dataFrame.Bind(wx.EVT_MENU, OnSearchMaps, id=G2gd.wxID_FOURSEARCH)
+            G2frame.dataFrame.Bind(wx.EVT_MENU, OnChargeFlip, id=G2gd.wxID_CHARGEFLIP)
+            G2frame.dataFrame.Bind(wx.EVT_MENU, OnFourClear, id=G2gd.wxID_FOURCLEAR)
+            UpdateGeneral()
+        elif text == 'Data':
+            G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.DataMenu)
+            FillSelectPageMenu(G2frame.dataFrame.DataMenu)
+            G2frame.dataFrame.Bind(wx.EVT_MENU, OnPwdrAdd, id=G2gd.wxID_PWDRADD)
+            G2frame.dataFrame.Bind(wx.EVT_MENU, OnHklfAdd, id=G2gd.wxID_HKLFADD)
+            G2frame.dataFrame.Bind(wx.EVT_MENU, OnDataDelete, id=G2gd.wxID_DATADELETE)
+            G2ddG.UpdateDData(G2frame,DData,data)
+            G2plt.PlotSizeStrainPO(G2frame,data,Start=True)            
+        elif text == 'Atoms':
             G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.AtomsMenu)
             FillSelectPageMenu(G2frame.dataFrame.AtomsMenu)
@@ -4954 +4966 @@
                 G2frame.dataFrame.Bind(wx.EVT_MENU, OnReImport, id=id)                
             FillAtomsGrid(Atoms)
-        elif text == 'General':
-            G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.DataGeneral)
-            FillSelectPageMenu(G2frame.dataFrame.DataGeneral)
-            G2frame.dataFrame.Bind(wx.EVT_MENU, OnFourierMaps, id=G2gd.wxID_FOURCALC)
-            G2frame.dataFrame.Bind(wx.EVT_MENU, OnSearchMaps, id=G2gd.wxID_FOURSEARCH)
-            G2frame.dataFrame.Bind(wx.EVT_MENU, OnChargeFlip, id=G2gd.wxID_CHARGEFLIP)
-            G2frame.dataFrame.Bind(wx.EVT_MENU, OnFourClear, id=G2gd.wxID_FOURCLEAR)
-            UpdateGeneral()
-        elif text == 'Data':
-            G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.DataMenu)
-            FillSelectPageMenu(G2frame.dataFrame.DataMenu)
-            G2frame.dataFrame.Bind(wx.EVT_MENU, OnPwdrAdd, id=G2gd.wxID_PWDRADD)
-            G2frame.dataFrame.Bind(wx.EVT_MENU, OnHklfAdd, id=G2gd.wxID_HKLFADD)
-            G2frame.dataFrame.Bind(wx.EVT_MENU, OnDataDelete, id=G2gd.wxID_DATADELETE)
-            G2ddG.UpdateDData(G2frame,DData,data)
-            G2plt.PlotSizeStrainPO(G2frame,data,Start=True)
         elif text == 'Draw Options':
             G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.DataDrawOptions)
@@ -5007 +5003 @@
             G2frame.dataFrame.Bind(wx.EVT_MENU, OnRBRemoveAll, id=G2gd.wxID_RBREMOVEALL)
             FillRigidBodyGrid()
-        elif text == 'Pawley reflections':
-            G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.PawleyMenu)
-            FillSelectPageMenu(G2frame.dataFrame.PawleyMenu)
-            G2frame.dataFrame.Bind(wx.EVT_MENU, OnPawleyLoad, id=G2gd.wxID_PAWLEYLOAD)
-            G2frame.dataFrame.Bind(wx.EVT_MENU, OnPawleyEstimate, id=G2gd.wxID_PAWLEYESTIMATE)
-            G2frame.dataFrame.Bind(wx.EVT_MENU, OnPawleyUpdate, id=G2gd.wxID_PAWLEYUPDATE)
-            G2frame.dataFrame.Bind(wx.EVT_MENU, OnPawleyDelete, id=G2gd.wxID_PAWLEYDELETE)            
-            FillPawleyReflectionsGrid()
         elif text == 'Map peaks':
             G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.MapPeaksMenu)
@@ -5046 +5034 @@
             UpdateTexture()                        
             G2plt.PlotTexture(G2frame,data,Start=True)            
+        elif text == 'Pawley reflections':
+            G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.PawleyMenu)
+            FillSelectPageMenu(G2frame.dataFrame.PawleyMenu)
+            G2frame.dataFrame.Bind(wx.EVT_MENU, OnPawleyLoad, id=G2gd.wxID_PAWLEYLOAD)
+            G2frame.dataFrame.Bind(wx.EVT_MENU, OnPawleyEstimate, id=G2gd.wxID_PAWLEYESTIMATE)
+            G2frame.dataFrame.Bind(wx.EVT_MENU, OnPawleyUpdate, id=G2gd.wxID_PAWLEYUPDATE)
+            G2frame.dataFrame.Bind(wx.EVT_MENU, OnPawleyDelete, id=G2gd.wxID_PAWLEYDELETE)            
+            FillPawleyReflectionsGrid()
         else:
             G2gd.SetDataMenuBar(G2frame)
@@ -5088 +5084 @@
     G2frame.dataDisplay.Bind(wx.aui.EVT_AUINOTEBOOK_PAGE_CHANGED, OnPageChanged)
     SetupGeneral()    
-    GeneralData = data['General']    
-    ChangePage(0)
+    GeneralData = data['General']
+    print 'oldPage',oldPage    
+    if oldPage is None:
+        UpdateGeneral()
+    elif oldPage:
+        G2frame.dataDisplay.SetSelection(oldPage)
+    else:
+        UpdateGeneral()