Changeset 4594 for trunk

Timestamp:

Oct 14, 2020 2:56:09 PM (3 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

Location:

trunk

Files:

• GSASIIconstrGUI.py (modified) (29 diffs)
• GSASIIctrlGUI.py (modified) (17 diffs)
• GSASIIdataGUI.py (modified) (7 diffs)
• GSASIIddataGUI.py (modified) (19 diffs)
• GSASIIexprGUI.py (modified) (8 diffs)
• GSASIIfiles.py (modified) (1 diff)
• GSASIIfpaGUI.py (modified) (8 diffs)
• GSASIIimgGUI.py (modified) (6 diffs)
• GSASIIphsGUI.py (modified) (86 diffs)
• GSASIIpwdGUI.py (modified) (24 diffs)
• GSASIIrestrGUI.py (modified) (15 diffs)
• imports/G2img_CBF.py (modified) (1 diff)

trunk/GSASIIconstrGUI.py

@@ -280 +280 @@
         topLabl = wx.StaticText(panel,-1,text)
         mainSizer.Add((10,10),1)
-        mainSizer.Add(topLabl,0,wx.ALIGN_CENTER_VERTICAL|wx.LEFT,10)
+        mainSizer.Add(topLabl,0,wx.LEFT,10)
         mainSizer.Add((10,10),1)
         dataGridSizer = wx.FlexGridSizer(cols=3,hgap=2,vgap=2)
@@ -289 +289 @@
             name = wx.StaticText(panel,wx.ID_ANY,lbl1,style=wx.ALIGN_RIGHT)
             scale = G2G.ValidatedTxtCtrl(panel,self.data[id],0,OKcontrol=self.DisableOK)
-            dataGridSizer.Add(name,0,wx.LEFT|wx.RIGHT|wx.ALIGN_CENTER_VERTICAL,5)
+            dataGridSizer.Add(name,0,wx.LEFT|wx.RIGHT|WACV,5)
             dataGridSizer.Add(scale,0,wx.RIGHT,3)
             if ':' in lbl:
                 dataGridSizer.Add(
                     wx.StaticText(panel,-1,G2obj.fmtVarDescr(lbl)),
-                    0,wx.RIGHT|wx.ALIGN_CENTER_VERTICAL,3)
+                    0,wx.RIGHT|WACV,3)
             else:
                 dataGridSizer.Add((-1,-1))
@@ -301 +301 @@
                 style=wx.ALIGN_CENTER)
             scale = G2G.ValidatedTxtCtrl(panel,self.newvar,0,notBlank=False)
-            dataGridSizer.Add(name,0,wx.LEFT|wx.RIGHT|wx.ALIGN_CENTER_VERTICAL,5)
-            dataGridSizer.Add(scale,0,wx.RIGHT|wx.ALIGN_CENTER_VERTICAL,3)
+            dataGridSizer.Add(name,0,wx.LEFT|wx.RIGHT|WACV,5)
+            dataGridSizer.Add(scale,0,wx.RIGHT|WACV,3)
             self.refine = wx.CheckBox(panel,label='Refine?')
             self.refine.SetValue(self.newvar[1]==True)
             self.refine.Bind(wx.EVT_CHECKBOX, self.OnCheckBox)
-            dataGridSizer.Add(self.refine,0,wx.RIGHT|wx.ALIGN_CENTER_VERTICAL,3)
+            dataGridSizer.Add(self.refine,0,wx.RIGHT|WACV,3)
             
         mainSizer.Add(dataGridSizer,0,wx.EXPAND)
@@ -320 +320 @@
         btnSizer.Add((20,20),1)
 
-        mainSizer.Add(btnSizer,0,wx.EXPAND|wx.BOTTOM|wx.TOP, 10)
+        mainSizer.Add(btnSizer,0,wx.EXPAND, 10)
         panel.SetSizer(mainSizer)
         panel.Fit()
@@ -992 +992 @@
             Sizer1 =  wx.BoxSizer(wx.VERTICAL)
             Sizer1.Add(wx.StaticText(pageDisplay,wx.ID_ANY,
-                                    'Equivalences generated based on cell/space group input'))
+                'Equivalences generated based on cell/space group input'))
             Sizer1.Add((-1,5))
             Sizer = wx.FlexGridSizer(0,2,0,0)
@@ -998 +998 @@
             for sym in G2mv.GetSymEquiv():
                 Sizer.Add(wx.StaticText(pageDisplay,wx.ID_ANY,'EQUIV'),
-                           0,wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_CENTER|wx.RIGHT|wx.LEFT,3)
+                    0,WACV|wx.ALIGN_CENTER|wx.RIGHT|wx.LEFT,3)
                 Sizer.Add(wx.StaticText(pageDisplay,wx.ID_ANY,sym))
                 Sizer.Add((-1,-1))
@@ -1023 +1023 @@
                 constEdit = wx.Button(pageDisplay,wx.ID_ANY,'Edit',style=wx.BU_EXACTFIT)
                 constEdit.Bind(wx.EVT_BUTTON,OnConstEdit)
-                constSizer.Add(constEdit,0,wx.LEFT|wx.RIGHT|wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_CENTER,1)            # edit button
+                constSizer.Add(constEdit,0,wx.LEFT|wx.RIGHT|WACV|wx.ALIGN_CENTER,1)            # edit button
                 Indx[constEdit.GetId()] = [Id,name]
                 if item[-1] == 'f':
@@ -1125 +1125 @@
             constDel.Bind(wx.EVT_BUTTON,OnConstDel)
             Indx[constDel.GetId()] = [Id,name]
-            constSizer.Add(constDel,0,wx.LEFT|wx.RIGHT|wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_CENTER,1)             # delete button
+            constSizer.Add(constDel,0,wx.LEFT|wx.RIGHT|WACV|wx.ALIGN_CENTER,1)             # delete button
             if helptext:
                 ch = G2G.HelpButton(pageDisplay,helptext)
-                constSizer.Add(ch,0,wx.LEFT|wx.RIGHT|wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_CENTER,1)
+                constSizer.Add(ch,0,wx.LEFT|wx.RIGHT|WACV|wx.ALIGN_CENTER,1)
             else:
                 constSizer.Add((-1,-1))
             if refineflag:
                 ch = G2G.G2CheckBox(pageDisplay,'',item,-2)
-                constSizer.Add(ch,0,wx.LEFT|wx.RIGHT|wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_CENTER,1)
+                constSizer.Add(ch,0,wx.LEFT|wx.RIGHT|WACV|wx.ALIGN_CENTER,1)
             else:
                 constSizer.Add((-1,-1))                
             constSizer.Add(wx.StaticText(pageDisplay,wx.ID_ANY,typeString),
-                           0,wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_CENTER|wx.RIGHT|wx.LEFT,3)
+                           0,WACV|wx.ALIGN_CENTER|wx.RIGHT|wx.LEFT,3)
             if problemItem: eqString[-1] += ' -- Conflict: see console'
             if len(eqString) > 1:
@@ -1144 +1144 @@
                     line = wx.StaticText(pageDisplay,wx.ID_ANY,s)
                     if problemItem: line.SetBackgroundColour(wx.YELLOW)
-                    Eq.Add(line,0,wx.ALIGN_CENTER_VERTICAL)
+                    Eq.Add(line,0)
                 Eq.Add((-1,4))
             else:
                 Eq = wx.StaticText(pageDisplay,wx.ID_ANY,eqString[0])
                 if problemItem: Eq.SetBackgroundColour(wx.YELLOW)
-            constSizer.Add(Eq,1,wx.ALIGN_CENTER_VERTICAL)
+            constSizer.Add(Eq,1,WACV)
         return constSizer
                 
@@ -2402 +2402 @@
             name = G2obj.MakeUniqueLabel(name,namelist)
             rbData = MakeVectorBody()
-            DrawCallback = G2plt.PlotRigidBody(G2frame,'Vector',
-                                    AtInfo,rbData,plotDefaults)
+            DrawCallback = G2plt.PlotRigidBody(G2frame,'Vector',AtInfo,rbData,plotDefaults)
 
             mainSizer = wx.BoxSizer(wx.HORIZONTAL)
             btnSizer = wx.BoxSizer(wx.VERTICAL)
-            btnSizer.Add(
-                wx.StaticText(RBImpPnl,wx.ID_ANY,'Reorder atoms by dragging'),
-                0,wx.ALL)
+            btnSizer.Add(wx.StaticText(RBImpPnl,wx.ID_ANY,'Reorder atoms by dragging'),0,wx.ALL)
             btnSizer.Add((-1,15))
             btn = wx.Button(RBImpPnl, wx.ID_ANY, 'Set All')
@@ -2418 +2415 @@
             btnSizer.Add(btn,0,wx.ALIGN_CENTER)
             btnSizer.Add((-1,15))
-            btnSizer.Add(
-                wx.StaticText(RBImpPnl,wx.ID_ANY,'Reorient using selected\natoms...'),
-                0,wx.ALL)
+            btnSizer.Add(wx.StaticText(RBImpPnl,wx.ID_ANY,'Reorient using selected\natoms...'),0,wx.ALL)
             btnSizer.Add((-1,5))
             btn = wx.Button(RBImpPnl, wx.ID_ANY, 'Set origin')
@@ -2431 +2426 @@
             btn.Bind(wx.EVT_BUTTON,onSetPlane)
             inSizer.Add(btn)
-            inSizer.Add(G2G.G2ChoiceButton(RBImpPnl,('xy','yz','xz'),
-                                           None,None,bntOpts,'plane'))
+            inSizer.Add(G2G.G2ChoiceButton(RBImpPnl,('xy','yz','xz'),None,None,bntOpts,'plane'))
             btnSizer.Add(inSizer,0,wx.ALIGN_CENTER)
             
@@ -2439 +2433 @@
             btn.Bind(wx.EVT_BUTTON,onSetX)
             inSizer.Add(btn)
-            inSizer.Add(G2G.G2ChoiceButton(RBImpPnl,('x','y','z'),
-                                           None,None,bntOpts,'direction'))
+            inSizer.Add(G2G.G2ChoiceButton(RBImpPnl,('x','y','z'),None,None,bntOpts,'direction'))
             btnSizer.Add(inSizer,0,wx.ALIGN_CENTER)
             
             btnSizer.Add((-1,15))
-            btnSizer.Add(
-                wx.StaticText(RBImpPnl,wx.ID_ANY,'Use selected atoms to\ncreate...'),
-                0,wx.ALL)
+            btnSizer.Add(wx.StaticText(RBImpPnl,wx.ID_ANY,'Use selected atoms to\ncreate...'),0,wx.ALL)
             btnSizer.Add((-1,5))
             btn = wx.Button(RBImpPnl, wx.ID_ANY, 'export as xyz')
@@ -2979 +2970 @@
             
             nameSizer = wx.BoxSizer(wx.HORIZONTAL)
-            nameSizer.Add(wx.StaticText(VectorRBDisplay,-1,'Rigid body name: '),
-                0,wx.ALIGN_CENTER_VERTICAL)
+            nameSizer.Add(wx.StaticText(VectorRBDisplay,-1,'Rigid body name: '),0,WACV)
             RBname = wx.TextCtrl(VectorRBDisplay,-1,rbData['RBname'])
             Indx[RBname.GetId()] = rbid
@@ -2986 +2976 @@
             RBname.Bind(wx.EVT_TEXT_ENTER,OnRBName)
             RBname.Bind(wx.EVT_KILL_FOCUS,OnRBName)
-            nameSizer.Add(RBname,0,wx.ALIGN_CENTER_VERTICAL)
+            nameSizer.Add(RBname,0,WACV)
             nameSizer.Add((5,0),)
-            plotRB =  wx.Button(VectorRBDisplay,wx.ID_ANY,'Plot',
-                                style=wx.BU_EXACTFIT)
+            plotRB =  wx.Button(VectorRBDisplay,wx.ID_ANY,'Plot',style=wx.BU_EXACTFIT)
             plotRB.Bind(wx.EVT_BUTTON, OnPlotRB)
             Indx[plotRB.GetId()] = rbid
-            nameSizer.Add(plotRB,0,wx.ALIGN_CENTER_VERTICAL)
+            nameSizer.Add(plotRB,0,WACV)
             nameSizer.Add((5,0),)
             if not rbData['useCount']:
-                delRB = wx.Button(VectorRBDisplay,wx.ID_ANY,"Delete",
-                                style=wx.BU_EXACTFIT)
+                delRB = wx.Button(VectorRBDisplay,wx.ID_ANY,"Delete",style=wx.BU_EXACTFIT)
                 delRB.Bind(wx.EVT_BUTTON, OnDelRB)
                 Indx[delRB.GetId()] = rbid
-                nameSizer.Add(delRB,0,wx.ALIGN_CENTER_VERTICAL)
+                nameSizer.Add(delRB,0,WACV)
             return nameSizer
             
@@ -3021 +3009 @@
             else:
                 refAtmSizer.Add(wx.StaticText(VectorRBDisplay,-1,
-                    'Orientation reference atoms A-B-C: '),0,wx.ALIGN_CENTER_VERTICAL)
+                    'Orientation reference atoms A-B-C: '),0,WACV)
                 for i in range(3):
                     choices = [atNames[j] for j in refChoice[rbid][i]]
@@ -3029 +3017 @@
                     refSel.Bind(wx.EVT_COMBOBOX, OnRefSel)
                     Indx[refSel.GetId()] = i
-                    refAtmSizer.Add(refSel,0,wx.ALIGN_CENTER_VERTICAL)
+                    refAtmSizer.Add(refSel,0,WACV)
             return refAtmSizer
                         
@@ -3055 +3043 @@
                         
             magSizer = wx.BoxSizer(wx.HORIZONTAL)
-            magSizer.Add(wx.StaticText(VectorRBDisplay,-1,'Translation magnitude: '),
-                0,wx.ALIGN_CENTER_VERTICAL)
+            magSizer.Add(wx.StaticText(VectorRBDisplay,-1,'Translation magnitude: '),0,WACV)
             magValue = wx.TextCtrl(VectorRBDisplay,-1,'%8.4f'%(rbData['VectMag'][imag]))
             Indx[magValue.GetId()] = [rbid,imag]
             magValue.Bind(wx.EVT_TEXT_ENTER,OnRBVectorMag)
             magValue.Bind(wx.EVT_KILL_FOCUS,OnRBVectorMag)
-            magSizer.Add(magValue,0,wx.ALIGN_CENTER_VERTICAL)
+            magSizer.Add(magValue,0,WACV)
             magSizer.Add((5,0),)
             magref = wx.CheckBox(VectorRBDisplay,-1,label=' Refine?') 
@@ -3067 +3054 @@
             magref.Bind(wx.EVT_CHECKBOX,OnRBVectorRef)
             Indx[magref.GetId()] = [rbid,imag]
-            magSizer.Add(magref,0,wx.ALIGN_CENTER_VERTICAL)
+            magSizer.Add(magref,0,WACV)
             return magSizer
             
@@ -3228 +3215 @@
             nameSizer = wx.BoxSizer(wx.HORIZONTAL)
             nameSizer.Add(wx.StaticText(ResidueRBDisplay,-1,'Residue name: '),
-                0,wx.ALIGN_CENTER_VERTICAL)
+                0,WACV)
             RBname = wx.TextCtrl(ResidueRBDisplay,-1,rbData['RBname'])
             RBname.Bind(wx.EVT_LEAVE_WINDOW, OnRBName)
             RBname.Bind(wx.EVT_TEXT_ENTER,OnRBName)
             RBname.Bind(wx.EVT_KILL_FOCUS,OnRBName)
