Changeset 1450 for trunk/GSASIIphsGUI.py

Timestamp:

Jul 31, 2014 4:21:22 PM (9 years ago)

Author:

toby

Message:

minor cleanups of Phase GUI

File:

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

trunk/GSASIIphsGUI.py

@@ -94 +94 @@
     '''
 
-#patch
-    if 'RBModels' not in data:
-        data['RBModels'] = {}
-    if 'MCSA' not in data:
-        data['MCSA'] = {'Models':[{'Type':'MD','Coef':[1.0,False,[.8,1.2],],'axis':[0,0,1]}],'Results':[],'AtInfo':{}}
-    if isinstance(data['MCSA']['Results'],dict):
-        data['MCSA']['Results'] = []
-#end patch    
-
-    global rbAtmDict   
-    rbAtmDict = {}
-    if G2frame.dataDisplay:
-        G2frame.dataDisplay.Destroy()
-    PhaseName = G2frame.PatternTree.GetItemText(Item)
-    G2gd.SetDataMenuBar(G2frame)
-    G2frame.dataFrame.SetLabel('Phase Data for '+PhaseName)
-    G2frame.dataFrame.CreateStatusBar()
-    G2frame.dataDisplay = G2gd.GSNoteBook(parent=G2frame.dataFrame,size=G2frame.dataFrame.GetClientSize())
-    G2frame.dataDisplay.gridList = [] # list of all grids in notebook
     # UpdatePhaseData execution continues below
     
@@ -5280 +5261 @@
         
     def ChangePage(page):
+        # development: Log Tab Selection
+        #G2gd.LogTabPress(G2frame,page)
         text = G2frame.dataDisplay.GetPageText(page)
 #        print 'Select',page,text
@@ -5398 +5381 @@
             G2gd.SetDataMenuBar(G2frame)
 
-    # UpdatePhaseData execution continues here
+    # UpdatePhaseData execution starts here
+#patch
+    if 'RBModels' not in data:
+        data['RBModels'] = {}
+    if 'MCSA' not in data:
+        data['MCSA'] = {'Models':[{'Type':'MD','Coef':[1.0,False,[.8,1.2],],'axis':[0,0,1]}],'Results':[],'AtInfo':{}}
+    if isinstance(data['MCSA']['Results'],dict):
+        data['MCSA']['Results'] = []
+#end patch    
+
+    global rbAtmDict   
+    rbAtmDict = {}
+    if G2frame.dataDisplay:
+        G2frame.dataDisplay.Destroy()
+    PhaseName = G2frame.PatternTree.GetItemText(Item)
+    G2gd.SetDataMenuBar(G2frame)
+    G2frame.dataFrame.SetLabel('Phase Data for '+PhaseName)
+    G2frame.dataFrame.CreateStatusBar()
+    G2frame.dataDisplay = G2gd.GSNoteBook(parent=G2frame.dataFrame,size=G2frame.dataFrame.GetClientSize())
+    G2frame.dataDisplay.gridList = [] # list of all grids in notebook
     Pages = []    
     wx.Frame.Unbind(G2frame.dataFrame,wx.EVT_SIZE) # ignore size events during this routine
@@ -5438 +5440 @@
     G2frame.dataFrame.AtomCompute.ISOcalc.Enable('ISODISTORT' in data)
     G2frame.dataDisplay.Bind(wx.aui.EVT_AUINOTEBOOK_PAGE_CHANGED, OnPageChanged)
-    SetupGeneral()    
-    GeneralData = data['General']
-    if oldPage is None:
+    if oldPage is None or oldPage == 0:
         ChangePage(0)
     elif oldPage:
+        SetupGeneral()    # not sure why one might need this when moving from phase to phase; but does not hurt
         G2frame.dataDisplay.SetSelection(oldPage)
-    else:
-        ChangePage(0)