Changeset 2890 for branch/2frame/GSASIIrestrGUI.py

Timestamp:

Jul 1, 2017 11:17:10 AM (6 years ago)

Author:

vondreele

Message:

Constraints now displayed
fix TopLevel? references
fix display issues for Sample Parameters
fix Resttraints display issues

File:

• branch/2frame/GSASIIrestrGUI.py (modified) (10 diffs)

branch/2frame/GSASIIrestrGUI.py

@@ -763 +763 @@
 
         wtBox = wx.BoxSizer(wx.HORIZONTAL)
-        wtBox.Add(wx.StaticText(wind,-1,'Restraint weight factor:'),0,wx.ALIGN_CENTER_VERTICAL)
+        wtBox.Add(wx.StaticText(wind,-1,'Restraint weight factor: '),0,wx.ALIGN_CENTER_VERTICAL)
         wtfactor = G2G.ValidatedTxtCtrl(wind,restData,'wtFactor',nDig=(10,2),typeHint=float)
         wtBox.Add(wtfactor,0,wx.ALIGN_CENTER_VERTICAL)
@@ -771 +771 @@
         wtBox.Add(useData,0,wx.ALIGN_CENTER_VERTICAL)
         if 'Bonds' in restData or 'Angles' in restData:
-            wtBox.Add(wx.StaticText(wind,-1,'  Search range:'),0,wx.ALIGN_CENTER_VERTICAL)
+            wtBox.Add(wx.StaticText(wind,-1,'  Search range: '),0,wx.ALIGN_CENTER_VERTICAL)
             sRange = G2G.ValidatedTxtCtrl(wind,restData,'Range',nDig=(10,2),typeHint=float)
             wtBox.Add(sRange,0,wx.ALIGN_CENTER_VERTICAL)
-            wtBox.Add(wx.StaticText(wind,-1,'(x sum(atom radii)'),0,wx.ALIGN_CENTER_VERTICAL)
+            wtBox.Add(wx.StaticText(wind,-1,' x sum(atom radii)'),0,wx.ALIGN_CENTER_VERTICAL)
         return wtBox
         
@@ -931 +931 @@
 
         BondRestr.SetSizer(mainSizer)
-        Size = mainSizer.Fit(G2frame.dataFrame)
+        Size = mainSizer.Fit(BondRestr)
         Size[0] = 600
         Size[1] = min(Size[1]+50,500)       #make room for tab, but not too big
@@ -1062 +1062 @@
 
         AngleRestr.SetSizer(mainSizer)
-        Size = mainSizer.Fit(G2frame.dataFrame)
+        Size = mainSizer.Fit(AngleRestr)
         Size[0] = 600
         Size[1] = min(Size[1]+50,500)       #make room for tab, but not too big
@@ -1189 +1189 @@
 
         PlaneRestr.SetSizer(mainSizer)
-        Size = mainSizer.Fit(G2frame.dataFrame)
+        Size = mainSizer.Fit(PlaneRestr)
         Size[0] = 600
         Size[1] = min(Size[1]+50,500)       #make room for tab, but not too big
@@ -1320 +1320 @@
 
         ChiralRestr.SetSizer(mainSizer)
-        Size = mainSizer.Fit(G2frame.dataFrame)
+        Size = mainSizer.Fit(ChiralRestr)
         Size[0] = 600
         Size[1] = min(Size[1]+50,500)       #make room for tab, but not too big
@@ -1441 +1441 @@
 
         TorsionRestr.SetSizer(mainSizer)
-        Size = mainSizer.Fit(G2frame.dataFrame)
+        Size = mainSizer.Fit(TorsionRestr)
         Size[0] = 600
         Size[1] = min(Size[1]+50,500)       #make room for tab, but not too big
@@ -1564 +1564 @@
 
         RamaRestr.SetSizer(mainSizer)
-        Size = mainSizer.Fit(G2frame.dataFrame)
+        Size = mainSizer.Fit(RamaRestr)
         Size[0] = 600
         Size[1] = min(Size[1]+50,500)       #make room for tab, but not too big
@@ -1697 +1697 @@
 
         ChemCompRestr.SetSizer(mainSizer)
-        Size = mainSizer.Fit(G2frame.dataFrame)
+        Size = mainSizer.Fit(ChemCompRestr)
         Size[0] = 600
         Size[1] = min(Size[1]+50,500)       #make room for tab, but not too big
@@ -1770 +1770 @@
             mainSizer.Add(wx.StaticText(TextureRestr,-1,'No texture restraints for this phase'),0,)
         TextureRestr.SetSizer(mainSizer)
-        Size = mainSizer.Fit(G2frame.dataFrame)
+        Size = mainSizer.Fit(TextureRestr)
         Size[0] = 600
         Size[1] = min(Size[1]+50,500)       #make room for tab, but not too big