-            nameSizer.Add(RBname,0,wx.ALIGN_CENTER_VERTICAL)
+            nameSizer.Add(RBname,0,WACV)
             nameSizer.Add((5,0),)
             plotRB =  wx.Button(ResidueRBDisplay,wx.ID_ANY,'Plot',style=wx.BU_EXACTFIT)
             plotRB.Bind(wx.EVT_BUTTON, OnPlotRB)
             Indx[plotRB.GetId()] = rbid
-            nameSizer.Add(plotRB,0,wx.ALIGN_CENTER_VERTICAL)
+            nameSizer.Add(plotRB,0,WACV)
             nameSizer.Add((5,0),)
             if not rbData['useCount']:
@@ -3245 +3232 @@
                 delRB.Bind(wx.EVT_BUTTON, OnDelRB)
                 Indx[delRB.GetId()] = rbid
-                nameSizer.Add(delRB,0,wx.ALIGN_CENTER_VERTICAL)
+                nameSizer.Add(delRB,0,WACV)
                 if 'H'  in rbData['rbTypes']:
                     stripH = wx.Button(ResidueRBDisplay,wx.ID_ANY,
@@ -3252 +3239 @@
                     stripH.Bind(wx.EVT_BUTTON, OnStripH)
                     Indx[stripH.GetId()] = rbid
-                    nameSizer.Add(stripH,0,wx.ALIGN_CENTER_VERTICAL)
+                    nameSizer.Add(stripH,0,WACV)
             return nameSizer
             
@@ -3352 +3339 @@
             else:
                 refAtmSizer.Add(wx.StaticText(ResidueRBDisplay,-1,
-                    'Orientation reference non-H atoms A-B-C: '),0,wx.ALIGN_CENTER_VERTICAL)
+                    'Orientation reference non-H atoms A-B-C: '),0,WACV)
                 refObj = [0,0,0]
                 for i in range(3):
@@ -3362 +3349 @@
                     Indx[refSel.GetId()] = [i,resGrid,len(RefObjs)]
                     refObj[i] = refSel
-                    refAtmSizer.Add(refSel,0,wx.ALIGN_CENTER_VERTICAL)
+                    refAtmSizer.Add(refSel,0,WACV)
                 RefObjs.append(refObj)
             
@@ -3415 +3402 @@
             bond = wx.StaticText(ResidueRBDisplay,wx.ID_ANY,
                         '%s %s'%(atNames[iBeg],atNames[iFin]),size=(50,20))
-            seqSizer.Add(bond,0,wx.ALIGN_CENTER_VERTICAL)
+            seqSizer.Add(bond,0,WACV)
             Indx[radBt.GetId()] = [Seq,iSeq,ang.GetId()]
             Indx[delBt.GetId()] = [rbid,Seq]
@@ -3421 +3408 @@
             ang.Bind(wx.EVT_TEXT_ENTER,ChangeAngle)
             ang.Bind(wx.EVT_KILL_FOCUS,ChangeAngle)
-            seqSizer.Add(ang,0,wx.ALIGN_CENTER_VERTICAL)
+            seqSizer.Add(ang,0,WACV)
             atms = ''
             for i in iMove:    
@@ -3427 +3414 @@
             moves = wx.StaticText(ResidueRBDisplay,wx.ID_ANY,
                             atms[:-1],size=(200,20))
-            seqSizer.Add(moves,1,wx.ALIGN_CENTER_VERTICAL|wx.EXPAND|wx.RIGHT)
+            seqSizer.Add(moves,1,WACV|wx.EXPAND|wx.RIGHT)
             return seqSizer
             
@@ -3678 +3665 @@
             if str(G2mode) in constDict:
                 ch = G2G.HelpButton(panel2,fmtHelp(constDict[str(G2mode)],var))
-                subSizer2.Add(ch,0,wx.LEFT|wx.RIGHT|wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_CENTER,1)
+                subSizer2.Add(ch,0,wx.LEFT|wx.RIGHT|WACV|wx.ALIGN_CENTER,1)
             else:
                 subSizer2.Add((-1,-1))
@@ -3718 +3705 @@
             if str(G2mode) in constDict:
                 ch = G2G.HelpButton(panel2,fmtHelp(constDict[str(G2mode)],var))
-                subSizer2.Add(ch,0,wx.LEFT|wx.RIGHT|wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_CENTER,1)
+                subSizer2.Add(ch,0,wx.LEFT|wx.RIGHT|WACV|wx.ALIGN_CENTER,1)
             else:
                 subSizer2.Add((-1,-1))

trunk/GSASIIctrlGUI.py

@@ -2252 +2252 @@
         topSizer = wx.BoxSizer(wx.HORIZONTAL)
         h = max(35,17*int(len(title)/26.+1)) # adjust height of title box with guessed # of lines
-        topSizer.Add(
-            wx.StaticText(self,wx.ID_ANY,title,size=(-1,h)),
+        topSizer.Add(wx.StaticText(self,wx.ID_ANY,title,size=(-1,h)),
             1,wx.ALL|wx.EXPAND|WACV,1)
         if filterBox:
@@ -2259 +2258 @@
             self.timer.Bind(wx.EVT_TIMER,self.Filter)
             topSizer.Add(wx.StaticText(self,wx.ID_ANY,'Filter: '),0,wx.ALL,1)
-            self.filterBox = wx.TextCtrl(self, wx.ID_ANY, size=(80,-1),
-                                         style=wx.TE_PROCESS_ENTER)
+            self.filterBox = wx.TextCtrl(self, wx.ID_ANY, size=(80,-1),style=wx.TE_PROCESS_ENTER)
             self.filterBox.Bind(wx.EVT_CHAR,self.onChar)
             self.filterBox.Bind(wx.EVT_TEXT_ENTER,self.Filter)
@@ -2268 +2266 @@
         self.clb.Bind(wx.EVT_LEFT_DCLICK,self.onDoubleClick)
         if monoFont:
-            font1 = wx.Font(self.clb.GetFont().GetPointSize(),
-                            wx.MODERN, wx.NORMAL, wx.NORMAL, False)
+            font1 = wx.Font(self.clb.GetFont().GetPointSize(),wx.MODERN, wx.NORMAL, wx.NORMAL, False)
             self.clb.SetFont(font1)
         Sizer.Add(self.clb,1,wx.LEFT|wx.RIGHT|wx.EXPAND,10)
@@ -2910 +2907 @@
             else:
                 title += ' using header line(s):'
-            Sizer.Add(wx.StaticText(panel,label=title),0,WACV)
+            Sizer.Add(wx.StaticText(panel,label=title),0)
             Sizer.Add((5,5))
             if self.Comments[-1] != '\n': self.Comments += '\n'
             txt = wx.StaticText(panel,label=self.Comments)
             txt.SetBackgroundColour((250,250,250))
-            font1 = wx.Font(txt.GetFont().GetPointSize(),
-                            wx.MODERN, wx.NORMAL, wx.NORMAL, False)
+            font1 = wx.Font(txt.GetFont().GetPointSize(),wx.MODERN, wx.NORMAL, wx.NORMAL, False)
             txt.SetFont(font1)
-            Sizer.Add(txt,0,wx.ALL|wx.EXPAND|WACV,0)
+            Sizer.Add(txt,0,wx.ALL|wx.EXPAND,0)
             txtSize = txt.GetSize()[1]
         else:
-            Sizer.Add(wx.StaticText(panel,label=title),0,WACV)
+            Sizer.Add(wx.StaticText(panel,label=title),0)
             txtSize = 0
         columnsSizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -2942 +2938 @@
             colSizer.Add(mod,0,WACV)
             columnsSizer.Add(colSizer,0,wx.ALL|WACV|wx.EXPAND,10)
-        Sizer.Add(columnsSizer,1,wx.ALL|WACV|wx.EXPAND,1)
-        Sizer.Add(wx.StaticText(panel,label=' For modify by, enter arithmetic string eg. "-12345.67". "+", "-", "*", "/", "**" all allowed'),0,WACV) 
+        Sizer.Add(columnsSizer,1,wx.ALL|wx.EXPAND,1)
+        Sizer.Add(wx.StaticText(panel,label=' For modify by, enter arithmetic string eg. "-12345.67". "+", "-", "*", "/", "**" all allowed'),0) 
         Sizer.Add((-1,10))
         # OK/Cancel buttons
@@ -3040 +3036 @@
         Sizer = wx.BoxSizer(wx.VERTICAL)
         Sizer.Add((-1,5))
-        Sizer.Add(wx.StaticText(panel,label=title),0,WACV)
+        Sizer.Add(wx.StaticText(panel,label=title),0)
         dataSizer = wx.FlexGridSizer(0,nCol+1,0,0)
         self.sel = []
@@ -3653 +3649 @@
             cents = self.text[-1].split(';')
         for line in self.text:
-            mainSizer.Add(wx.StaticText(self.panel,label='     %s     '%(line)),0,WACV)
+            mainSizer.Add(wx.StaticText(self.panel,label='     %s     '%(line)),0)
             if 'equivalent' in line:
                 break
@@ -3661 +3657 @@
         for ng in range(nG):
             if ng:
-                mainSizer.Add(wx.StaticText(self.panel,label="      for (0,0,0)+1'"),0,WACV)
+                mainSizer.Add(wx.StaticText(self.panel,label="      for (0,0,0)+1'"),0)
                 j = 0
             for ic,cent in enumerate(cents):
@@ -3674 +3670 @@
                     if ng:     #test for gray operators
                         label += "1'"
-                    mainSizer.Add(wx.StaticText(self.panel,label=label),0,WACV)
+                    mainSizer.Add(wx.StaticText(self.panel,label=label),0)
                 tableSizer = wx.FlexGridSizer(0,2*ncol+3,0,0)
                 for item in self.table:
@@ -3710 +3706 @@
                         tableSizer.Add((20,0))
                     j += 1
-                mainSizer.Add(tableSizer,0,WACV)
+                mainSizer.Add(tableSizer,0)
             
             
@@ -3791 +3787 @@
         self.panel = wx.Panel(self)
         mainSizer = wx.BoxSizer(wx.VERTICAL)
-        mainSizer.Add(wx.StaticText(self.panel,-1,'Controls for phase '+data['Name']),
-            0,WACV|wx.LEFT,10)
+        mainSizer.Add(wx.StaticText(self.panel,-1,'Controls for phase '+data['Name']),0,wx.LEFT,10)
         mainSizer.Add((10,10),1)
         
@@ -6232 +6227 @@
         btn = wx.Button(pnl, wx.ID_ANY, "Download a tutorial and view")
         btn.Bind(wx.EVT_BUTTON, self.SelectAndDownload)
-        sizer1a.Add(btn,0,WACV)
+        sizer1a.Add(btn,0)
         btn = wx.Button(pnl, wx.ID_ANY, "Select from downloaded tutorials")
         btn.Bind(wx.EVT_BUTTON, self.onSelectDownloaded)
-        sizer1a.Add(btn,0,WACV)
+        sizer1a.Add(btn,0)
         btn = wx.Button(pnl, wx.ID_ANY, "Browse tutorial on web")
         btn.Bind(wx.EVT_BUTTON, self.onWebBrowse)
-        sizer1a.Add(btn,0,WACV)
+        sizer1a.Add(btn,0)
         btn = wx.Button(pnl, wx.ID_ANY, "Update downloaded tutorials")
         btn.Bind(wx.EVT_BUTTON, self.UpdateDownloaded)
-        sizer1b.Add(btn,0,WACV)
+        sizer1b.Add(btn,0)
         btn = wx.Button(pnl, wx.ID_ANY, "Download all tutorials")
         btn.Bind(wx.EVT_BUTTON, self.DownloadAll)
-        sizer1b.Add(btn,0,WACV)
+        sizer1b.Add(btn,0)
         sizer0.Add(sizer1a,0,wx.EXPAND|wx.ALL,0)
         sizer0.Add(sizer1b,0,wx.EXPAND|wx.ALL,0)
@@ -6419 +6414 @@
         pnl = wx.Panel(dlg)
         sizer = wx.BoxSizer(wx.VERTICAL)
-        listbox = wx.ListBox(pnl, wx.ID_ANY, choices=choices,
-                             size=(450, 100),
-                             style=wx.LB_SINGLE)
-        sizer.Add(listbox,1,WACV|wx.EXPAND|wx.ALL,1)
+        listbox = wx.ListBox(pnl, wx.ID_ANY, choices=choices,size=(450, 100),style=wx.LB_SINGLE)
+        sizer.Add(listbox,1,wx.EXPAND|wx.ALL,1)
         listbox.Bind(wx.EVT_LISTBOX_DCLICK, onDoubleClick)
         sizer.Add((10,10))
@@ -6871 +6864 @@
     sizer = wx.BoxSizer(wx.HORIZONTAL)
     sizer.Add(wx.StaticText(mnpnl, wx.ID_ANY,'Select format:'))
-    fmtSel = G2ChoiceButton(mnpnl,fmtchoices,Settings,'fmt',
-                                       onChoice=onSetFmtSelection
-                                    )
+    fmtSel = G2ChoiceButton(mnpnl,fmtchoices,Settings,'fmt',onChoice=onSetFmtSelection)
     sizer.Add(fmtSel,1,wx.EXPAND)
     mnsizer.Add(sizer,0,wx.EXPAND)
@@ -6879 +6870 @@
     sizer = wx.BoxSizer(wx.HORIZONTAL)
     sizer.Add(wx.StaticText(mnpnl, wx.ID_ANY,'Select extension:'))
-    extSel = G2ChoiceButton(mnpnl,[],Settings,'ext',Settings,'extStr',
-                                       onChoice=onSetExtSelection
-                                    )
+    extSel = G2ChoiceButton(mnpnl,[],Settings,'ext',Settings,'extStr',onChoice=onSetExtSelection)
     sizer.Add(extSel,0)
     mnsizer.Add(sizer,0,wx.EXPAND)
@@ -6894 +6883 @@
     sizer = wx.BoxSizer(wx.HORIZONTAL)
     sizer.Add(wx.StaticText(mnpnl, wx.ID_ANY,'Read from: '),0,wx.ALIGN_CENTER_VERTICAL)
-    fInp3 = ValidatedTxtCtrl(mnpnl,Settings,'indir',size=(300,-1),
-                                        OnLeave=TestInput)
+    fInp3 = ValidatedTxtCtrl(mnpnl,Settings,'indir',size=(300,-1),OnLeave=TestInput)
     sizer.Add(fInp3,1,wx.ALIGN_CENTER_VERTICAL|wx.EXPAND)
     btn3 = wx.Button(mnpnl,  wx.ID_ANY, "Browse")
@@ -6905 +6893 @@
         sizer = wx.BoxSizer(wx.HORIZONTAL)
         sizer.Add(wx.StaticText(mnpnl, wx.ID_ANY,'Instrument parameter file from: '),0,wx.ALIGN_CENTER_VERTICAL)
-        fInp4 = ValidatedTxtCtrl(mnpnl,Settings,'instfile',size=(300,-1),
-                                        OnLeave=TestInput)
+        fInp4 = ValidatedTxtCtrl(mnpnl,Settings,'instfile',size=(300,-1),OnLeave=TestInput)
         sizer.Add(fInp4,1,wx.ALIGN_CENTER_VERTICAL|wx.EXPAND)
         btn4 = wx.Button(mnpnl,  wx.ID_ANY, "Browse")

trunk/GSASIIdataGUI.py

@@ -227 +227 @@
             'hexagonal':['6','-6','6 2 2','6 m m','-6 m 2','-6 2 m',],'cubic':['2 3','4 3 2','-4 3 m']}
         centChoice = ['noncentrosymmetric','centrosymmetric']
