Changeset 4759 for trunk/GSASIIpwdGUI.py

Timestamp:

Jan 10, 2021 5:12:01 PM (2 years ago)

Author:

toby

Message:

wx4.1 & mpl3.3 fixes

File:

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

trunk/GSASIIpwdGUI.py

@@ -1703 +1703 @@
     topSizer = wx.BoxSizer(wx.HORIZONTAL)
     topSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Background used in refinement'),0,WACV)
-    # add help button to bring up help web page - at right sede of window
-    topSizer.Add((-1,-1),1,WACV|wx.EXPAND)
+    # add help button to bring up help web page - at right side of window
+    topSizer.Add((-1,-1),1,wx.EXPAND)
     topSizer.Add(G2G.HelpButton(G2frame.dataWindow,helpIndex=G2frame.dataWindow.helpKey))
-    mainSizer.Add(topSizer,0,WACV|wx.EXPAND)
+    mainSizer.Add(topSizer,0,wx.EXPAND)
     mainSizer.Add(BackSizer())
     mainSizer.Add((0,5),0)
@@ -1791 +1791 @@
         topSizer = wx.BoxSizer(wx.HORIZONTAL)
         topSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Data used in refinement'),0,WACV)
-        # add help button to bring up help web page - at right sede of window
-        topSizer.Add((-1,-1),1,WACV|wx.EXPAND)
+        # add help button to bring up help web page - at right side of window
+        topSizer.Add((-1,-1),1,wx.EXPAND)
         topSizer.Add(G2G.HelpButton(G2frame.dataWindow,helpIndex=G2frame.dataWindow.helpKey))
-        mainSizer.Add(topSizer,0,WACV|wx.EXPAND)
+        mainSizer.Add(topSizer,0,wx.EXPAND)
         mainSizer.Add((5,5))
         mainSizer.Add(LimitSizer())
@@ -2203 +2203 @@
         text = ' Histogram Type: %s  Bank: %d'%(insVal['Type'],insVal['Bank'])
         subSizer.Add(wx.StaticText(G2frame.dataWindow,-1,text),0,WACV)
-        # add help button to bring up help web page - at right sede of window
-        subSizer.Add((-1,-1),1,WACV|wx.EXPAND)
+        # add help button to bring up help web page - at right side of window
+        subSizer.Add((-1,-1),1,wx.EXPAND)
         subSizer.Add(G2G.HelpButton(G2frame.dataWindow,helpIndex=G2frame.dataWindow.helpKey))
-        mainSizer.Add(subSizer,0,WACV|wx.EXPAND)
+        mainSizer.Add(subSizer,0,wx.EXPAND)
 #        mainSizer.Add(subSizer)
         labelLst[:],elemKeysLst[:],dspLst[:],refFlgElem[:] = [],[],[],[]
@@ -2942 +2942 @@
     topSizer = wx.BoxSizer(wx.HORIZONTAL)
     topSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Sample and Experimental Parameters'))
-    # add help button to bring up help web page - at right sede of window
-    topSizer.Add((-1,-1),1,WACV|wx.EXPAND)
+    # add help button to bring up help web page - at right side of window
+    topSizer.Add((-1,-1),1,wx.EXPAND)
     topSizer.Add(G2G.HelpButton(G2frame.dataWindow,helpIndex=G2frame.dataWindow.helpKey))
-    mainSizer.Add(topSizer,0,WACV|wx.EXPAND)
+    mainSizer.Add(topSizer,0,wx.EXPAND)
     nameSizer = wx.BoxSizer(wx.HORIZONTAL)
     nameSizer.Add(wx.StaticText(G2frame.dataWindow,wx.ID_ANY,' Instrument Name '),0,WACV)
@@ -2953 +2953 @@
     nameSizer.Add(instNameVal)
     instNameVal.Bind(wx.EVT_CHAR,OnNameVal)
-    mainSizer.Add(nameSizer,0,WACV)
+    mainSizer.Add(nameSizer,0)
     mainSizer.Add((5,5),0)
     labelLst.append('Instrument Name')
@@ -2972 +2972 @@
                     onChoice=OnHistoChange)
         nameSizer.Add(histoType)
-        mainSizer.Add(nameSizer,0,WACV)
+        mainSizer.Add(nameSizer,0)
         mainSizer.Add((5,5),0)
 
@@ -2981 +2981 @@
         if 'list' in str(type(data[key])):
             parmRef = G2G.G2CheckBox(G2frame.dataWindow,' '+lbl,data[key],1)
