Changeset 2622 for trunk/GSASIIphsGUI.py

Timestamp:

Jan 11, 2017 2:42:15 PM (6 years ago)

Author:

vondreele

Message:

avoid undefined G2frame.dataFrame bug
comment out two save size prints
remove extra SetSize? calls from G2imgGUI & G2pwdGUI

File:

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

trunk/GSASIIphsGUI.py

@@ -1765 +1765 @@
                             Atoms.SetCellStyle(row,c,VERY_LIGHT_GREY,True)
             Atoms.AutoSizeColumns(False)
+            G2frame.dataFrame.setSizePosLeft([700,300])
 
         # FillAtomsGrid executable code starts here
@@ -1832 +1833 @@
         Atoms.SetMargins(0,0)
         
-        G2frame.dataFrame.setSizePosLeft([700,300])
+#        G2frame.dataFrame.setSizePosLeft([700,300])
         Paint()
 
@@ -6970 +6971 @@
             
         SetPhaseWindow(G2frame.dataFrame,G2frame.MCSA,mainSizer)
-        Size = G2frame.MCSA.GetSize()
-        Size[0] = Xsize+40
-        G2frame.dataFrame.setSizePosLeft(Size)
-        G2frame.MCSA.Scroll(0,Scroll)
         
     def SetSolution(result,Models):
@@ -8087 +8084 @@
     G2frame.dataFrame.SetLabel('Phase Data for '+PhaseName)
     G2frame.dataFrame.CreateStatusBar()
-    G2frame.dataDisplay = G2G.GSNoteBook(parent=G2frame.dataFrame,size=G2frame.dataFrame.GetClientSize())
+    G2frame.dataDisplay = G2G.GSNoteBook(parent=G2frame.dataFrame,size=G2frame.dataFrame.GetClientSize(),
+        style=wx.aui.AUI_NB_DEFAULT_STYLE ^ wx.aui.AUI_NB_CLOSE_ON_ACTIVE_TAB)
     G2frame.dataDisplay.gridList = [] # list of all grids in notebook
     Pages = []