Changeset 2890 for branch/2frame/GSASIIpwdGUI.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/GSASIIpwdGUI.py (modified) (5 diffs)

branch/2frame/GSASIIpwdGUI.py

@@ -2248 +2248 @@
         # Assemble a list of item labels
         TextTable = {key:label for key,label,dig in
-                     SetupSampleLabels(hst,data.get('Type'),Inst['Type'][0])
-                     }
+            SetupSampleLabels(hst,data.get('Type'),Inst['Type'][0])}
         # get flexible labels
-        TextTable.update({
-            key:Controls[key] for key in Controls if key.startswith('FreePrm')
-            })
+        TextTable.update({key:Controls[key] for key in Controls if key.startswith('FreePrm')})
         # add a few extra
-        TextTable.update({
-            'Type':'Diffractometer type',
-            'InstrName':'Instrument Name',
-            })
+        TextTable.update({'Type':'Diffractometer type','InstrName':'Instrument Name',})
         # Assemble a list of dict entries that would be labeled in the Sample
         # params data window (drop ranId and items not used).
@@ -2425 +2419 @@
     mainSizer = wx.BoxSizer(wx.VERTICAL)
     topSizer = wx.BoxSizer(wx.HORIZONTAL)
-    topSizer.Add((-1,-1),1,wx.EXPAND,1)
-    topSizer.Add(wx.StaticText(G2frame.dataWindow,label='Sample and Experimental Parameters'))
-    topSizer.Add((-1,-1),1,wx.EXPAND,1)
-    mainSizer.Add(topSizer,0,wx.EXPAND,1)
+    topSizer.Add((-1,-1),0,WACV)
+    topSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Sample and Experimental Parameters'))
+    topSizer.Add((-1,-1),0,WACV)
+    mainSizer.Add(topSizer,0,WACV)
     nameSizer = wx.BoxSizer(wx.HORIZONTAL)
-    nameSizer.Add(wx.StaticText(G2frame.dataWindow,wx.ID_ANY,' Instrument Name'),
-                0,WACV)
-    nameSizer.Add((-1,-1),1,wx.EXPAND,1)
+    nameSizer.Add(wx.StaticText(G2frame.dataWindow,wx.ID_ANY,' Instrument Name '),0,WACV)
+    nameSizer.Add((-1,-1),1,WACV)
     instNameVal = wx.TextCtrl(G2frame.dataWindow,wx.ID_ANY,data['InstrName'],
-                              size=(200,-1),style=wx.TE_PROCESS_ENTER)        
+        size=(200,-1),style=wx.TE_PROCESS_ENTER)        
     nameSizer.Add(instNameVal)
     instNameVal.Bind(wx.EVT_CHAR,OnNameVal)
-    mainSizer.Add(nameSizer,0,wx.EXPAND,1)
+    mainSizer.Add(nameSizer,0,WACV)
     mainSizer.Add((5,5),0)
     labelLst.append('Instrument Name')
@@ -2456 +2449 @@
                     onChoice=OnHistoChange)
         nameSizer.Add(histoType)
-        mainSizer.Add(nameSizer,0,wx.EXPAND,1)
+        mainSizer.Add(nameSizer,0,WACV)
         mainSizer.Add((5,5),0)
 
@@ -2477 +2470 @@
             elemKeysLst.append([key])
             refFlgElem.append(None)
-        parmSizer.Add(parmVal,1,wx.EXPAND)
+        parmSizer.Add(parmVal,0,WACV)
     Info = {}
         
@@ -2485 +2478 @@
         parmSizer.Add(parmVal,1,wx.EXPAND)
         parmVal = G2G.ValidatedTxtCtrl(G2frame.dataWindow,data,key,typeHint=float)
-        parmSizer.Add(parmVal,1,wx.EXPAND)
+        parmSizer.Add(parmVal,0,WACV)
         labelLst.append(Controls[key])
         dspLst.append(None)