-        mainSizer.Add(wx.StaticText(self.panel,label=' Select Laue class for new lattice:'),0,WACV)
+        mainSizer.Add(wx.StaticText(self.panel,label=' Select Laue class for new lattice:'),0)
         Class = wx.ComboBox(self.panel,value=self.Class,choices=laueClass,
             style=wx.CB_READONLY|wx.CB_DROPDOWN)
         Class.Bind(wx.EVT_COMBOBOX,OnClass)
-        mainSizer.Add(Class,0,WACV)
-        mainSizer.Add(wx.StaticText(self.panel,label=' Target Laue symmetry:'),0,WACV)
+        mainSizer.Add(Class,0)
+        mainSizer.Add(wx.StaticText(self.panel,label=' Target Laue symmetry:'),0)
         Cent = wx.ComboBox(self.panel,value=self.Cent,choices=centChoice,
             style=wx.CB_READONLY|wx.CB_DROPDOWN)
@@ -2793 +2793 @@
                         data = self.GPXtree.GetItemPyData(Id)
                         G2IO.ExportSequential(self,data,obj,typ)
-                    if 'mode' in inspect.getargspec(obj.Writer)[0]:
-                        item = submenu.Append(wx.ID_ANY,obj.formatName,obj.longFormatName)
-                        self.Bind(wx.EVT_MENU, seqMenuItemEventHandler, item)
+                        if '2' in platform.python_version_tuple()[0]:
+                            if 'mode' in inspect.getargspec(obj.Writer)[0]:
+                                item = submenu.Append(wx.ID_ANY,obj.formatName,obj.longFormatName)
+                                self.Bind(wx.EVT_MENU, seqMenuItemEventHandler, item)
+                        else:
+                            if 'mode' in inspect.getfullargspec(obj.Writer)[0]:
+                                item = submenu.Append(wx.ID_ANY,obj.formatName,obj.longFormatName)
+                                self.Bind(wx.EVT_MENU, seqMenuItemEventHandler, item)
                         #                    self.SeqExportLookup[item.GetId()] = (obj,lbl) # lookup table for submenu item
                         # Bind is in UpdateSeqResults
@@ -3412 +3417 @@
                 style = wx.TAB_TRAVERSAL|wx.SUNKEN_BORDER)
             mainSizer = wx.BoxSizer(wx.VERTICAL)
-            mainSizer.Add(wx.StaticText(self.panel,label=self.text),0,WACV)
+            mainSizer.Add(wx.StaticText(self.panel,label=self.text),0)
             mainSizer.Add((10,10))
             self.dataGridSizer = wx.FlexGridSizer(cols=2,hgap=2,vgap=2)
@@ -5612 +5617 @@
                     except AttributeError:
                         continue
-                    if 'mode' in inspect.getargspec(obj.Writer)[0]:
-                        objlist.append(obj)
+                    if '2' in platform.python_version_tuple()[0]:
+                        if 'mode' in inspect.getargspec(obj.Writer)[0]:
+                            objlist.append(obj)
+                    else:
+                        if 'mode' in inspect.getfullargspec(obj.Writer)[0]:
+                            objlist.append(obj)
             if objlist:
                 submenu = wx.Menu()
@@ -6290 +6299 @@
         text.AppendText(line+"\n")
     text.AppendText('Notebook entry @ '+time.ctime()+"\n")
-    G2frame.dataWindow.GetSizer().Add(wx.StaticText(G2frame.dataWindow,-1,' Add notes on project here: '),0,WACV)
+    G2frame.dataWindow.GetSizer().Add(wx.StaticText(G2frame.dataWindow,-1,' Add notes on project here: '),0)
     G2frame.dataWindow.GetSizer().Add(text,1,wx.ALL|wx.EXPAND)
 
@@ -6560 +6569 @@
         subSizer = wx.BoxSizer(wx.HORIZONTAL)
         subSizer.Add(wx.StaticText(G2frame.dataWindow,
-                    label='There are {} frozen variables (values refined outside limits)'
-                                .format(count)),0,WACV)
+            label='There are {} frozen variables (values refined outside limits)'.format(count)),0,WACV)
         subSizer.Add((5,-1))
         btn = wx.Button(G2frame.dataWindow, wx.ID_ANY,'Clear All Frozen')
@@ -8326 +8334 @@
     wtSizer.Add(G2G.ValidatedTxtCtrl(G2frame.dataWindow,data[0],'histTitle',typeHint=str,
         notBlank=False,size=(300,-1)),1,WACV)
-    mainSizer.Add(wtSizer,0,WACV)
+    mainSizer.Add(wtSizer,0)
     if data[0].get('Dummy',False):
         simSizer = wx.BoxSizer(wx.HORIZONTAL)

trunk/GSASIIddataGUI.py

@@ -345 +345 @@
             Sij += [val]
             matrixSizer.Add(sizeVal,0,WACV)
-        dataSizer.Add(matrixSizer, 0, WACV)
+        dataSizer.Add(matrixSizer, 0)
         Esize,Rsize = nl.eigh(G2lat.U6toUij(np.asarray(Sij)))
         lengths = Esize
@@ -352 +352 @@
         hkls = [x/(sum(x**2)**0.5) for x in np.dot(Rsize, GA)]
         Ids = np.argsort(lengths)
-        dataSizer.Add(wx.StaticText(DData,label=' Principal ellipsoid components:'),0,WACV)
+        dataSizer.Add(wx.StaticText(DData,label=' Principal ellipsoid components:'),0)
         compSizer = wx.FlexGridSizer(3,3,5,5)
         Axes = [' Short Axis:',' Middle Axis:',' Long Axis:']
@@ -411 +411 @@
                 allzero = False
             hstrainSizer.Add(hstrainVal,0,WACV)
-        hSizer.Add(hstrainSizer,0,WACV)
+        hSizer.Add(hstrainSizer,0)
         if not allzero:   # show Dij shifted unit cell
             DijVals = UseList[G2frame.hist]['HStrain'][0][:]
@@ -435 +435 @@
                 cellstr += txt+fmt.format(cell[Id])
             cellstr += ', Vol = {:.3f}'.format(G2lat.calc_V(newA))
-            hSizer.Add(wx.StaticText(DData,wx.ID_ANY,'     '+cellstr),0,WACV)
+            hSizer.Add(wx.StaticText(DData,wx.ID_ANY,'     '+cellstr),0)
         return hSizer
         
@@ -551 +551 @@
             typeSizer.Add(approxTxT)
             if UseList[G2frame.hist]['Extinction'][1] == 'None':
-                extSizer.Add(typeSizer,0,WACV)
+                extSizer.Add(typeSizer,0)
             else:
-                extSizer.Add(typeSizer,0,WACV|wx.BOTTOM,5)        
+                extSizer.Add(typeSizer,0,wx.BOTTOM,5)        
                 if 'Tbar' in UseList[G2frame.hist]['Extinction'][2]:       #skipped for TOF   
                     valSizer =wx.BoxSizer(wx.HORIZONTAL)
@@ -564 +564 @@
                         xmin=0.,xmax=1.,nDig=(10,3),typeHint=float)
                     valSizer.Add(cos2tm,0,WACV)
-                    extSizer.Add(valSizer,0,WACV)
+                    extSizer.Add(valSizer,0)
                 val2Sizer =wx.BoxSizer(wx.HORIZONTAL)
                 if 'Primary' in UseList[G2frame.hist]['Extinction'][1]:
@@ -583 +583 @@
                         xmin=0.,nDig=(10,3,'g'),typeHint=float)
                     val2Sizer.Add(Eval,0,WACV)
-                extSizer.Add(val2Sizer,0,WACV)
+                extSizer.Add(val2Sizer,0)
         else:   #PWDR
             extSizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -743 +743 @@
                         twinv.Bind(wx.EVT_CHECKBOX, OnTwinInv)
                         matSizer.Add(twinv,0,WACV)
-                twinsizer.Add(matSizer,0,WACV|wx.LEFT,5)
+                twinsizer.Add(matSizer,0,wx.LEFT,5)
                 valSizer = wx.BoxSizer(wx.HORIZONTAL)
                 valSizer.Add(wx.StaticText(DData,-1,label=' Twin element fraction:'),0,WACV)
@@ -764 +764 @@
                     twinref.Bind(wx.EVT_CHECKBOX, OnTwinRef)
                     valSizer.Add(twinref,0,WACV)
-                twinsizer.Add(valSizer,0,WACV|wx.LEFT,5)
+                twinsizer.Add(valSizer,0,wx.LEFT,5)
         return twinsizer
         
@@ -890 +890 @@
             if UseList[G2frame.hist]['LeBail']:
                 G2frame.SetStatusText('To reset LeBail, cycle LeBail check box.',1)
-        bottomSizer.Add(useBox,0,WACV|wx.TOP|wx.BOTTOM|wx.LEFT,5)
+        bottomSizer.Add(useBox,0,wx.TOP|wx.BOTTOM|wx.LEFT,5)
         fixBox = wx.BoxSizer(wx.HORIZONTAL)
         parmChoice = [' ','X','XU','U','F','FX','FXU','FU']
@@ -903 +903 @@
         #TODO - put Sequential refinement fix F? fix X? fix U? CheckBox here
         
-        bottomSizer.Add(ScaleSizer(),0,WACV|wx.BOTTOM,5)
+        bottomSizer.Add(ScaleSizer(),0,wx.BOTTOM,5)
             
         if G2frame.hist[:4] == 'PWDR':
@@ -913 +913 @@
                 isoSizer.Add(ResetSizer('isotropic',OnResetSize),0,WACV)
                 bottomSizer.Add(isoSizer)
-                bottomSizer.Add(IsoSizer(u'size(\xb5m): ','Size',(10,4),
-                    [0.,4.],OnSizeRef),0,WACV|wx.BOTTOM,5)
+                bottomSizer.Add(IsoSizer(u'size(\xb5m): ','Size',(10,4),[0.,4.],OnSizeRef),0,wx.BOTTOM,5)
             elif UseList[G2frame.hist]['Size'][0] == 'uniaxial':
                 uniSizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -921 +920 @@
                 uniSizer.Add(LGmixSizer('Size',[0.,1.],OnLGmixRef))
                 uniSizer.Add(ResetSizer('uniaxial',OnResetSize),0,WACV)
-                bottomSizer.Add(UniSizer('Size',OnSizeAxis),0,WACV)
+                bottomSizer.Add(UniSizer('Size',OnSizeAxis),0)
                 bottomSizer.Add(uniSizer)
-                bottomSizer.Add(UniDataSizer(u'size(\xb5m): ','Size',(10,3),[0.,4.],OnSizeRef)
-                    ,0,WACV|wx.BOTTOM,5)
+                bottomSizer.Add(UniDataSizer(u'size(\xb5m): ','Size',(10,3),[0.,4.],OnSizeRef),0,wx.BOTTOM,5)
             elif UseList[G2frame.hist]['Size'][0] == 'ellipsoidal':
                 ellSizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -932 +930 @@
                 ellSizer.Add(ResetSizer('ellipsoidal',OnResetSize),0,WACV)
                 bottomSizer.Add(ellSizer)
-                bottomSizer.Add(EllSizeDataSizer(),0,WACV|wx.BOTTOM,5)
+                bottomSizer.Add(EllSizeDataSizer(),0,wx.BOTTOM,5)
             
             if UseList[G2frame.hist]['Mustrain'][0] == 'isotropic':
@@ -941 +939 @@
                 isoSizer.Add(ResetSizer('isotropic',OnResetStrain),0,WACV)
                 bottomSizer.Add(isoSizer)
-                bottomSizer.Add(IsoSizer(' microstrain: ','Mustrain',(10,1),
-                    [0.,1.e5],OnStrainRef),0,WACV|wx.BOTTOM,5)
+                bottomSizer.Add(IsoSizer(' microstrain: ','Mustrain',(10,1),[0.,1.e5],OnStrainRef),0,wx.BOTTOM,5)
             elif UseList[G2frame.hist]['Mustrain'][0] == 'uniaxial':
                 uniSizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -950 +947 @@
                 uniSizer.Add(ResetSizer('uniaxial',OnResetStrain),0,WACV)
                 bottomSizer.Add(uniSizer)
-                bottomSizer.Add(UniSizer('Mustrain',OnStrainAxis),0,WACV)
-                bottomSizer.Add(UniDataSizer('mustrain: ','Mustrain',(10,1),[0.,1.e5],OnStrainRef)
-                                ,0,WACV|wx.BOTTOM,5)
+                bottomSizer.Add(UniSizer('Mustrain',OnStrainAxis),0)
+                bottomSizer.Add(UniDataSizer('mustrain: ','Mustrain',(10,1),[0.,1.e5],OnStrainRef),0,wx.BOTTOM,5)
             elif UseList[G2frame.hist]['Mustrain'][0] == 'generalized':
                 genSizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -983 +979 @@
                     poSizer.Add(wx.StaticText(DData,wx.ID_ANY,' Spherical harmonic coefficients: '+'Texture index: %.3f'%(textJ))
                         ,0,WACV|wx.TOP|wx.BOTTOM,5)
-                    poSizer.Add(SHDataSizer(POData),0,WACV|wx.TOP|wx.BOTTOM,5)
-                    poSizer.Add(SHPenalty(POData),0,WACV|wx.TOP|wx.BOTTOM,5)
+                    poSizer.Add(SHDataSizer(POData),0,wx.TOP|wx.BOTTOM,5)
+                    poSizer.Add(SHPenalty(POData),0,wx.TOP|wx.BOTTOM,5)
                     
-            bottomSizer.Add(poSizer,0,WACV|wx.TOP|wx.BOTTOM,5)
-            bottomSizer.Add(ExtSizer('PWDR'),0,WACV|wx.TOP|wx.BOTTOM,5)
+            bottomSizer.Add(poSizer,0,wx.TOP|wx.BOTTOM,5)
+            bottomSizer.Add(ExtSizer('PWDR'),0,wx.TOP|wx.BOTTOM,5)
             if generalData['Type'] != 'magnetic': 
-                bottomSizer.Add(BabSizer(),0,WACV|wx.BOTTOM,5)
+                bottomSizer.Add(BabSizer(),0,wx.BOTTOM,5)
         elif G2frame.hist[:4] == 'HKLF':
-            bottomSizer.Add(ExtSizer('HKLF'),0,WACV|wx.BOTTOM,5)
-            bottomSizer.Add(BabSizer(),0,WACV|wx.BOTTOM,5)
+            bottomSizer.Add(ExtSizer('HKLF'),0,wx.BOTTOM,5)
+            bottomSizer.Add(BabSizer(),0,wx.BOTTOM,5)
             if not SGData['SGInv'] and len(UseList[G2frame.hist]['Twins']) < 2:
-                bottomSizer.Add(FlackSizer(),0,WACV|wx.BOTTOM,5)
-            bottomSizer.Add(twinSizer(),0,WACV|wx.BOTTOM,5)
+                bottomSizer.Add(FlackSizer(),0,wx.BOTTOM,5)
+            bottomSizer.Add(twinSizer(),0,wx.BOTTOM,5)
         return bottomSizer
 
@@ -1033 +1029 @@
         DData.GetSizer().Clear(True)
     mainSizer = wx.BoxSizer(wx.VERTICAL)
-    mainSizer.Add(wx.StaticText(DData,wx.ID_ANY,' Histogram data for '+PhaseName+':'),0,WACV|wx.LEFT,5)
+    mainSizer.Add(wx.StaticText(DData,wx.ID_ANY,' Histogram data for '+PhaseName+':'),0,wx.LEFT,5)
     if G2frame.hist:
         topSizer = wx.FlexGridSizer(1,2,5,5)
@@ -1048 +1044 @@
         mainSizer.Add(G2frame.bottomSizer)
     elif not keyList:
-        mainSizer.Add(wx.StaticText(DData,wx.ID_ANY,'  (This project has no data; use Import to read it)'),
-                      0,WACV|wx.TOP,10)
+        mainSizer.Add(wx.StaticText(DData,wx.ID_ANY,
+            '  (This project has no data; use Import to read it)'),0,wx.TOP,10)
     elif not UseList in G2frame.dataWindow.HistsInPhase:
-        mainSizer.Add(wx.StaticText(DData,wx.ID_ANY,'  (This phase has no associated data; use appropriate Edit/Add... menu item)'),
-                      0,WACV|wx.TOP,10)
+        mainSizer.Add(wx.StaticText(DData,wx.ID_ANY,
+            '  (This phase has no associated data; use appropriate Edit/Add... menu item)'),0,wx.TOP,10)
     else:
-        mainSizer.Add(wx.StaticText(DData,wx.ID_ANY,'  (Strange, how did we get here?)'),
-                      0,WACV|wx.TOP,10)
+        mainSizer.Add(wx.StaticText(DData,wx.ID_ANY,'  (Strange, how did we get here?)'),0,wx.TOP,10)
         
     G2phG.SetPhaseWindow(DData,mainSizer,Scroll=Scroll)

trunk/GSASIIexprGUI.py

@@ -207 +207 @@
         if VarLabel:
             label = wx.StaticText(self,  wx.ID_ANY, VarLabel + ' = ')
-            self.exsizer.Add(label, 0, wx.ALL|wx.EXPAND|wx.ALIGN_CENTER_VERTICAL, 0)
+            self.exsizer.Add(label, 0, wx.ALL|wx.EXPAND|WACV, 0)
         elif depVarDict:
             self.depParmLists = IndexParmDict(self.depVarDict,False)
@@ -220 +220 @@
             choice.SetSelection(wx.NOT_FOUND)
             choice.Bind(wx.EVT_CHOICE,self.OnDepChoice)
-            self.exsizer.Add(choice, 0, wx.ALL|wx.EXPAND|wx.ALIGN_CENTER_VERTICAL, 0)
+            self.exsizer.Add(choice, 0, wx.ALL|wx.EXPAND|WACV, 0)
             self.exsizer.Add((5,5))
             self.depLabel = wx.StaticText(self,  wx.ID_ANY, ' ')
-            self.exsizer.Add(self.depLabel, 0, wx.ALL|wx.EXPAND|wx.ALIGN_CENTER_VERTICAL, 0)
+            self.exsizer.Add(self.depLabel, 0, wx.ALL|wx.EXPAND|WACV, 0)
             label = wx.StaticText(self,  wx.ID_ANY, ' = ')
-            self.exsizer.Add(label, 0, wx.ALL|wx.EXPAND|wx.ALIGN_CENTER_VERTICAL, 0)
+            self.exsizer.Add(label, 0, wx.ALL|wx.EXPAND|WACV, 0)
 
         #self.exCtrl = wx.TextCtrl(self,  wx.ID_ANY, size=(150,-1),style=wx.TE_PROCESS_ENTER)
@@ -233 +233 @@
         self.exCtrl.Bind(wx.EVT_COMBOBOX, self.OnValidate)
         self.exCtrl.Bind(wx.EVT_TEXT_ENTER, self.OnValidate)
-        self.exsizer.Add(self.exCtrl, 1, wx.ALL|wx.EXPAND|wx.ALIGN_CENTER_VERTICAL, 0)
+        self.exsizer.Add(self.exCtrl, 1, wx.ALL|wx.EXPAND|WACV, 0)
         #self.mainsizer.Add(self.exCtrl, 0, wx.ALL|wx.EXPAND, 5)
         self.mainsizer.Add(self.exsizer, 0, wx.ALL|wx.EXPAND, 5)
@@ -257 +257 @@
             self.ExtraCallBack = ExtraButton[1]
             self.ExtraBtn.Disable()
-            bSizer.Add(self.ExtraBtn, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 2)
+            bSizer.Add(self.ExtraBtn, 0, wx.ALL|WACV, 2)
         else:
             self.ExtraBtn = None
@@ -268 +268 @@
         btnsizer.AddButton(btn)
         btnsizer.Realize()
-        bSizer.Add(btnsizer, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5)
-        self.mainsizer.Add(bSizer, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL|wx.EXPAND, 5)
+        bSizer.Add(btnsizer, 0, WACV|wx.ALL, 5)
+        self.mainsizer.Add(bSizer, 0, wx.ALL|wx.EXPAND, 5)
         self.SetSizer(self.mainsizer)
         self.CenterOnParent()
@@ -752 +752 @@
         self.panel = wx.Panel(self)
         mainSizer = wx.BoxSizer(wx.VERTICAL)
-        mainSizer.Add(wx.StaticText(self.panel,label=self.header),0,WACV)
+        mainSizer.Add(wx.StaticText(self.panel,label=self.header),0)
         pNames = list(self.Phases.keys())
         phaseSizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -895 +895 @@
         if self.Oatom:
             neigh = G2mth.FindAllNeighbors(Phase,self.Oatom,aNames)[0]
-            mainSizer.Add(wx.StaticText(self.panel,label=' A-O-B angle for A,B: '),0,WACV)
+            mainSizer.Add(wx.StaticText(self.panel,label=' A-O-B angle for A,B: '),0)
             bNames = ['',]
             if neigh:
@@ -904 +904 @@
                     style=wx.CB_READONLY|wx.CB_DROPDOWN)
                 targAtoms.Bind(wx.EVT_COMBOBOX,OnTargAtoms)
-                mainSizer.Add(targAtoms,0,WACV)
+                mainSizer.Add(targAtoms,0)
 
 

trunk/GSASIIfiles.py

