Changeset 4594 for trunk/GSASIIpwdGUI.py

Timestamp:

Oct 14, 2020 2:56:09 PM (2 years ago)

Author:

vondreele

Message:

remove WACV,wx.ALIGN_CENTER_VERTICAL from all Add for wx.VERTICAL wx.BoxSizers?
fix use of inspect.getargspec - now inspect.getfullargspec for python 3.x in G2dataGUI
Add a File.close in G2img_CBF reader

File:

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

trunk/GSASIIpwdGUI.py

@@ -186 +186 @@
         magDisplay.Bind(wg.EVT_GRID_CELL_LEFT_CLICK,RefreshGrid)
         magDisplay.AutoSizeColumns(False)
-        mainSizer.Add(magDisplay,0,WACV)
+        mainSizer.Add(magDisplay,0)
         
         OkBtn = wx.Button(self.panel,-1,"Ok")
@@ -227 +227 @@
         self.panel = wx.Panel(self)
         mainSizer = wx.BoxSizer(wx.VERTICAL)
-        mainSizer.Add(wx.StaticText(self.panel,label='Background RDF controls:'),0,WACV)
+        mainSizer.Add(wx.StaticText(self.panel,label='Background RDF controls:'),0)
         plotType = wx.BoxSizer(wx.HORIZONTAL)
         plotType.Add(wx.StaticText(self.panel,label=' Select plot type:'),0,WACV)
@@ -236 +236 @@
         useOC.Bind(wx.EVT_COMBOBOX,OnUseOC)
         plotType.Add(useOC,0,WACV)
-        mainSizer.Add(plotType,0,WACV)
+        mainSizer.Add(plotType,0)
         dataSizer = wx.BoxSizer(wx.HORIZONTAL)
         dataSizer.Add(wx.StaticText(self.panel,label=' Smoothing type: '),0,WACV)
@@ -248 +248 @@
             typeHint=float)
         dataSizer.Add(maxR,0,WACV)
-        mainSizer.Add(dataSizer,0,WACV)
+        mainSizer.Add(dataSizer,0)
 
         OkBtn = wx.Button(self.panel,-1,"Ok")
@@ -1443 +1443 @@
         topSizer.Add((5,0),0)
         backSizer.Add(topSizer)
-        backSizer.Add(wx.StaticText(G2frame.dataWindow,-1,' Background coefficients:'),0,WACV)
+        backSizer.Add(wx.StaticText(G2frame.dataWindow,-1,' Background coefficients:'),0)
         bakSizer = wx.FlexGridSizer(0,5,5,5)
         for i,value in enumerate(data[0][3:]):
@@ -1501 +1501 @@
         debSizer.Add(topSizer)
         if data[1]['nDebye']:
-            debSizer.Add(wx.StaticText(G2frame.dataWindow,-1,' Debye diffuse terms:'),0,WACV)       
+            debSizer.Add(wx.StaticText(G2frame.dataWindow,-1,' Debye diffuse terms:'),0)       
             rowLabels = []
             for i in range(len(data[1]['debyeTerms'])): rowLabels.append(str(i))
@@ -1580 +1580 @@
         peaksGrid = None
         if data[1]['nPeaks']:
-            peaksSizer.Add(wx.StaticText(G2frame.dataWindow,-1,' Peak list:'),0,WACV)       
+            peaksSizer.Add(wx.StaticText(G2frame.dataWindow,-1,' Peak list:'),0)       
             rowLabels = []
             for i in range(len(data[1]['peaksList'])): rowLabels.append(str(i))
@@ -1624 +1624 @@
 
         fileSizer = wx.BoxSizer(wx.VERTICAL)
-        fileSizer.Add(wx.StaticText(G2frame.dataWindow,-1,' Fixed background file:'),0,WACV)
+        fileSizer.Add(wx.StaticText(G2frame.dataWindow,-1,' Fixed background file:'),0)
         if 'background PWDR' not in data[1]:
             data[1]['background PWDR'] = ['',-1.,False]
@@ -5274 +5274 @@
         for name in data['Substances']:
             G2G.HorizontalLine(substSizer,G2frame.dataWindow)    