-            parmSizer.Add(parmRef,0,WACV|wx.EXPAND)
+            parmSizer.Add(parmRef,0,wx.EXPAND)
             parmVal = G2G.ValidatedTxtCtrl(G2frame.dataWindow,data[key],0,
                 nDig=nDig,typeHint=float,OnLeave=AfterChange)
@@ -2988 +2988 @@
         else:
             parmSizer.Add(wx.StaticText(G2frame.dataWindow,label=' '+lbl),
-                0,WACV|wx.EXPAND)
+                0,wx.EXPAND)
             parmVal = G2G.ValidatedTxtCtrl(G2frame.dataWindow,data,key,
                 typeHint=float,OnLeave=AfterChange)
@@ -4414 +4414 @@
     topSizer = wx.BoxSizer(wx.HORIZONTAL)
     topSizer.Add(wx.StaticText(parent=G2frame.dataWindow,label=' Indexing controls: '),0,WACV)
-    # add help button to bring up help web page - at right sede of window
-    topSizer.Add((-1,-1),1,WACV|wx.EXPAND)
+    # add help button to bring up help web page - at right side of window
+    topSizer.Add((-1,-1),1,wx.EXPAND)
     topSizer.Add(G2G.HelpButton(G2frame.dataWindow,helpIndex=G2frame.dataWindow.helpKey))
-    mainSizer.Add(topSizer,0,WACV|wx.EXPAND)
+    mainSizer.Add(topSizer,0,wx.EXPAND)
     mainSizer.Add((5,5),0)
     littleSizer = wx.FlexGridSizer(0,5,5,5)
@@ -4436 +4436 @@
     mainSizer.Add((5,5),0)
     mainSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Select Bravais Lattices for indexing: '),
-        0,WACV)
+        0)
     mainSizer.Add((5,5),0)
     littleSizer = wx.FlexGridSizer(0,5,5,5)
@@ -4456 +4456 @@
     hklShow.Bind(wx.EVT_BUTTON,OnHklShow)
     littleSizer.Add(hklShow,0,WACV)    
-    littleSizer.Add(wx.StaticText(G2frame.dataWindow,label=' cell step ',style=wx.ALIGN_RIGHT),0,WACV|wx.ALIGN_RIGHT)
+    littleSizer.Add(wx.StaticText(G2frame.dataWindow,label=' cell step ',style=wx.ALIGN_RIGHT),0,WACV)
     shiftChoices = [ '0.01%','0.05%','0.1%','0.5%', '1.0%','2.5%','5.0%']
     shiftSel = wx.Choice(G2frame.dataWindow,choices=shiftChoices)
@@ -6268 +6268 @@
     elif 'Particle' in data['Current']:
         G2frame.dataWindow.SasSeqFit.Enable(True)
-        mainSizer.Add(PartSizer(),1,wx.ALIGN_LEFT|wx.EXPAND)
+        mainSizer.Add(PartSizer(),1,wx.EXPAND)
     elif 'Pair' in data['Current']:
         G2frame.dataWindow.SasSeqFit.Enable(False)
-        mainSizer.Add(PairSizer(),1,wx.ALIGN_LEFT|wx.EXPAND)
+        mainSizer.Add(PairSizer(),1,wx.EXPAND)
     elif 'Shape' in data['Current']:
         G2frame.dataWindow.SasSeqFit.Enable(False)
-        mainSizer.Add(ShapesSizer(),1,wx.ALIGN_LEFT|wx.EXPAND)
+        mainSizer.Add(ShapesSizer(),1,wx.EXPAND)
     G2G.HorizontalLine(mainSizer,G2frame.dataWindow)    
     backSizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -7221 +7221 @@
             typeHint=float,OnLeave=AfterChangeNoRefresh)
         bkBox.Add(backVal,0,WACV)    
-        sfgSizer.Add(bkBox,0,wx.ALIGN_LEFT|wx.EXPAND)
+        sfgSizer.Add(bkBox,0,wx.EXPAND)
 
         if 'XC' in inst['Type'][0]:
@@ -7233 +7233 @@
                 typeHint=float,OnLeave=AfterChangeNoRefresh)
             sqBox.Add(rulandWdt,0,WACV)    
-            sfgSizer.Add(sqBox,0,wx.ALIGN_LEFT|wx.EXPAND)
+            sfgSizer.Add(sqBox,0,wx.EXPAND)
         
         sqBox = wx.BoxSizer(wx.HORIZONTAL)