@@ -22 +22 @@
 '''
 from __future__ import division, print_function
+import platform
 import os
 import sys
 import glob
+import inspect
+import numpy as np
 import imp
-import inspect
-import platform
-import numpy as np
 
 import GSASIIpath

trunk/GSASIIfpaGUI.py

@@ -32 +32 @@
 import GSASIImath as G2mth
 import GSASIIpwd as G2pwd
+WACV = wx.ALIGN_CENTER_VERTICAL
 
 simParms = {}
@@ -140 +141 @@
     prmSizer.Add(text,0,wx.EXPAND)
     for lbl,defVal,text in itemList:
-        prmSizer.Add(wx.StaticText(prmPnl,wx.ID_ANY,lbl),1,wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL,1)
+        prmSizer.Add(wx.StaticText(prmPnl,wx.ID_ANY,lbl),1,wx.ALIGN_RIGHT|WACV,1)
         if lbl not in parmDict: parmDict[lbl] = defVal
         ctrl = G2G.ValidatedTxtCtrl(prmPnl,parmDict,lbl,size=(70,-1))
-        prmSizer.Add(ctrl,1,wx.ALL|wx.ALIGN_CENTER_VERTICAL,1)
+        prmSizer.Add(ctrl,1,wx.ALL|WACV,1)
         txt = wx.StaticText(prmPnl,wx.ID_ANY,text,size=(400,-1))
         txt.Wrap(380)
@@ -251 +252 @@
             if i not in parmDict[prm]: parmDict[prm][i] = defVal
             ctrl = G2G.ValidatedTxtCtrl(FPdlg,parmDict[prm],i,size=(90,-1))
-            waveSizer.Add(ctrl,1,wx.ALIGN_CENTER_VERTICAL,1)
+            waveSizer.Add(ctrl,1,WACV,1)
     MainSizer.Add(waveSizer)
     MainSizer.Add((-1,5))
@@ -598 +599 @@
         bxye = np.zeros(len(histData[1][1]))
         peakData['sigDict'] = G2pwd.DoPeakFit('LSQ',peakData['peaks'],
-                                            bkg,limits[1],
-                                            Parms,Parms2,histData[1],bxye,[],
-                                           False,controldat)[0]
+            bkg,limits[1],Parms,Parms2,histData[1],bxye,[],False,controldat)[0]
         pgbar.Update(20,newmsg='Refining peak positions && areas')
         # refine peak areas as well
@@ -606 +605 @@
             pk[1] = True
         peakData['sigDict'] = G2pwd.DoPeakFit('LSQ',peakData['peaks'],
-                                            bkg,limits[1],
-                                            Parms,Parms2,histData[1],bxye,[],
-                                           False,controldat)[0]
+            bkg,limits[1],Parms,Parms2,histData[1],bxye,[],False,controldat)[0]
         pgbar.Update(40,newmsg='Refining profile function')
         # refine profile function
@@ -614 +611 @@
             Parms[p][2] = True
         peakData['sigDict'] = G2pwd.DoPeakFit('LSQ',peakData['peaks'],
-                                            bkg,limits[1],
-                                            Parms,Parms2,histData[1],bxye,[],
-                                           False,controldat)[0]
+            bkg,limits[1],Parms,Parms2,histData[1],bxye,[],False,controldat)[0]
         pgbar.Update(70,newmsg='Refining profile function && asymmetry')
         # add in asymmetry
         Parms['SH/L'][2] = True
         peakData['sigDict'] = G2pwd.DoPeakFit('LSQ',peakData['peaks'],
-                                            bkg,limits[1],
-                                            Parms,Parms2,histData[1],bxye,[],
-                                           False,controldat)[0]
+            bkg,limits[1],Parms,Parms2,histData[1],bxye,[],False,controldat)[0]
         pgbar.Update(100,newmsg='Done')
         # reset "initial" profile
@@ -719 +712 @@
         if key not in simParms: simParms[key] = defVal
         ctrl = G2G.ValidatedTxtCtrl(dlg,simParms,key,size=(70,-1))
-        prmSizer.Add(ctrl,1,wx.ALL|wx.ALIGN_CENTER_VERTICAL,1)
+        prmSizer.Add(ctrl,1,wx.ALL|WACV,1)
         txt = wx.StaticText(dlg,wx.ID_ANY,text,size=(300,-1))
         txt.Wrap(280)
@@ -737 +730 @@
     MainSizer.Add(btnsizer, 0, wx.ALIGN_CENTER, 0)
     MainSizer.Add((-1,4),1,wx.EXPAND,1)
-    txt = wx.StaticText(dlg,wx.ID_ANY,
-                            'If you use this, please cite: '+Citation,
-                            size=(350,-1))
+    txt = wx.StaticText(dlg,wx.ID_ANY,'If you use this, please cite: '+Citation,size=(350,-1))
     txt.Wrap(340)
     MainSizer.Add(txt,0,wx.ALIGN_CENTER)

trunk/GSASIIimgGUI.py

@@ -158 +158 @@
     mainSizer = G2frame.dataWindow.GetSizer()
     mainSizer.Add(wx.StaticText(G2frame.dataWindow,
-        label='Do not change anything here unless you are absolutely sure!'),0,WACV)
-    mainSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Image size: %d by %d'%(data['size'][0],data['size'][1])),0,WACV)
+        label='Do not change anything here unless you are absolutely sure!'),0)
+    mainSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Image size: %d by %d'%(data['size'][0],data['size'][1])),0)
     pixSize = wx.FlexGridSizer(0,4,5,5)
     pixLabels = [u' Pixel X-dimension (\xb5m)',u' Pixel Y-dimension (\xb5m)']
@@ -2930 +2930 @@
         lblsizr = wx.StaticBoxSizer(lbl, wx.VERTICAL)
         lblsizr.Add(wx.StaticText(mnpnl, wx.ID_ANY,'Use integration parameters from:'))
-        self.useActive = wx.RadioButton(mnpnl, wx.ID_ANY, 
-                            style = wx.RB_GROUP)
+        self.useActive = wx.RadioButton(mnpnl, wx.ID_ANY, style = wx.RB_GROUP)
         self.useActive.Bind(wx.EVT_RADIOBUTTON, OnRadioSelect)
-        self.useActive.SetLabel("Active Image: "+
-                                G2frame.GPXtree.GetItemText(self.imageBase))
+        self.useActive.SetLabel("Active Image: "+G2frame.GPXtree.GetItemText(self.imageBase))
         lblsizr.Add(self.useActive,0,wx.EXPAND,1)
         self.useActive.SetValue(True)
@@ -2957 +2955 @@
         btn3 = wx.Button(mnpnl, wx.ID_ANY, "Browse")
         btn3.Bind(wx.EVT_BUTTON, self.SetSourceDir)
-        sizer.Add(btn3,0,wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL)
+        sizer.Add(btn3,0,wx.ALIGN_RIGHT|WACV)
         mnsizer.Add(sizer,0,wx.EXPAND,0)
         # not yet implemented
@@ -2981 +2979 @@
         lblsizr = wx.StaticBoxSizer(lbl, wx.VERTICAL)
         sizer = wx.BoxSizer(wx.HORIZONTAL)
-        sizer.Add(wx.StaticText(mnpnl, wx.ID_ANY,'Write to: '),0,wx.ALIGN_CENTER_VERTICAL)
+        sizer.Add(wx.StaticText(mnpnl, wx.ID_ANY,'Write to: '),0,WACV)
         fInp3 = G2G.ValidatedTxtCtrl(mnpnl,self.params,'outdir',notBlank=False,size=(300,-1))
-        sizer.Add(fInp3,1,wx.ALIGN_CENTER_VERTICAL|wx.EXPAND)
+        sizer.Add(fInp3,1,WACV|wx.EXPAND)
         btn3 = wx.Button(mnpnl,  wx.ID_ANY, "Browse")
         btn3.Bind(wx.EVT_BUTTON, OnBrowse)
-        sizer.Add(btn3,0,wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL)
+        sizer.Add(btn3,0,wx.ALIGN_RIGHT|WACV)
         lblsizr.Add(sizer,0,wx.EXPAND)
         sizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -3025 +3023 @@
         #ToDO: Autonormalize, parm name?, scaling value?
         sizer = wx.BoxSizer(wx.HORIZONTAL)
-        sizer.Add(wx.StaticText(mnpnl, wx.ID_ANY,'Autocompute PDF:'),0,wx.ALIGN_CENTER_VERTICAL)
+        sizer.Add(wx.StaticText(mnpnl, wx.ID_ANY,'Autocompute PDF:'),0,WACV)
         sizer.Add(G2G.G2CheckBox(mnpnl,'',self.params,'ComputePDF',OnChange=showPDFctrls))
         lbl4a = wx.StaticText(mnpnl, wx.ID_ANY,'Max detector distance: ')
-        sizer.Add(lbl4a,0,wx.ALIGN_CENTER_VERTICAL)
+        sizer.Add(lbl4a,0,WACV)
         fInp4a = G2G.ValidatedTxtCtrl(mnpnl,self.params,'pdfDmax',xmin=0.0)
-        sizer.Add(fInp4a,0,wx.ALIGN_CENTER_VERTICAL)
+        sizer.Add(fInp4a,0,WACV)
         cOpt = G2G.G2CheckBox(mnpnl,'Optimize',self.params,'optPDF')
         sizer.Add(cOpt)
@@ -3036 +3034 @@
         sizer = wx.BoxSizer(wx.HORIZONTAL)
         lbl4 = wx.StaticText(mnpnl, wx.ID_ANY,'PDF control: ')
-        sizer.Add(lbl4,0,wx.ALIGN_CENTER_VERTICAL)
+        sizer.Add(lbl4,0,WACV)
         fInp4 = G2G.ValidatedTxtCtrl(mnpnl,self.params,'pdfprm',notBlank=True,size=(300,-1),
                                      OnLeave=scanPDFprm)
-        sizer.Add(fInp4,1,wx.ALIGN_CENTER_VERTICAL|wx.EXPAND)
+        sizer.Add(fInp4,1,WACV|wx.EXPAND)
         btn4 = wx.Button(mnpnl,  wx.ID_ANY, "Browse")
         btn4.Bind(wx.EVT_BUTTON, OnBrowse)
-        sizer.Add(btn4,0,wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL)
+        sizer.Add(btn4,0,wx.ALIGN_RIGHT|WACV)
         lblsizr.Add(sizer,0,wx.EXPAND)
         mnsizer.Add(lblsizr,0,wx.ALIGN_CENTER|wx.EXPAND,1)

trunk/GSASIIphsGUI.py

@@ -116 +116 @@
             self.force = wx.RadioBox(panel,-1,'Force to unit cell?',choices=choice)
             self.force.Bind(wx.EVT_RADIOBOX, self.OnOpSelect)
-            mainSizer.Add(self.force,0,WACV|wx.TOP,5)
+            mainSizer.Add(self.force,0,wx.TOP,5)
 #        if SGData['SGInv']:
         choice = ['No','Yes']
         self.inv = wx.RadioBox(panel,-1,'Choose inversion?',choices=choice)
         self.inv.Bind(wx.EVT_RADIOBOX, self.OnOpSelect)
-        mainSizer.Add(self.inv,0,WACV)
+        mainSizer.Add(self.inv,0)
         if SGData['SGLatt'] != 'P':
             LattOp = G2spc.Latt2text(SGData['SGCen']).split(';')
             self.latt = wx.RadioBox(panel,-1,'Choose cell centering?',choices=LattOp)
             self.latt.Bind(wx.EVT_RADIOBOX, self.OnOpSelect)
-            mainSizer.Add(self.latt,0,WACV)
+            mainSizer.Add(self.latt,0)
         if SGData['SGLaue'] in ['-1','2/m','mmm','4/m','4/mmm']:
             Ncol = 2
@@ -137 +137 @@
             majorDimension=Ncol)
         self.oprs.Bind(wx.EVT_RADIOBOX, self.OnOpSelect)
-        mainSizer.Add(self.oprs,0,WACV|wx.BOTTOM,5)
-        mainSizer.Add(wx.StaticText(panel,-1,"   Choose unit cell?"),0,WACV)
+        mainSizer.Add(self.oprs,0,wx.BOTTOM,5)
+        mainSizer.Add(wx.StaticText(panel,-1,"   Choose unit cell?"),0)
         cellSizer = wx.BoxSizer(wx.HORIZONTAL)
         cellName = ['X','Y','Z']
@@ -147 +147 @@
             self.cell[-1].SetValue(0)
             self.cell[-1].Bind(wx.EVT_SPINCTRL, self.OnOpSelect)
-            cellSizer.Add(self.cell[-1],0,WACV)
-        mainSizer.Add(cellSizer,0,WACV|wx.BOTTOM,5)
+            cellSizer.Add(self.cell[-1],0)
+        mainSizer.Add(cellSizer,0,wx.BOTTOM,5)
         if self.New:
             choice = ['No','Yes']
             self.new = wx.RadioBox(panel,-1,'Generate new positions?',choices=choice)
             self.new.Bind(wx.EVT_RADIOBOX, self.OnOpSelect)
-            mainSizer.Add(self.new,0,WACV)
+            mainSizer.Add(self.new,0)
 
         OkBtn = wx.Button(panel,-1,"Ok")
@@ -229 +229 @@
         self.panel = wx.Panel(self)
         mainSizer = wx.BoxSizer(wx.VERTICAL)
-        mainSizer.Add(wx.StaticText(self.panel,label=' Sphere of enclosure controls:'),0,WACV)
+        mainSizer.Add(wx.StaticText(self.panel,label=' Sphere of enclosure controls:'),0)
         topSizer = wx.BoxSizer(wx.HORIZONTAL)
         atoms = []
@@ -248 +248 @@
             topSizer.Add(wx.StaticText(self.panel,label=' Sphere centered at drawing view point'),0,WACV)
             self.centers.append(self.Drawing['viewPoint'][0])
-        mainSizer.Add(topSizer,0,WACV)
+        mainSizer.Add(topSizer,0)
         sphereSizer = wx.BoxSizer(wx.HORIZONTAL)
         sphereSizer.Add(wx.StaticText(self.panel,label=' Sphere radius: '),0,WACV)
         radius = G2G.ValidatedTxtCtrl(self.panel,self.Sphere,0,nDig=(10,3),size=(65,25))
         sphereSizer.Add(radius,0,WACV)
-        mainSizer.Add(sphereSizer,0,WACV)
-        mainSizer.Add(wx.StaticText(self.panel,label=' Target selected atoms:'),0,WACV)
+        mainSizer.Add(sphereSizer,0)
+        mainSizer.Add(wx.StaticText(self.panel,label=' Target selected atoms:'),0)
         atSizer = wx.BoxSizer(wx.HORIZONTAL)
         Ind = {}
@@ -263 +263 @@
             Ind[atm.GetId()] = i
             atSizer.Add(atm,0,WACV)
-        mainSizer.Add(atSizer,0,WACV)
+        mainSizer.Add(atSizer,0)
         
         OkBtn = wx.Button(self.panel,-1,"Ok")
@@ -460 +460 @@
             mag = wx.Button(self.panel,label='Make new phase magnetic?')
             mag.Bind(wx.EVT_BUTTON,OnMag)
-            mainSizer.Add(mag,0,WACV)            
+            mainSizer.Add(mag,0)            
         MatSizer = wx.BoxSizer(wx.HORIZONTAL)
         transSizer = wx.BoxSizer(wx.VERTICAL)
@@ -508 +508 @@
                 Mtrans.Bind(wx.EVT_CHECKBOX,OnMtrans)
                 MagSizer.Add(Mtrans,0,WACV)
-            mainSizer.Add(MagSizer,0,WACV)
-        mainSizer.Add(wx.StaticText(self.panel,label=' Old lattice parameters:'),0,WACV)
+            mainSizer.Add(MagSizer,0)
+        mainSizer.Add(wx.StaticText(self.panel,label=' Old lattice parameters:'),0)
         mainSizer.Add(wx.StaticText(self.panel,label=
-            ' a = %.5f       b = %.5f      c = %.5f'%(self.oldCell[0],self.oldCell[1],self.oldCell[2])),0,WACV)
+            ' a = %.5f       b = %.5f      c = %.5f'%(self.oldCell[0],self.oldCell[1],self.oldCell[2])),0)
         mainSizer.Add(wx.StaticText(self.panel,label=' alpha = %.3f beta = %.3f gamma = %.3f'%
-            (self.oldCell[3],self.oldCell[4],self.oldCell[5])),0,WACV)
-        mainSizer.Add(wx.StaticText(self.panel,label=' volume = %.3f'%(self.oldCell[6])),0,WACV)
-        mainSizer.Add(wx.StaticText(self.panel,label=' New lattice parameters:'),0,WACV)
+            (self.oldCell[3],self.oldCell[4],self.oldCell[5])),0)
+        mainSizer.Add(wx.StaticText(self.panel,label=' volume = %.3f'%(self.oldCell[6])),0)
+        mainSizer.Add(wx.StaticText(self.panel,label=' New lattice parameters:'),0)
         mainSizer.Add(wx.StaticText(self.panel,label=
-            ' a = %.5f       b = %.5f      c = %.5f'%(self.newCell[0],self.newCell[1],self.newCell[2])),0,WACV)
+            ' a = %.5f       b = %.5f      c = %.5f'%(self.newCell[0],self.newCell[1],self.newCell[2])),0)
         mainSizer.Add(wx.StaticText(self.panel,label=' alpha = %.3f beta = %.3f gamma = %.3f'%
-            (self.newCell[3],self.newCell[4],self.newCell[5])),0,WACV)
-        mainSizer.Add(wx.StaticText(self.panel,label=' volume = %.3f'%(self.newCell[6])),0,WACV)
+            (self.newCell[3],self.newCell[4],self.newCell[5])),0)
+        mainSizer.Add(wx.StaticText(self.panel,label=' volume = %.3f'%(self.newCell[6])),0)
         sgSizer = wx.BoxSizer(wx.HORIZONTAL)
         sgSizer.Add(wx.StaticText(self.panel,label=' Target space group: '),0,WACV)
@@ -529 +529 @@
         showOps.Bind(wx.EVT_BUTTON,OnShowOps)
         sgSizer.Add(showOps,0,WACV)
-        mainSizer.Add(sgSizer,0,WACV)
+        mainSizer.Add(sgSizer,0)
         if 'magnetic' not in self.Phase['General']['Type']:
             if self.ifMag:
@@ -559 +559 @@
                 OprNames,SpnFlp = G2spc.GenMagOps(self.SGData)
                 self.SGData['SpnFlp'] = SpnFlp
-                mainSizer.Add(BNSizer,0,WACV)
-                mainSizer.Add(wx.StaticText(self.panel,label=' Magnetic Space Group: '+self.SGData['MagSpGrp']),0,WACV)
+                mainSizer.Add(BNSizer,0)
+                mainSizer.Add(wx.StaticText(self.panel,label=' Magnetic Space Group: '+self.SGData['MagSpGrp']),0)
             if self.ifMag:
                 mainSizer.Add(wx.StaticText(self.panel, \
-                    label=' NB: Nonmagnetic atoms will be deleted from new phase'),0,WACV)
+                    label=' NB: Nonmagnetic atoms will be deleted from new phase'),0)
             constr = wx.CheckBox(self.panel,label=' Make constraints between phases?')
             constr.SetValue(self.ifConstr)
             constr.Bind(wx.EVT_CHECKBOX,OnConstr)
-            mainSizer.Add(constr,0,WACV)
+            mainSizer.Add(constr,0)
         TestBtn = wx.Button(self.panel,-1,"Test")
         TestBtn.Bind(wx.EVT_BUTTON, OnTest)
@@ -648 +648 @@
         Xstr = ['X','Y','Z']
         mainSizer = wx.BoxSizer(wx.VERTICAL)
-        mainSizer.Add(wx.StaticText(self.panel,label='For: %s'%self.Name),0,WACV)
+        mainSizer.Add(wx.StaticText(self.panel,label='For: %s'%self.Name),0)
         
         if self.ifMag:
-            mainSizer.Add(wx.StaticText(self.panel,label='        Name, x, y, z, allowed moments, mag. site sym:'),0,WACV)
+            mainSizer.Add(wx.StaticText(self.panel,label='        Name, x, y, z, allowed moments, mag. site sym:'),0)
         else:
-            mainSizer.Add(wx.StaticText(self.panel,label='        Name, x, y, z, allowed xyz, site sym:'),0,WACV)
+            mainSizer.Add(wx.StaticText(self.panel,label='        Name, x, y, z, allowed xyz, site sym:'),0)
         atmSizer = wx.FlexGridSizer(0,2,5,5)
         for iuse,[use,atom,mxyz] in enumerate(zip(self.Use,self.Atoms,self.atMxyz)):
@@ -804 +804 @@
         rotvec.Bind(wx.EVT_KILL_FOCUS,OnRotVec)
         rotationBox.Add(rotvec,0,WACV)
-        mainSizer.Add(rotationBox,0,WACV)
+        mainSizer.Add(rotationBox,0)
         expandChoice = ['','xy','xz','yz','xyz']
         expandBox = wx.BoxSizer(wx.HORIZONTAL)
@@ -901 +901 @@
         self.panel = wx.Panel(self)
         mainSizer = wx.BoxSizer(wx.VERTICAL)
-        mainSizer.Add(wx.StaticText(self.panel,label=' Controls for DIFFaX'),0,WACV)
+        mainSizer.Add(wx.StaticText(self.panel,label=' Controls for DIFFaX'),0)
         if self.Parms:
-            mainSizer.Add(wx.StaticText(self.panel,label=' Sequential powder pattern simulation'),0,WACV)
+            mainSizer.Add(wx.StaticText(self.panel,label=' Sequential powder pattern simulation'),0)
         else:
             calcChoice = ['powder pattern','selected area']
@@ -1030 +1030 @@
         mainSizer.Add(wx.StaticText(self.panel,-1,'H atom add controls for phase %s:'%(phase['General']['Name'])),
             0,wx.LEFT|wx.TOP,10)
-        mainSizer.Add(wx.StaticText(self.panel,-1,'NB: Check selections as they may not be correct'),0,WACV|wx.LEFT,10)
+        mainSizer.Add(wx.StaticText(self.panel,-1,'NB: Check selections as they may not be correct'),0|wx.LEFT,10)
         mainSizer.Add(wx.StaticText(self.panel,-1," Atom:  Add # H's          Use: Neighbors, dist"),0,wx.TOP|wx.LEFT,5)
         nHatms = ['0','1','2','3']
@@ -2302 +2302 @@
                 MagSym += " 1'"
             magSizer = wx.BoxSizer(wx.VERTICAL)
-            magSizer.Add(wx.StaticText(General,label=' Magnetic spin operator selection:'),0,WACV)
+            magSizer.Add(wx.StaticText(General,label=' Magnetic spin operator selection:'),0)
             spinSizer = wx.BoxSizer(wx.HORIZONTAL)
             if SGData['SGFixed']:
@@ -2349 +2349 @@
             dminVal = G2G.ValidatedTxtCtrl(General,generalData,'MagDmin',nDig=(10,4),xmin=0.7)
             dminSizer.Add(dminVal,0,WACV)
-            magSizer.Add(dminSizer,0,WACV)
+            magSizer.Add(dminSizer,0)
             return magSizer
             
@@ -2445 +2445 @@
                 Max.Bind(wx.EVT_COMBOBOX,OnMax)        
                 modSizer.Add(Max,0,WACV)
-            ssSizer.Add(modSizer,0,WACV)
+            ssSizer.Add(modSizer,0)
             vecSizer = wx.FlexGridSizer(1,5,5,5)
             vecSizer.Add(wx.StaticText(General,label=' Modulation vector: '),0,WACV)
@@ -2562 +2562 @@
             refList.Bind(wx.EVT_BUTTON,OnRefList)
             lineSizer.Add(refList,0,WACV)
-            mapSizer.Add(lineSizer,0,WACV)
+            mapSizer.Add(lineSizer,0)
             line2Sizer = wx.BoxSizer(wx.HORIZONTAL)
             line2Sizer.Add(wx.StaticText(General,label=' Map grid step: '),0,WACV)
@@ -2576 +2576 @@
                     Dysno.Bind(wx.EVT_CHECKBOX,OnDysnomia)
                     line2Sizer.Add(Dysno,0,WACV)
-            mapSizer.Add(line2Sizer,0,WACV)
+            mapSizer.Add(line2Sizer,0)
             return mapSizer
                 
@@ -2636 +2636 @@
             normElem.Bind(wx.EVT_BUTTON,OnNormElem)
             lineSizer.Add(normElem,0,WACV)
-            flipSizer.Add(lineSizer,0,WACV)
+            flipSizer.Add(lineSizer,0)
             line2Sizer = wx.BoxSizer(wx.HORIZONTAL)
             line2Sizer.Add(wx.StaticText(General,label=' Map grid step: '),0,WACV)
@@ -2647 +2647 @@
             kMax = G2G.ValidatedTxtCtrl(General,Flip,'k-Max',nDig=(10,1),xmin=10.)
             line2Sizer.Add(kMax,0,WACV)
-            flipSizer.Add(line2Sizer,0,WACV)
+            flipSizer.Add(line2Sizer,0)
             line3Sizer = wx.BoxSizer(wx.HORIZONTAL)
             line3Sizer.Add(wx.StaticText(General,label=' Test HKLs:'),0,WACV)
@@ -2865 +2865 @@
             atTypes = generalData['AtomTypes']
             compSizer = wx.BoxSizer(wx.VERTICAL)
-            compSizer.Add(wx.StaticText(General,label=' Compare polyhedra to ideal octahedra/tetrahedra:'),0,WACV)
+            compSizer.Add(wx.StaticText(General,label=' Compare polyhedra to ideal octahedra/tetrahedra:'),0)
                     
             atmselSizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -2890 +2890 @@
             except KeyError:
                 pass
-            compSizer.Add(atmselSizer,0,WACV)
+            compSizer.Add(atmselSizer,0)
             return compSizer
             
@@ -4844 +4844 @@
                             
             Indx = {}
-            mainSizer.Add(wx.StaticText(G2frame.FRMC,label='Select data for processing: '),0,WACV)
+            mainSizer.Add(wx.StaticText(G2frame.FRMC,label='Select data for processing: '),0)
             if G2frame.RMCchoice == 'fullrmc':
                 Heads = ['Name','File','Weight','type','Plot','Delete']
@@ -4859 +4859 @@
                     fileSizer.Add(filSel,0,WACV)
                     if Rfile and os.path.exists(Rfile): # in case .gpx file is moved away from G(R), F(Q), etc. files
-                        fileSizer.Add(G2G.ValidatedTxtCtrl(G2frame.FRMC,RMCPdict['files'][fil],1,
-                                                               size=(50,25)),0,WACV)
+                        fileSizer.Add(G2G.ValidatedTxtCtrl(G2frame.FRMC,RMCPdict['files'][fil],1,size=(50,25)),0,WACV)
                         #patch
                         if len(RMCPdict['files'][fil]) < 4:
@@ -4903 +4902 @@
                         fileSizer.Add((-1,-1),0)
                         fileSizer.Add((-1,-1),0)
-                mainSizer.Add(fileSizer,0,WACV)
+                mainSizer.Add(fileSizer,0)
                 fitscale = wx.CheckBox(G2frame.FRMC,label=' Fit scale factors?')
                 fitscale.SetValue(RMCPdict['FitScale'])
                 fitscale.Bind(wx.EVT_CHECKBOX,OnFitScale)
-                mainSizer.Add(fitscale,0,WACV)
+                mainSizer.Add(fitscale,0)
                 mainSizer.Add(wx.StaticText(G2frame.FRMC,
-                    label=' NB: fullrmc data files must be 2 columns; all other lines preceeded by "#". Edit before use.'),0,WACV)
+                    label=' NB: fullrmc data files must be 2 columns; all other lines preceeded by "#". Edit before use.'),0)
                 return 
             # RMCProfile
@@ -4947 +4946 @@
                     fileSizer.Add((5,5),0)
                     fileSizer.Add((5,5),0)
-            mainSizer.Add(fileSizer,0,WACV)
+            mainSizer.Add(fileSizer,0)
             fitscale = wx.CheckBox(G2frame.FRMC,label=' Fit scale factors?')
             fitscale.SetValue(RMCPdict['FitScale'])
             fitscale.Bind(wx.EVT_CHECKBOX,OnFitScale)
-            mainSizer.Add(fitscale,0,WACV)
+            mainSizer.Add(fitscale,0)
             return
         
@@ -4973 +4972 @@
         RMCsel.SetStringSelection(G2frame.RMCchoice)
         RMCsel.Bind(wx.EVT_RADIOBOX, OnRMCselect)
-        mainSizer.Add(RMCsel,0,WACV)
-        mainSizer.Add((5,5),0,WACV)
+        mainSizer.Add(RMCsel,0)
+        mainSizer.Add((5,5),0)
         if G2frame.RMCchoice == 'fullrmc':
             try:
@@ -4995 +4994 @@
             G2frame.dataWindow.FRMCDataEdit.Enable(G2G.wxID_RUNRMC,True)
             G2frame.dataWindow.FRMCDataEdit.Enable(G2G.wxID_VIEWRMC,True)
-            #mainSizer.Add(wx.StaticText(G2frame.FRMC,label=' fullrmc big box starting pdb file preparation:'),0,WACV)
+            #mainSizer.Add(wx.StaticText(G2frame.FRMC,label=' fullrmc big box starting pdb file preparation:'),0)
             if not data['RMC']['fullrmc']:
                 Atypes = [atype.split('+')[0].split('-')[0] for atype in data['General']['AtomTypes']]
@@ -5095 +5094 @@
                             coloff = 1
                         angleSizer.Add(wx.StaticText(G2frame.FRMC,label=fxcnLabels1[i]),
-                                       (0,i-coloff),(1,cspan))
+                            (0,i-coloff),(1,cspan))
                     if fxcnLabels2[i]:
                         angleSizer.Add(wx.StaticText(G2frame.FRMC,wx.ID_ANY,
-                                                    label=fxcnLabels2[i],style=wx.CENTER),
-                                       (1,i))
+                            label=fxcnLabels2[i],style=wx.CENTER),(1,i))
                 row = 1
                 for ifx,angle in enumerate(RMCPdict['Angles']):
@@ -5198 +5196 @@
             #lineSizer.Add(G2G.G2CheckBox(G2frame.FRMC,'Impose periodic boundaries',RMCPdict,'periodicBound'),
             #                  0,WACV)
-            mainSizer.Add(lineSizer,0,WACV)
+            mainSizer.Add(lineSizer,0)
             if ifBox:
                 molecSizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -5209 +5207 @@
                 molecSizer.Add(wx.StaticText(G2frame.FRMC,label=' max tries '),0,WACV)
                 molecSizer.Add(G2G.ValidatedTxtCtrl(G2frame.FRMC,RMCPdict,'maxRecursion',xmin=1000,xmax=1000000,size=[60,25]),0,WACV)
-                mainSizer.Add(molecSizer,0,WACV)
+                mainSizer.Add(molecSizer,0)
             G2G.HorizontalLine(mainSizer,G2frame.FRMC)
             mainSizer.Add(wx.StaticText(G2frame.FRMC,label=' fullrmc run file preparation:'),0,WACV)
@@ -5219 +5217 @@
             resLine.Add(wx.StaticText(G2frame.FRMC,label=' 10,000X Computation cycles: '),0,WACV)
             resLine.Add(G2G.ValidatedTxtCtrl(G2frame.FRMC,RMCPdict,'Cycles',xmin=1,size=[60,25]),0,WACV)
-            mainSizer.Add(resLine,0,WACV)
+            mainSizer.Add(resLine,0)
                 
             G2G.HorizontalLine(mainSizer,G2frame.FRMC)
-            mainSizer.Add(GetAtmChoice(RMCPdict),0,WACV)
+            mainSizer.Add(GetAtmChoice(RMCPdict),0)
             
             G2G.HorizontalLine(mainSizer,G2frame.FRMC)
@@ -5230 +5228 @@
             swapAdd.Bind(wx.EVT_BUTTON,OnAddSwap)
             swapBox.Add(swapAdd,0,WACV)
-            mainSizer.Add(swapBox,0,WACV)        
+            mainSizer.Add(swapBox,0)        
             if len(RMCPdict['Swaps']):
-                mainSizer.Add(GetSwapSizer(RMCPdict),0,WACV)            
+                mainSizer.Add(GetSwapSizer(RMCPdict),0)            
 
             G2G.HorizontalLine(mainSizer,G2frame.FRMC)
-            mainSizer.Add(wx.StaticText(G2frame.FRMC,label='Geometry constraints && restraints'),0,WACV)
+            mainSizer.Add(wx.StaticText(G2frame.FRMC,label='Geometry constraints && restraints'),0)
             distBox = wx.BoxSizer(wx.HORIZONTAL)
             distBox.Add(wx.StaticText(G2frame.FRMC,label=' Distance constraints, weight: :'),0,WACV)        
@@ -5241 +5239 @@
             distBox.Add(wx.StaticText(G2frame.FRMC,label=' min contact dist: '),0,WACV)
             distBox.Add(G2G.ValidatedTxtCtrl(G2frame.FRMC,RMCPdict,'min Contact',xmin=0.,xmax=4.,size=(50,25)),0,WACV)            
-            mainSizer.Add(distBox,0,WACV)
-            mainSizer.Add(GetPairSizer(RMCPdict),0,WACV)
+            mainSizer.Add(distBox,0)
+            mainSizer.Add(GetPairSizer(RMCPdict),0)
 
             mainSizer.Add((-1,10))
@@ -5252 +5250 @@
             angAdd.Bind(wx.EVT_BUTTON,OnAddAngle)
             angBox.Add(angAdd,0,WACV)
-            mainSizer.Add(angBox,0,WACV)
+            mainSizer.Add(angBox,0)
             if len(RMCPdict['Angles']):
-                mainSizer.Add(GetAngleSizer(),0,WACV)
+                mainSizer.Add(GetAngleSizer(),0)
 
             # Torsions are difficult to implement. Need to be internal to a unit cell & named with fullrmc
@@ -5264 +5262 @@
             # torBox.Add(wx.StaticText(G2frame.FRMC,label=' A-B-C-D torsion angle restraints (intracell only), weight: '),0,WACV)
             # torBox.Add(G2G.ValidatedTxtCtrl(G2frame.FRMC,RMCPdict,'Torsion Weight',xmin=0.,xmax=100.,size=(50,25)),0,WACV)
-            # mainSizer.Add(torBox,0,WACV)
+            # mainSizer.Add(torBox,0)
             # if len(RMCPdict['Torsions']):
-            #     mainSizer.Add(GetTorsionSizer(),0,WACV)
+            #     mainSizer.Add(GetTorsionSizer(),0)
     
             G2G.HorizontalLine(mainSizer,G2frame.FRMC)
@@ -5559 +5557 @@
             Indx = {}
 
-            mainSizer.Add(wx.StaticText(G2frame.FRMC,label=' Enter metadata items:'),0,WACV)
-            mainSizer.Add(GetMetaSizer(),0,WACV)
+            mainSizer.Add(wx.StaticText(G2frame.FRMC,label=' Enter metadata items:'),0)
+            mainSizer.Add(GetMetaSizer(),0)
             
             G2G.HorizontalLine(mainSizer,G2frame.FRMC)
-            mainSizer.Add(GetTimeSizer(),0,WACV)
-            
-            mainSizer.Add(wx.StaticText(G2frame.FRMC,label=' Lattice multipliers; if changed will force reset of atom positions:'),0,WACV)
-            mainSizer.Add(GetSuperSizer(),0,WACV)
-            
-            mainSizer.Add(wx.StaticText(G2frame.FRMC,label=' NB: be sure to set cations first && anions last in atom ordering'),0,WACV)
-            mainSizer.Add(GetAtmChoice(RMCPdict),0,WACV)
+            mainSizer.Add(GetTimeSizer(),0)
+            
+            mainSizer.Add(wx.StaticText(G2frame.FRMC,label=' Lattice multipliers; if changed will force reset of atom positions:'),0)
+            mainSizer.Add(GetSuperSizer(),0)
+            
+            mainSizer.Add(wx.StaticText(G2frame.FRMC,label=' NB: be sure to set cations first && anions last in atom ordering'),0)
+            mainSizer.Add(GetAtmChoice(RMCPdict),0)
             
             G2G.HorizontalLine(mainSizer,G2frame.FRMC)
@@ -5577 +5575 @@
             swapBox.Add(swapAdd,0,WACV)
             swapBox.Add(wx.StaticText(G2frame.FRMC,label=' Atom swap probabiities: '),0,WACV)
-            mainSizer.Add(swapBox,0,WACV)        
+            mainSizer.Add(swapBox,0)        
             if len(RMCPdict['Swaps']):
-                mainSizer.Add(GetSwapSizer(RMCPdict),0,WACV)            
+                mainSizer.Add(GetSwapSizer(RMCPdict),0)            
             
             G2G.HorizontalLine(mainSizer,G2frame.FRMC)
-            mainSizer.Add(wx.StaticText(G2frame.FRMC,label=' Enter constraints && restraints:'),0,WACV)
-            mainSizer.Add(wx.StaticText(G2frame.FRMC,label=' Set minimum && maximum distances for:'),0,WACV)        
-            mainSizer.Add(GetPairSizer(RMCPdict),0,WACV)
+            mainSizer.Add(wx.StaticText(G2frame.FRMC,label=' Enter constraints && restraints:'),0)
+            mainSizer.Add(wx.StaticText(G2frame.FRMC,label=' Set minimum && maximum distances for:'),0)        
+            mainSizer.Add(GetPairSizer(RMCPdict),0)
             
             G2G.HorizontalLine(mainSizer,G2frame.FRMC)
@@ -5590 +5588 @@
             useBVS.SetValue(RMCPdict.get('useBVS',False))
             useBVS.Bind(wx.EVT_CHECKBOX,OnUseBVS)
-            mainSizer.Add(useBVS,0,WACV)
+            mainSizer.Add(useBVS,0)
             if RMCPdict.get('useBVS',False):
-                mainSizer.Add(GetBvsSizer(),0,WACV)
+                mainSizer.Add(GetBvsSizer(),0)
         
             G2G.HorizontalLine(mainSizer,G2frame.FRMC)
@@ -5600 +5598 @@
             fxcnBox.Add(fxcnAdd,0,WACV)
             fxcnBox.Add(wx.StaticText(G2frame.FRMC,label=' Fixed coordination number restraint: '),0,WACV)
-            mainSizer.Add(fxcnBox,0,WACV)        
+            mainSizer.Add(fxcnBox,0)        
             if len(RMCPdict['FxCN']):
-                mainSizer.Add(GetFxcnSizer(),0,WACV)            
+                mainSizer.Add(GetFxcnSizer(),0)            
             
             G2G.HorizontalLine(mainSizer,G2frame.FRMC)
@@ -5610 +5608 @@
             avcnBox.Add(avcnAdd,0,WACV)
             avcnBox.Add(wx.StaticText(G2frame.FRMC,label=' Average coordination number restraint: '),0,WACV)
-            mainSizer.Add(avcnBox,0,WACV)
+            mainSizer.Add(avcnBox,0)
             if len(RMCPdict['AveCN']):
-                mainSizer.Add(GetAvcnSizer(),0,WACV)
+                mainSizer.Add(GetAvcnSizer(),0)
                 
             G2G.HorizontalLine(mainSizer,G2frame.FRMC)
@@ -5618 +5616 @@
             pottempBox.Add(wx.StaticText(G2frame.FRMC,label=' Potential temperature (K): '),0,WACV)
             pottempBox.Add(G2G.ValidatedTxtCtrl(G2frame.FRMC,RMCPdict['Potentials'],'Pot. Temp.',xmin=0.,xmax=1000.,size=(50,25)),0,WACV)
-            mainSizer.Add(pottempBox,0,WACV)
+            mainSizer.Add(pottempBox,0)
             bondpotBox = wx.BoxSizer(wx.HORIZONTAL)
             bondpotAdd = wx.Button(G2frame.FRMC,label='Add')
@@ -5625 +5623 @@
             bondpotBox.Add(wx.StaticText(G2frame.FRMC,label=' A-B stretch potential restraints, search range (%): '),0,WACV)
             bondpotBox.Add(G2G.ValidatedTxtCtrl(G2frame.FRMC,RMCPdict['Potentials'],'Stretch search',xmin=0.,xmax=100.,size=(50,25)),0,WACV)
-            mainSizer.Add(bondpotBox,0,WACV)
+            mainSizer.Add(bondpotBox,0)
             if len(RMCPdict['Potentials']['Stretch']):
-                mainSizer.Add(GetBondSizer(),0,WACV)
+                mainSizer.Add(GetBondSizer(),0)
 
             angpotBox = wx.BoxSizer(wx.HORIZONTAL)
@@ -5635 +5633 @@
             angpotBox.Add(wx.StaticText(G2frame.FRMC,label=' A-B-C angle potential restraints, search range (%): '),0,WACV)
             angpotBox.Add(G2G.ValidatedTxtCtrl(G2frame.FRMC,RMCPdict['Potentials'],'Angle search',xmin=0.,xmax=100.,size=(50,25)),0,WACV)
-            mainSizer.Add(angpotBox,0,WACV)
+            mainSizer.Add(angpotBox,0)
             if len(RMCPdict['Potentials']['Angles']):
-                mainSizer.Add(GetAngleSizer(),0,WACV)
+                mainSizer.Add(GetAngleSizer(),0)
                 
             G2G.HorizontalLine(mainSizer,G2frame.FRMC)
-            mainSizer.Add(wx.StaticText(G2frame.FRMC,label=' Select data:'),0,WACV)
+            mainSizer.Add(wx.StaticText(G2frame.FRMC,label=' Select data:'),0)
             histograms = data['Histograms']
             histNames = list(histograms.keys())
-            mainSizer.Add(wx.StaticText(G2frame.FRMC,label=' Select one histogram for Bragg processing:'),0,WACV)
+            mainSizer.Add(wx.StaticText(G2frame.FRMC,label=' Select one histogram for Bragg processing:'),0)
             histoSizer = wx.BoxSizer(wx.HORIZONTAL)
             histo = wx.ComboBox(G2frame.FRMC,choices=histNames,style=wx.CB_DROPDOWN|wx.TE_READONLY) 
@@ -5651 +5649 @@
             histoSizer.Add(wx.StaticText(G2frame.FRMC,label=' Weight '),0,WACV)
             histoSizer.Add(G2G.ValidatedTxtCtrl(G2frame.FRMC,RMCPdict['histogram'],1,xmin=0.,xmax=10000.,size=(50,25)),0,WACV)
-            mainSizer.Add(histoSizer,0,WACV)
+            mainSizer.Add(histoSizer,0)
             
             samSizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -5662 +5660 @@
             samSizer.Add(samSize,0,WACV)
             samSizer.Add(strain,0,WACV)
-            mainSizer.Add(samSizer,0,WACV)
+            mainSizer.Add(samSizer,0)
 
             FileSizer(RMCPdict,mainSizer)
@@ -6720 +6718 @@
             
             transSizer = wx.BoxSizer(wx.VERTICAL)
-            transSizer.Add(wx.StaticText(layerData,label=' Layer-Layer transition probabilities: '),0,WACV)
+            transSizer.Add(wx.StaticText(layerData,label=' Layer-Layer transition probabilities: '),0)
             topSizer = wx.BoxSizer(wx.HORIZONTAL)
             normprob = wx.CheckBox(layerData,label=' Normalize probabilities?')
@@ -6729 +6727 @@
             symprob.Bind(wx.EVT_CHECKBOX,OnSymProb)
             topSizer.Add(symprob,0,WACV)
-            transSizer.Add(topSizer,0,WACV)
+            transSizer.Add(topSizer,0)
             Names = [layer['Name'] for layer in Layers['Layers']]
             transArray = Layers['Transitions']
@@ -6737 +6735 @@
             diagSum = 0.
             for Yi,Yname in enumerate(Names):
-                transSizer.Add(wx.StaticText(layerData,label=' From %s to:'%(Yname)),0,WACV)
+                transSizer.Add(wx.StaticText(layerData,label=' From %s to:'%(Yname)),0)
                 table = []
                 rowLabels = []
@@ -6764 +6762 @@
                 totalFault = wx.StaticText(layerData,
                     label=' Total fault density = %.3f'%(1.-diagSum))
-                transSizer.Add(totalFault,0,WACV)
+                transSizer.Add(totalFault,0)
             return transSizer
             
@@ -6786 +6784 @@
             for name in Names:
                 Str += name
-            plotSizer.Add(wx.StaticText(layerData,label=Str[:-1]),0,WACV)
+            plotSizer.Add(wx.StaticText(layerData,label=Str[:-1]),0)
             lineSizer = wx.BoxSizer(wx.HORIZONTAL)
             lineSizer.Add(wx.StaticText(layerData,label=' Enter sequence of layers to plot:'),0,WACV)
@@ -6794 +6792 @@
             plotSeq.Bind(wx.EVT_KILL_FOCUS,OnPlotSeq)
             lineSizer.Add(plotSeq,0,WACV)
-            plotSizer.Add(lineSizer,0,WACV)
+            plotSizer.Add(lineSizer,0)
             return plotSizer
             
@@ -6884 +6882 @@
             
             stackSizer = wx.BoxSizer(wx.VERTICAL)
-            stackSizer.Add(wx.StaticText(layerData,label=' Layer stacking parameters:'),0,WACV)
+            stackSizer.Add(wx.StaticText(layerData,label=' Layer stacking parameters:'),0)
             if not Layers['Stacking']:
                 Layers['Stacking'] = ['recursive','infinite','']
@@ -6908 +6906 @@
                 topLine.Add(seqType,0,WACV)
                 if Layers['Stacking'][1] == 'list':
-                    stackSizer.Add(topLine,0,WACV)
+                    stackSizer.Add(topLine,0)
                     Names = [' %s: %d,'%(layer['Name'],iL+1) for iL,layer in enumerate(Layers['Layers'])]
-                    stackSizer.Add(wx.StaticText(layerData,label=' Explicit layer sequence; enter space delimited list of numbers:'),0,WACV)
+                    stackSizer.Add(wx.StaticText(layerData,label=' Explicit layer sequence; enter space delimited list of numbers:'),0)
                     Str = ' Use sequence nos. from:'
                     for name in Names:
                         Str += name
-                    stackSizer.Add(wx.StaticText(layerData,label=Str[:-1]+' Repeat sequences can be used: e.g. 6*(1 2) '),0,WACV)
-                    stackSizer.Add(wx.StaticText(layerData,label=' Zero probability sequences not allowed'),0,WACV)    
+                    stackSizer.Add(wx.StaticText(layerData,label=Str[:-1]+' Repeat sequences can be used: e.g. 6*(1 2) '),0)
+                    stackSizer.Add(wx.StaticText(layerData,label=' Zero probability sequences not allowed'),0)    
                     stackList = wx.TextCtrl(layerData,value=Layers['Stacking'][2],size=(600,-1),
                         style=wx.TE_MULTILINE|wx.TE_PROCESS_ENTER)
                     stackList.Bind(wx.EVT_TEXT_ENTER,OnStackList)        
                     stackList.Bind(wx.EVT_KILL_FOCUS,OnStackList)
-                    stackSizer.Add(stackList,0,wx.ALL|wx.EXPAND|WACV,8)
+                    stackSizer.Add(stackList,0,wx.ALL|wx.EXPAND,8)
                 else:   #random
                     topLine.Add(wx.StaticText(layerData,label=' Length of random sequence: '),0,WACV)
@@ -6928 +6926 @@
                     numRan.Bind(wx.EVT_KILL_FOCUS,OnNumRan)
                     topLine.Add(numRan,0,WACV)
-                    stackSizer.Add(topLine,0,WACV)
+                    stackSizer.Add(topLine,0)
             return stackSizer
             
@@ -6964 +6962 @@
             toler = G2G.ValidatedTxtCtrl(layerData,Layers,'Toler',nDig=(10,3))
             laueSizer.Add(toler,0,WACV)
-        topSizer.Add(laueSizer,0,WACV)
-        topSizer.Add(wx.StaticText(layerData,label=' Reference unit cell for all layers:'),0,WACV)
-        topSizer.Add(CellSizer(),0,WACV)
+        topSizer.Add(laueSizer,0)
+        topSizer.Add(wx.StaticText(layerData,label=' Reference unit cell for all layers:'),0)
+        topSizer.Add(CellSizer(),0)
         topSizer.Add(WidthSizer())
-        topSizer.Add(wx.StaticText(layerData,label=' NB: stacking fault refinement currently not available'),0,WACV)
+        topSizer.Add(wx.StaticText(layerData,label=' NB: stacking fault refinement currently not available'),0)
         G2G.HorizontalLine(topSizer,layerData)
         titleSizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -6981 +6979 @@
         deleteLast.Bind(wx.EVT_BUTTON, OnDeleteLast)
         titleSizer.Add(deleteLast,0,WACV)
-        topSizer.Add(titleSizer,0,WACV)
+        topSizer.Add(titleSizer,0)
         for il,layer in enumerate(Layers['Layers']):
             topSizer.Add(LayerSizer(il,layer))
@@ -6988 +6986 @@
         bottomSizer.Add(TransSizer())
         G2G.HorizontalLine(bottomSizer,layerData)
-        bottomSizer.Add(PlotSizer(),0,WACV)
+        bottomSizer.Add(PlotSizer(),0)
         G2G.HorizontalLine(bottomSizer,layerData)
         bottomSizer.Add(StackSizer())
@@ -7392 +7390 @@
                             names = Names
                             Waves = wx.FlexGridSizer(0,8,5,5)
-                        waveSizer.Add(wx.StaticText(waveData,label=' %s  parameters: %s'%(waveName,str(names).rstrip(']').lstrip('[').replace("'",''))),0,WACV)
+                        waveSizer.Add(wx.StaticText(waveData,label=' %s  parameters: %s'%(waveName,str(names).rstrip(']').lstrip('[').replace("'",''))),0)
                         for ival in range(nterm):
                             val = wave[0][ival]
@@ -7445 +7443 @@
             style=wx.CB_READONLY|wx.CB_DROPDOWN)
         atms.Bind(wx.EVT_COMBOBOX,OnAtmSel)
-        topSizer.Add(atms,0,WACV)
-        mainSizer.Add(topSizer,0,WACV)
+        topSizer.Add(atms,0)
+        mainSizer.Add(topSizer,0)
         G2frame.bottomSizer = ShowAtomInfo()
         mainSizer.Add(G2frame.bottomSizer)
@@ -8179 +8177 @@
         dlg.CenterOnParent()
         mainSizer = wx.BoxSizer(wx.VERTICAL)
-        mainSizer.Add(wx.StaticText(dlg,wx.ID_ANY,'Molecular completion parameters'),0,WACV)
-        mainSizer.Add(wx.StaticText(dlg,wx.ID_ANY,'Pause after: '),0,WACV)
+        mainSizer.Add(wx.StaticText(dlg,wx.ID_ANY,'Molecular completion parameters'),0)
+        mainSizer.Add(wx.StaticText(dlg,wx.ID_ANY,'Pause after: '),0)
         topSizer = wx.BoxSizer(wx.HORIZONTAL)
         topSizer.Add((45,-1))
@@ -8188 +8186 @@
                         [str(i) for i in choices],choices))
         topSizer.Add(wx.StaticText(dlg,wx.ID_ANY,' repetitions'),0,WACV)
-        mainSizer.Add(topSizer,0,WACV)
+        mainSizer.Add(topSizer,0)
         topSizer = wx.BoxSizer(wx.HORIZONTAL)
         topSizer.Add((45,-1))
@@ -8195 +8193 @@
                         [str(i) for i in choices],choices))
         topSizer.Add(wx.StaticText(dlg,wx.ID_ANY,' added atoms'),0,WACV)
-        mainSizer.Add(topSizer,0,WACV)
-        mainSizer.Add(wx.StaticText(dlg,wx.ID_ANY,'Atom types to add:'),0,WACV)
+        mainSizer.Add(topSizer,0)
+        mainSizer.Add(wx.StaticText(dlg,wx.ID_ANY,'Atom types to add:'),0)
         atSizer = wx.BoxSizer(wx.HORIZONTAL)
         for i,item in enumerate(atomTypes):
@@ -8202 +8200 @@
             atm = G2G.G2CheckBox(dlg,item,params,item)
             atSizer.Add(atm,0,WACV)
-        mainSizer.Add(atSizer,0,WACV)
+        mainSizer.Add(atSizer,0)
         
         OkBtn = wx.Button(dlg,-1,"Ok")
@@ -8977 +8975 @@
             showMap.Bind(wx.EVT_CHECKBOX, OnShowMap)
             showMap.SetValue(drawingData['showMap'])
-            mapSizer.Add(showMap,0,WACV)
+            mapSizer.Add(showMap,0)
             mapSizer.Add(G2G.G2SliderWidget(drawOptions,drawingData,'contourLevel',
                 'Max relative to rho max ({:.2f}): '.format(generalData['Map']['rhoMax']),
@@ -8987 +8985 @@
             lineSizer.Add(wx.StaticText(drawOptions,wx.ID_ANY,'On map peak selection:  '),0,WACV)
             lineSizer.Add(G2G.G2CheckBox(drawOptions,'Move view point',drawingData,'peakMoveView'))
-            mapSizer.Add(lineSizer,0,WACV)
+            mapSizer.Add(lineSizer,0)
             mapSizer.Add(DistanceSettingSizer(drawingData,
                 'PeakDistRadius','atomsExpandRadius','atomsDistRadius'),0,wx.LEFT,20)
@@ -9480 +9478 @@
                 popLA.Bind(wx.EVT_BUTTON, OnCSV)
                 PTSizer.Add(popLA,0,WACV)
-        mainSizer.Add(PTSizer,0,WACV)
+        mainSizer.Add(PTSizer,0)
         mainSizer.Add((0,5),0)
         if textureData['SHShow']:
@@ -9495 +9493 @@
             mainSizer.Add((0,5),0)
         mainSizer.Add((0,5),0)
-        mainSizer.Add(wx.StaticText(Texture,-1,' Sample orientation angle zeros: '),0,WACV)
+        mainSizer.Add(wx.StaticText(Texture,-1,' Sample orientation angle zeros: '),0)
         mainSizer.Add((0,5),0)
         angSizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -9507 +9505 @@
             angVal = G2G.ValidatedTxtCtrl(Texture,textureData[item],1,nDig=(8,2))
             angSizer.Add(angVal,0,WACV|wx.LEFT,5)
-        mainSizer.Add(angSizer,0,WACV|wx.LEFT,5)
-#        mainSizer.Add(SHPenalty(textureData['Penalty']),0,WACV|wx.LEFT,5)  for future
+        mainSizer.Add(angSizer,0,wx.LEFT,5)
+#        mainSizer.Add(SHPenalty(textureData['Penalty']),0,wx.LEFT,5)  for future
         SetPhaseWindow(Texture,mainSizer)
 
@@ -10034 +10032 @@
             resrbSizer.Add(topLine)
             resrbSizer.Add(LocationSizer(RBObj,'Residue'))
-            resrbSizer.Add(wx.StaticText(RigidBodies,-1,'Torsions:'),0,WACV)
+            resrbSizer.Add(wx.StaticText(RigidBodies,-1,'Torsions:'),0)
             torSizer = wx.FlexGridSizer(0,6,5,5)
             for itors,tors in enumerate(RBObj['Torsions']):
@@ -10151 +10149 @@
             nobody = False
             mainSizer.Add((5,5),0)
-            mainSizer.Add(wx.StaticText(RigidBodies,-1,'Residue rigid bodies:'),0,WACV)
+            mainSizer.Add(wx.StaticText(RigidBodies,-1,'Residue rigid bodies:'),0)
             mainSizer.Add((5,5),0)
             RBnames = []
@@ -10165 +10163 @@
             select.SetFirstItem(RBnames.index(rbName))
             select.Bind(wx.EVT_LISTBOX,OnSelect)
-            mainSizer.Add(select,0,WACV)
+            mainSizer.Add(select,0)
             G2frame.bottomSizer = wx.BoxSizer(wx.VERTICAL)
             G2frame.bottomSizer.Add(ResrbSizer(rbObj))
@@ -10187 +10185 @@
             else:
                 msg = 'No rigid bodies defined in phase. Use "Edit Body"/"Locate & Insert..."\ncommand to add them.'
-            mainSizer.Add(wx.StaticText(RigidBodies,-1,msg),0,WACV)
+            mainSizer.Add(wx.StaticText(RigidBodies,-1,msg),0)
             mainSizer.Add((5,5),0)
         SetPhaseWindow(RigidBodies,mainSizer)
@@ -10430 +10428 @@
                 '''
                 Q = G2mth.AVdeg2Q(rbObj['OrientVec'][0],
-                                np.inner(Amat,rbObj['OrientVec'][1:]))
+                    np.inner(Amat,rbObj['OrientVec'][1:]))
                 rbObj['Orient'][0] = Q
                 for i,sizer in enumerate(G2frame.testRBObjSizers['Osizers']):