-            substSizer.Add(wx.StaticText(parent=G2frame.dataWindow,label=' Data for '+name+':'),
-                0,WACV)
+            substSizer.Add(wx.StaticText(parent=G2frame.dataWindow,label=' Data for '+name+':'),0)
             if name == 'vacuum':
-                substSizer.Add(wx.StaticText(parent=G2frame.dataWindow,label='        Not applicable'),
-                    0,WACV)
+                substSizer.Add(wx.StaticText(parent=G2frame.dataWindow,label='        Not applicable'),0)
             elif name == 'unit scatter':
-                substSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Scattering density,f: %.3f *10%scm%s'%(data['Substances'][name]['Scatt density'],Pwr10,Pwrm2)),0,WACV)
+                substSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Scattering density,f: %.3f *10%scm%s'%(data['Substances'][name]['Scatt density'],Pwr10,Pwrm2)),0)
             else:    
                 elSizer = wx.FlexGridSizer(0,8,5,5)
@@ -5640 +5638 @@
             
         sizeSizer = wx.BoxSizer(wx.VERTICAL)
-        sizeSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Size distribution parameters: '),0,WACV)
+        sizeSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Size distribution parameters: '),0)
         binSizer = wx.FlexGridSizer(0,7,5,5)
         binSizer.Add(wx.StaticText(G2frame.dataWindow,label=' No. size bins: '),0,WACV)
@@ -5757 +5755 @@
             
         pairSizer = wx.BoxSizer(wx.VERTICAL)
-        pairSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Pair distribution parameters: '),0,WACV)
+        pairSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Pair distribution parameters: '),0)
         binSizer = wx.FlexGridSizer(0,6,5,5)
         binSizer.Add(wx.StaticText(G2frame.dataWindow,label=' No. R bins: '),0,WACV)
@@ -5785 +5783 @@
         else:
             fitSizer.Add(wx.StaticText(G2frame.dataWindow,label=" D.I. Svergun, J. Appl. Cryst., 24, 485-492 (1991)"),0,WACV)
-        pairSizer.Add(fitSizer,0,WACV)
+        pairSizer.Add(fitSizer,0)
         if 'Moore' in data['Pair']['Method']:
             mooreSizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -5794 +5792 @@
             mooreterms.Bind(wx.EVT_BUTTON,OnMooreTerms)
             mooreSizer.Add(mooreterms,0,WACV)
-            pairSizer.Add(mooreSizer,0,WACV)
+            pairSizer.Add(mooreSizer,0)
         errorSizer = wx.BoxSizer(wx.HORIZONTAL)
         errorSizer.Add(wx.StaticText(G2frame.dataWindow,label='Error method: '),0,WACV)
@@ -5805 +5803 @@
             errorSizer.Add(percent,0,WACV)
         errorSizer.Add(error,0,WACV)
-        pairSizer.Add(errorSizer,0,WACV)
+        pairSizer.Add(errorSizer,0)
         return pairSizer    
     
@@ -5842 +5840 @@
         
         shapeSizer = wx.BoxSizer(wx.VERTICAL)
-        shapeSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Shape parameters:'),0,WACV)
+        shapeSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Shape parameters:'),0)
         parmSizer = wx.FlexGridSizer(0,4,5,5)
 #1st row        
@@ -5884 +5882 @@
         
         if len(data['Pair'].get('Result',[])):
-            shapeSizer.Add(wx.StaticText(G2frame.dataWindow,label=' SHAPES run results:'),0,WACV)
+            shapeSizer.Add(wx.StaticText(G2frame.dataWindow,label=' SHAPES run results:'),0)
             Atoms,Patterns,PRcalc = data['Pair']['Result']
             colLabels = ['name','show beads','show shape','Rvalue','P(r) dif','Nbeads','Nshape']
@@ -5904 +5902 @@
                         ShapesResult.SetReadOnly(r,c,isReadOnly=True)
     
-            shapeSizer.Add(ShapesResult,0,WACV)
+            shapeSizer.Add(ShapesResult,0)
         return shapeSizer
 
