Changeset 4805 for trunk/GSASIIpwdGUI.py

Timestamp:

Feb 8, 2021 2:37:16 PM (2 years ago)

Author:

toby

Message:

start replacing dataWindow.GetSizer? with .SetSizer? since Sizer could be horizontal or vertical

File:

• trunk/GSASIIpwdGUI.py (modified) (21 diffs)

trunk/GSASIIpwdGUI.py

@@ -1127 +1127 @@
     data['peaks'] = X
     G2frame.dataWindow.ClearData()
-    mainSizer = G2frame.dataWindow.GetSizer()
+    mainSizer = wx.BoxSizer(wx.VERTICAL)
     G2frame.GPXtree.SetItemPyData(G2frame.PickId,data)
     G2frame.PeakTable = G2G.Table(data['peaks'],rowLabels=rowLabels,colLabels=colLabels,types=Types)
@@ -1147 +1147 @@
     mainSizer.Add(reflGrid)
     mainSizer.Add(G2G.HelpButton(G2frame.dataWindow,helpIndex=G2frame.dataWindow.helpKey))
+    G2frame.dataWindow.SetSizer(mainSizer)
     G2frame.dataWindow.SetDataSize()
 
@@ -1789 +1790 @@
     def Draw():
         G2frame.dataWindow.ClearData()
-        mainSizer = G2frame.dataWindow.GetSizer()
+        mainSizer = wx.BoxSizer(wx.VERTICAL)
         topSizer = wx.BoxSizer(wx.HORIZONTAL)
         topSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Data used in refinement'),0,WACV)
@@ -1802 +1803 @@
             mainSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Excluded regions:'),0,WACV)
             mainSizer.Add(ExclSizer())
+        G2frame.dataWindow.SetSizer(mainSizer)
         G2frame.dataWindow.SetDataSize()
 
@@ -2197 +2199 @@
         'Displays the Instrument parameters in the dataWindow frame'
         G2frame.dataWindow.ClearData()
-        mainSizer = G2frame.dataWindow.GetSizer()
+        mainSizer = wx.BoxSizer(wx.VERTICAL)
         instSizer = wx.FlexGridSizer(0,3,5,5)
         subSizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -2431 +2433 @@
         mainSizer.Add(instSizer,0)
         G2frame.dataWindow.SetDataSize()
+        G2frame.dataWindow.SetSizer(mainSizer)
         # end of MakeParameterWindow
                 
@@ -2940 +2943 @@
     parms = SetupSampleLabels(histName,data.get('Type'),Inst['Type'][0])
     G2frame.dataWindow.ClearData()
-    mainSizer = G2frame.dataWindow.GetSizer()
+    mainSizer = wx.BoxSizer(wx.VERTICAL)
     topSizer = wx.BoxSizer(wx.HORIZONTAL)
     topSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Sample and Experimental Parameters'))
@@ -3044 +3047 @@
         conSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Transmission (calc): %10.3f  '%(np.exp(-mut))),0,WACV)
         mainSizer.Add(conSizer,0)
+    G2frame.dataWindow.SetSizer(mainSizer)
     G2frame.dataWindow.SetDataSize()
     
@@ -3209 +3213 @@
         G2plt.PlotCalib(G2frame,Inst,XY,Sigs,newPlot=True)
     G2frame.dataWindow.ClearData()
-    mainSizer = G2frame.dataWindow.GetSizer()
+    mainSizer = wx.BoxSizer(wx.VERTICAL)
     mainSizer.Add(G2frame.indxPeaks,0,wx.ALL|wx.EXPAND,1)
+    G2frame.dataWindow.SetSizer(mainSizer)
     G2frame.dataWindow.SetDataSize()
 
@@ -4412 +4417 @@
         G2frame.dataWindow.LoadCell.Enable(True)
     G2frame.dataWindow.ClearData()
-    mainSizer = G2frame.dataWindow.GetSizer()
+    mainSizer = wx.BoxSizer(wx.VERTICAL)
     topSizer = wx.BoxSizer(wx.HORIZONTAL)
     topSizer.Add(wx.StaticText(parent=G2frame.dataWindow,label=' Indexing controls: '),0,WACV)
@@ -4723 +4728 @@
         mainSizer.Add(magDisplay,0,WACV)
         
