Changeset 2622

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

Location:

trunk

Files:

• GSASIIctrls.py (modified) (1 diff)
• GSASIIgrid.py (modified) (2 diffs)
• GSASIIimgGUI.py (modified) (4 diffs)
• GSASIIphsGUI.py (modified) (4 diffs)
• GSASIIpwdGUI.py (modified) (7 diffs)

trunk/GSASIIctrls.py

@@ -95 +95 @@
         '''Log each press on a tree item here. 
         '''
+        if not self.G2frame.dataFrame:
+            return
         self.G2frame.dataFrame.userReSize = False
         if self.SelectionChanged:

trunk/GSASIIgrid.py

@@ -2525 +2525 @@
         if self.userReSize and parent and self.G2frame.PatternTree.GetItemText(parent) == "Phases": 
             if self.lastSize == event.EventObject.GetSize():
-                if GSASIIpath.GetConfigValue('debug'):
-                    print 'no save size=',self.lastSize
+#                if GSASIIpath.GetConfigValue('debug'):
+#                    print 'no save size=',self.lastSize
                 return
             self.manualPhaseSize = event.EventObject.GetSize()
-            if GSASIIpath.GetConfigValue('debug'):
-                print 'Saving Phase size=',self.manualPhaseSize
+            self.lastSize = self.manualPhaseSize
+#            if GSASIIpath.GetConfigValue('debug'):
+#                print 'Saving Phase size=',self.manualPhaseSize
                 #HowDidIgetHere()
         event.Skip()
@@ -2561 +2562 @@
         Width[1] = min(Width[1],clientSize[2]-300)
         Width[0] = max(Width[0],300)
+#        print 'current position/width:',Pos,Width
         self.SetSize(Width)
         if self.lastSize[0]:

trunk/GSASIIimgGUI.py

@@ -130 +130 @@
     fitSize = mainSizer.Fit(G2frame.dataFrame)
     G2frame.dataFrame.setSizePosLeft(fitSize)
-    G2frame.dataDisplay.SetSize(fitSize)
 
 ################################################################################
@@ -1179 +1178 @@
     fitSize = mainSizer.Fit(G2frame.dataFrame)
     G2frame.dataFrame.setSizePosLeft(fitSize)
-    G2frame.dataDisplay.SetSize(fitSize)
     
 ################################################################################
@@ -1664 +1662 @@
     mainSizer.Layout()    
     G2frame.dataDisplay.SetSizer(mainSizer)
-    G2frame.dataDisplay.SetSize(mainSizer.Fit(G2frame.dataFrame))
     G2frame.dataDisplay.SetupScrolling()
     Size = mainSizer.Fit(G2frame.dataFrame)
     Size[0] += 50 # room for scrollbar & status msg
     Size[1] = min(Size[1],500)
-    G2frame.dataDisplay.SetSize(Size)
     G2frame.dataFrame.setSizePosLeft(Size)    
     if startScroll: # reset scroll to saved position
@@ -2082 +2078 @@
     Size = mainSizer.Fit(G2frame.dataFrame)
     Size[0] += 25
-    G2frame.dataDisplay.SetSize(Size)
     G2frame.dataFrame.setSizePosLeft(Size)    
 

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 = []    

trunk/GSASIIpwdGUI.py

@@ -1230 +1230 @@
     G2frame.dataDisplay.SetSizer(mainSizer)
     Size = mainSizer.Fit(G2frame.dataFrame)
-    G2frame.dataDisplay.SetSize(Size)
     G2frame.dataFrame.setSizePosLeft(Size)
         
@@ -1314 +1313 @@
         G2frame.dataDisplay.SetSizer(mainSizer)
         Size = mainSizer.Fit(G2frame.dataFrame)
-        G2frame.dataDisplay.SetSize(Size)
         G2frame.dataFrame.setSizePosLeft(Size)
         
@@ -2448 +2446 @@
     G2frame.dataDisplay.SetSizer(mainSizer)
     Size = mainSizer.Fit(G2frame.dataFrame)
-    G2frame.dataDisplay.SetSize(Size)
     G2frame.dataFrame.setSizePosLeft(Size)
                 
@@ -3292 +3289 @@
     Size = mainSizer.Fit(G2frame.dataFrame)
     Size[0] += 25
-    G2frame.dataDisplay.SetSize(Size)
     G2frame.dataFrame.setSizePosLeft(Size)    
     
@@ -3850 +3846 @@
     Size = mainSizer.Fit(G2frame.dataFrame)
     Size[0] += 25
-    G2frame.dataDisplay.SetSize(Size)
     G2frame.dataFrame.setSizePosLeft(Size)    
        
@@ -4563 +4558 @@
     Size = mainSizer.Fit(G2frame.dataFrame)
     Size[0] += 25
-    G2frame.dataDisplay.SetSize(Size)
     G2frame.dataFrame.setSizePosLeft(Size)    
     
@@ -5157 +5151 @@
     G2frame.dataDisplay.SetSizer(mainSizer)
     Size = mainSizer.Fit(G2frame.dataFrame)
-    G2frame.dataDisplay.SetSize(Size)
     G2frame.dataFrame.setSizePosLeft(Size)