@@ -6494 +6492 @@
         resol.Add(wx.StaticText(G2frame.dataWindow,label=' (FWHM %): '),0,WACV)
         resol.Add(G2G.ValidatedTxtCtrl(G2frame.dataWindow,data['Resolution'],0,nDig=(10,3),xmin=0.,xmax=5.,OnLeave=NewRes),0,WACV)
-        controlSizer.Add(resol,0,WACV)
+        controlSizer.Add(resol,0)
         minimiz = wx.BoxSizer(wx.HORIZONTAL)
         minimiz.Add(wx.StaticText(G2frame.dataWindow,label=' Minimizer: '),0,WACV)
@@ -6508 +6506 @@
         weight.Bind(wx.EVT_CHECKBOX, OnWeight)
         minimiz.Add(weight,0,WACV)
-        controlSizer.Add(minimiz,0,WACV)
+        controlSizer.Add(minimiz,0)
         plotSizer = wx.BoxSizer(wx.HORIZONTAL)
         plotSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Plot controls: '),0,WACV)
@@ -6523 +6521 @@
 #        q4fft.Bind(wx.EVT_CHECKBOX, OnQ4fftplot)
 #        plotSizer.Add(q4fft,0,WACV)
-        controlSizer.Add(plotSizer,0,WACV)
+        controlSizer.Add(plotSizer,0)
         return controlSizer
     
@@ -6618 +6616 @@
         for ilay,layer in enumerate(data['Layers']):
             if not ilay:
-                layerSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Top layer (superphase):'),0,WACV)
+                layerSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Top layer (superphase):'),0)
             elif ilay < len(data['Layers'])-1:
-                layerSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Layer no. %d'%(ilay)),0,WACV)
+                layerSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Layer no. %d'%(ilay)),0)
             else:
-                layerSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Bottom layer (substrate):'),0,WACV)
+                layerSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Bottom layer (substrate):'),0)
             midlayer = wx.BoxSizer(wx.HORIZONTAL)
             midlayer.Add(wx.StaticText(G2frame.dataWindow,label=' Substance: '),0,WACV)
@@ -6975 +6973 @@
                             
         PDFfileSizer = wx.BoxSizer(wx.VERTICAL)
-        PDFfileSizer.Add(wx.StaticText(parent=G2frame.dataWindow,label=' PDF data files: '),0,WACV)
+        PDFfileSizer.Add(wx.StaticText(parent=G2frame.dataWindow,label=' PDF data files: '),0)
         PDFfileSizer.Add((5,5),0)    
         if 'C' in inst['Type'][0]:
             str = ' Sample file: PWDR%s   Wavelength, A: %.5f  Energy, keV: %.3f  Polariz.: %.2f '%(dataFile[4:],wave,keV,polariz)
-            PDFfileSizer.Add(wx.StaticText(parent=G2frame.dataWindow,label=str),0,WACV)
+            PDFfileSizer.Add(wx.StaticText(parent=G2frame.dataWindow,label=str),0)
         PDFfileSizer.Add((5,5),0)
         fileSizer = wx.FlexGridSizer(0,5,5,1)
@@ -7022 +7020 @@
         sampleSizer = wx.BoxSizer(wx.VERTICAL)
         if not ElList:
-            sampleSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Sample information: fill in this 1st'),0,WACV)
+            sampleSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Sample information: fill in this 1st'),0)
         else:
-            sampleSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Sample information: '),0,WACV)
+            sampleSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Sample information: '),0)
         sampleSizer.Add((5,5),0)    
         Abs = G2lat.CellAbsorption(ElList,data['Form Vol'])
@@ -7624 +7622 @@
 
         peakBox = wx.BoxSizer(wx.VERTICAL)
-        peakBox.Add(wx.StaticText(G2frame.dataWindow,label=' PDF Peaks:'),0,WACV)
-        peakBox.Add(PDFPeaks,0,WACV)
+        peakBox.Add(wx.StaticText(G2frame.dataWindow,label=' PDF Peaks:'),0)
+        peakBox.Add(PDFPeaks,0)
         
         return peakBox