+    G2frame.dataWindow.SetSizer(mainSizer)
     G2frame.dataWindow.SetDataSize()
     
@@ -5008 +5014 @@
     G2frame.dataWindow.ClearData()
     G2frame.refBook = G2G.GSNoteBook(parent=G2frame.dataWindow)
-    G2frame.dataWindow.GetSizer().Add(G2frame.refBook,1,wx.ALL|wx.EXPAND,1)
+    mainSizer = wx.BoxSizer(wx.HORIZONTAL)
+    mainSizer.Add(G2frame.refBook,1,wx.ALL|wx.EXPAND,1)
     G2frame.refTable = {}
     G2frame.dataWindow.currentGrids = []
@@ -5028 +5035 @@
                 G2frame.RefList = ''
                 phaseName = ''
-    G2frame.dataWindow.GetSizer().Add(G2G.HelpButton(G2frame.dataWindow,helpIndex=G2frame.dataWindow.helpKey))
+    mainSizer.Add(G2G.HelpButton(G2frame.dataWindow,helpIndex=G2frame.dataWindow.helpKey))
     if phaseName: ShowReflTable(phaseName)
     G2frame.refBook.Bind(wx.aui.EVT_AUINOTEBOOK_PAGE_CHANGED, OnPageChanged)
+    G2frame.dataWindow.SetSizer(mainSizer)
     G2frame.dataWindow.SetDataSize()
     
@@ -6242 +6250 @@
     Indx = {}
     G2frame.dataWindow.ClearData()
-    mainSizer = G2frame.dataWindow.GetSizer()
+    mainSizer = wx.BoxSizer(wx.VERTICAL)
     topSizer = wx.BoxSizer(wx.HORIZONTAL)
     models = ['Size dist.','Particle fit','Pair distance',]
@@ -6296 +6304 @@
     backSizer.Add(backFile)    
     mainSizer.Add(backSizer)
+    G2frame.dataWindow.SetSizer(mainSizer)
     G2frame.dataWindow.SetDataSize()
 
@@ -6825 +6834 @@
     G2frame.Bind(wx.EVT_MENU, OnUnDo, id=G2G.wxID_MODELUNDO)
     G2frame.dataWindow.ClearData()
-    mainSizer = G2frame.dataWindow.GetSizer()
+    mainSizer = wx.BoxSizer(wx.VERTICAL)
     mainSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Reflectometry fitting for: '+Name),0,WACV)
     mainSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Controls:'),0,WACV)
@@ -6852 +6861 @@
     mainSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Layers: scatt. densities are 10%scm%s = 10%s%s%s'%(Pwr10,Pwrm2,Pwrm6,Angstr,Pwrm2)),0,WACV)
     mainSizer.Add(LayerSizer())
+    G2frame.dataWindow.SetSizer(mainSizer)
     G2frame.dataWindow.SetDataSize()
     
@@ -7567 +7577 @@
 
     G2frame.dataWindow.ClearData()
-    mainSizer = G2frame.dataWindow.GetSizer()
+    mainSizer = wx.BoxSizer(wx.VERTICAL)
     if powId:
         ElList = data['ElList']
@@ -7580 +7590 @@
         mainSizer.Add(wx.StaticText(G2frame.dataWindow,wx.ID_ANY,
                                      powName+' not in Tree'))
+    G2frame.dataWindow.SetSizer(mainSizer)
     G2frame.dataWindow.SetDataSize()
 
@@ -7764 +7775 @@
     G2frame.Bind(wx.EVT_MENU, OnClearPDFpeaks, id=G2G.wxID_CLEARPDFPEAKS)
     G2frame.dataWindow.ClearData()
-    mainSizer = G2frame.dataWindow.GetSizer()
+    mainSizer = wx.BoxSizer(wx.VERTICAL)
     mainSizer.Add((5,5),0) 
     mainSizer.Add(wx.StaticText(G2frame.dataWindow,label=' PDF peak fit controls:'),0,WACV)
@@ -7774 +7785 @@
         mainSizer.Add((5,5),0)
         mainSizer.Add(peakSizer())
+    G2frame.dataWindow.SetSizer(mainSizer)
     G2frame.dataWindow.SetDataSize()