@@ -10635 +10633 @@
                 OriSizer.Add(wx.StaticText(RigidBodies,wx.ID_ANY,lbl[ix]),0,WACV,4)
                 origX = G2G.ValidatedTxtCtrl(RigidBodies,rbObj['Orig'][0],ix,nDig=(10,5),
-                            xmin=-1.5,xmax=1.5,typeHint=float,
-                                                 OnLeave=UpdateTablePlot)
+                    xmin=-1.5,xmax=1.5,typeHint=float,OnLeave=UpdateTablePlot)
                 OriSizer.Add(origX,0,WACV)
                 Xsizers.append(origX)
@@ -10668 +10665 @@
             OrientVecSiz = []
             OrientVecSiz.append(G2G.ValidatedTxtCtrl(RigidBodies,rbObj['OrientVec'],0,nDig=(10,2),
-                            xmin=0.,xmax=360.,typeHint=float,
-                                                 OnLeave=UpdateOrientation))
+                xmin=0.,xmax=360.,typeHint=float,OnLeave=UpdateOrientation))
             OriSizer.Add(OrientVecSiz[-1],0,WACV)
             azSlide = wx.Slider(RigidBodies,style=wx.SL_HORIZONTAL)
@@ -10675 +10671 @@
             azSlide.SetValue(int(rbObj['OrientVec'][0]*10.))
             azSlide.Bind(wx.EVT_SLIDER, OnAzSlide)
