Changeset 4594 for trunk/GSASIIrestrGUI.py

Timestamp:

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

Author:

vondreele

Message:

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

File:

• trunk/GSASIIrestrGUI.py (modified) (15 diffs)

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)