-            OriSizer.Add(azSlide,1)
+            OriSizer.Add(azSlide,1,WACV)
             mainSizer.Add(OriSizer)
             OriSizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -10682 +10678 @@
                 OriSizer.Add(wx.StaticText(RigidBodies,wx.ID_ANY,'  '+lbl+': '),0,WACV)
                 OrientVecSiz.append(G2G.ValidatedTxtCtrl(RigidBodies,rbObj['OrientVec'],ix+1,nDig=(10,4),
-                            xmin=-1.,xmax=1.,typeHint=float,
-                                                 OnLeave=UpdateOrientation))
+                    xmin=-1.,xmax=1.,typeHint=float,OnLeave=UpdateOrientation))
                 OriSizer.Add(OrientVecSiz[-1],0,WACV)
             OrientVecSiz.append(azSlide)
@@ -10717 +10712 @@
                 mainSizer.Add(TorSizer,0,wx.EXPAND|wx.RIGHT)
             else:
-                mainSizer.Add(wx.StaticText(RigidBodies,wx.ID_ANY,'No side chain torsions'),0,WACV)
+                mainSizer.Add(wx.StaticText(RigidBodies,wx.ID_ANY,'No side chain torsions'),0)
             if not matchTable: # not sure if this will ever be true
                 OkBtn = None
                 mainSizer.Add((15,15))
                 mainSizer.Add(wx.StaticText(RigidBodies,wx.ID_ANY,
-                        'Error: unable to match atoms in rigid body to structure (see console window)'),
-                                  0,WACV)
+                    'Error: unable to match atoms in rigid body to structure (see console window)'),0)
             else:
                 OkBtn = wx.Button(RigidBodies,wx.ID_ANY,"Add")
@@ -10789 +10783 @@
             hSizer.Add(wx.StaticText(RigidBodies,wx.ID_ANY,'Crystal Highlight: '))
             data['testRBObj']['showSelect'] = G2G.G2ChoiceButton(RigidBodies,
-                                data['testRBObj']['availAtoms'],
-                                None,None,showAtom,0,showCryAtom,
-                                size=(75,-1))
+                data['testRBObj']['availAtoms'],None,None,showAtom,0,showCryAtom,size=(75,-1))
             hSizer.Add(data['testRBObj']['showSelect'])
             btnSizer.Add(hSizer)
             btnSizer.Add((-1,20))
-            btnSizer.Add(
-                wx.StaticText(RigidBodies,wx.ID_ANY,'Actions with assigned\natom(s)...'),
-                0,wx.ALL)
+            btnSizer.Add(wx.StaticText(RigidBodies,wx.ID_ANY,'Actions with assigned\natom(s)...'),0,wx.ALL)
             btnSizer.Add((-1,10))
             btn = wx.Button(RigidBodies, wx.ID_ANY, 'Process Assignments')
@@ -11226 +11216 @@
             rbsizer = wx.BoxSizer(wx.VERTICAL)
             rbsizer1 = wx.FlexGridSizer(0,7,5,5)
-            rbsizer1.Add(wx.StaticText(G2frame.MCSA,-1,model['Type']+': '+model['name']+': '),0,WACV)
+            rbsizer1.Add(wx.StaticText(G2frame.MCSA,-1,model['Type']+': '+model['name']+': '),0)
             for ix,item in enumerate(['x','y','z']):
                 posRef = wx.CheckBox(G2frame.MCSA,-1,label=item+': ')
@@ -11295 +11285 @@
                 try:
                     atNames = RBData['Residue'][model['RBId']]['atNames']
-                    rbsizer.Add(wx.StaticText(G2frame.MCSA,-1,'Torsions:'),0,WACV)
+                    rbsizer.Add(wx.StaticText(G2frame.MCSA,-1,'Torsions:'),0)
                     rbsizer3 = wx.FlexGridSizer(0,8,5,5)
                     for it,tor in enumerate(model['Tor'][0]):
@@ -11464 +11454 @@
         if not data['MCSA']['Models']:
             mainSizer.Add((5,5),0)
-            mainSizer.Add(wx.StaticText(G2frame.MCSA,-1,'No MC/SA models:'),0,WACV)
+            mainSizer.Add(wx.StaticText(G2frame.MCSA,-1,'No MC/SA models:'),0)
             mainSizer.Add((5,5),0)
         else:
             mainSizer.Add((5,5),0)
-            mainSizer.Add(wx.StaticText(G2frame.MCSA,-1,'MC/SA models:'),0,WACV)
+            mainSizer.Add(wx.StaticText(G2frame.MCSA,-1,'MC/SA models:'),0)
             mainSizer.Add((5,5),0)
             rbNames = []
@@ -11488 +11478 @@
                 select.SetFirstItem(rbNames.index(rbName))
                 select.Bind(wx.EVT_LISTBOX,OnSelect)
-                mainSizer.Add(select,0,WACV)
+                mainSizer.Add(select,0)
                 G2frame.bottomSizer = wx.BoxSizer(wx.VERTICAL)
                 G2frame.bottomSizer.Add(rbSizer(data['MCSA']['Models'][rbids[0]]))
@@ -11495 +11485 @@
         if not data['MCSA']['Results']:
             mainSizer.Add((5,5),0)
-            mainSizer.Add(wx.StaticText(G2frame.MCSA,-1,'No MC/SA results:'),0,WACV)
+            mainSizer.Add(wx.StaticText(G2frame.MCSA,-1,'No MC/SA results:'),0)
             mainSizer.Add((5,5),0)
         else:
             mainSizer.Add((5,5),0)
-            mainSizer.Add(wx.StaticText(G2frame.MCSA,-1,'MC/SA results:'),0,WACV)
+            mainSizer.Add(wx.StaticText(G2frame.MCSA,-1,'MC/SA results:'),0)
             mainSizer.Add((5,5),0)
             Results = data['MCSA']['Results']

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

trunk/GSASIIrestrGUI.py

@@ -961 +961 @@
         mainSizer = wx.BoxSizer(wx.VERTICAL)
         mainSizer.Add((5,5),0)
-        mainSizer.Add(WtBox(BondRestr,bondRestData),0,WACV)
+        mainSizer.Add(WtBox(BondRestr,bondRestData),0)
 
         bondList = bondRestData['Bonds']
@@ -1025 +1025 @@
                 mainSizer.Add(wx.StaticText(BondRestr,-1,
                     'Bond restraints: sum(wt*(delt/sig)^2) =    %.2f, mean(wt*(delt/sig)^2) =    %.2f'    \
-                    %(chisq,chisq/len(bondList))),0,WACV)
+                    %(chisq,chisq/len(bondList))),0)
                 Bonds.SetScrollRate(10,10)
                 Bonds.SetMinSize((-1,300))
@@ -1093 +1093 @@
         mainSizer = wx.BoxSizer(wx.VERTICAL)
         mainSizer.Add((5,5),0)
-        mainSizer.Add(WtBox(AngleRestr,angleRestData),0,WACV)
+        mainSizer.Add(WtBox(AngleRestr,angleRestData),0)
 
         angleList = angleRestData['Angles']
@@ -1157 +1157 @@
                 mainSizer.Add(wx.StaticText(AngleRestr,-1,
                     'Angle restraints: sum(wt*(delt/sig)^2) =    %.2f, mean(wt*(delt/sig)^2) =    %.2f'    \
-                    %(chisq,chisq/len(angleList))),0,WACV)
+                    %(chisq,chisq/len(angleList))),0)
                 Angles.SetScrollRate(10,10)
                 Angles.SetMinSize((-1,300))
@@ -1215 +1215 @@
         mainSizer = wx.BoxSizer(wx.VERTICAL)
         mainSizer.Add((5,5),0)
-        mainSizer.Add(WtBox(PlaneRestr,planeRestData),0,WACV)
+        mainSizer.Add(WtBox(PlaneRestr,planeRestData),0)
 
         planeList = planeRestData['Planes']
@@ -1284 +1284 @@
                 mainSizer.Add(wx.StaticText(PlaneRestr,-1,
                     'Plane restraints: sum(wt*(delt/sig)^2) =    %.2f, mean(wt*(delt/sig)^2) =    %.2f'    \
-                    %(chisq,chisq/len(planeList))),0,WACV)
+                    %(chisq,chisq/len(planeList))),0)
                 Planes.SetScrollRate(10,10)
                 Planes.SetMinSize((-1,300))
@@ -1351 +1351 @@
         mainSizer = wx.BoxSizer(wx.VERTICAL)
         mainSizer.Add((5,5),0)
-        mainSizer.Add(WtBox(ChiralRestr,chiralRestData),0,WACV)
+        mainSizer.Add(WtBox(ChiralRestr,chiralRestData),0)
 
         volumeList = chiralRestData['Volumes']
@@ -1414 +1414 @@
                 mainSizer.Add(wx.StaticText(ChiralRestr,-1,
                     'Chiral volume restraints: sum(wt*(delt/sig)^2) =    %.2f, mean(wt*(delt/sig)^2) =    %.2f'    \
-                    %(chisq,chisq/len(volumeList))),0,WACV)
+                    %(chisq,chisq/len(volumeList))),0)
                 Volumes.SetScrollRate(10,10)
                 Volumes.SetMinSize((-1,300))
@@ -1487 +1487 @@
         mainSizer = wx.BoxSizer(wx.VERTICAL)
         mainSizer.Add((5,5),0)
-        mainSizer.Add(WtBox(TorsionRestr,torsionRestData),0,WACV)
+        mainSizer.Add(WtBox(TorsionRestr,torsionRestData),0)
         
         coeffDict = torsionRestData['Coeff']
@@ -1493 +1493 @@
         if len(coeffDict):
             mainSizer.Add((5,5))
-            mainSizer.Add(wx.StaticText(TorsionRestr,-1,'Torsion function coefficients:'),0,WACV)
+            mainSizer.Add(wx.StaticText(TorsionRestr,-1,'Torsion function coefficients:'),0)
             mainSizer.Add(coeffSizer(),1,wx.EXPAND,1)        
         
         if len(torsionList):
-            mainSizer.Add(wx.StaticText(TorsionRestr,-1,'Torsion restraints:'),0,WACV)
+            mainSizer.Add(wx.StaticText(TorsionRestr,-1,'Torsion restraints:'),0)
             table = []
             rowLabels = []
@@ -1541 +1541 @@
             mainSizer.Add(wx.StaticText(TorsionRestr,-1,
                 'Torsion restraints: sum(wt*(delt/sig)^2) =    %.2f, mean(wt*(delt/sig)^2) =    %.2f'    \
-                %(chisq,chisq/len(torsionList))),0,WACV)
+                %(chisq,chisq/len(torsionList))),0)
             TorsionRestr.Torsions.SetScrollRate(10,10)
             TorsionRestr.Torsions.SetMinSize((-1,300))
@@ -1614 +1614 @@
         mainSizer = wx.BoxSizer(wx.VERTICAL)
         mainSizer.Add((5,5),0)
-        mainSizer.Add(WtBox(RamaRestr,ramaRestData),0,WACV)
+        mainSizer.Add(WtBox(RamaRestr,ramaRestData),0)
         ramaList = ramaRestData['Ramas']
         coeffDict = ramaRestData['Coeff']
         if len(coeffDict):
-            mainSizer.Add(wx.StaticText(RamaRestr,-1,'Ramachandran function coefficients:'),0,WACV)
+            mainSizer.Add(wx.StaticText(RamaRestr,-1,'Ramachandran function coefficients:'),0)
             mainSizer.Add(coeffSizer(),1,wx.EXPAND,1)
             
         if len(ramaList):
-            mainSizer.Add(wx.StaticText(RamaRestr,-1,'Ramachandran restraints:'),0,WACV)
+            mainSizer.Add(wx.StaticText(RamaRestr,-1,'Ramachandran restraints:'),0)
             table = []
             rowLabels = []
@@ -1667 +1667 @@
                 mainSizer.Add(wx.StaticText(RamaRestr,-1,
                     'Ramachandran restraints: sum(wt*(delt/sig)^2) =    %.2f, mean(wt*(delt/sig)^2) =    %.2f'    \
-                    %(chisq,chisq/len(ramaList))),0,WACV)
+                    %(chisq,chisq/len(ramaList))),0)
                 RamaRestr.Ramas.SetScrollRate(10,10)
                 RamaRestr.Ramas.SetMinSize((-1,300))
@@ -1734 +1734 @@
         mainSizer = wx.BoxSizer(wx.VERTICAL)
         mainSizer.Add((5,5),0)
-        mainSizer.Add(WtBox(ChemCompRestr,chemcompRestData),0,WACV)
+        mainSizer.Add(WtBox(ChemCompRestr,chemcompRestData),0)
         mainSizer.Add(wx.StaticText(ChemCompRestr,-1, 
-            'NB: The chemical restraint sum is over the unit cell contents'),0,WACV)
+            'NB: The chemical restraint sum is over the unit cell contents'),0)
         mainSizer.Add((5,5),0)
 
@@ -1842 +1842 @@
         mainSizer = wx.BoxSizer(wx.VERTICAL)
         mainSizer.Add((5,5),0)
-        mainSizer.Add(WtBox(TextureRestr,textureRestData),0,WACV)
+        mainSizer.Add(WtBox(TextureRestr,textureRestData),0)
         mainSizer.Add(wx.StaticText(TextureRestr,-1, 
             'NB: The texture restraints suppress negative pole figure values for the selected HKLs\n'
-            '    "unit esd" gives a bias toward a flatter polefigure'),0,WACV)
+            '    "unit esd" gives a bias toward a flatter polefigure'),0)
         mainSizer.Add((5,5),0)
 

trunk/imports/G2img_CBF.py

@@ -98 +98 @@
     File.seek(0)
     img = File.read()[imageBeg:imageBeg+compImageSize]
+    File.close()
     nimg = len(img)
     image = np.zeros(nxy,dtype=np.int32)