Changeset 3368

Timestamp:

May 2, 2018 11:44:20 PM (6 years ago)

Author:

toby

Message:

stop scrolling header for parameter display

File:

• trunk/GSASIIctrlGUI.py (modified) (4 diffs)

trunk/GSASIIctrlGUI.py

@@ -3388 +3388 @@
         listSel.Bind(wx.EVT_RADIOBOX,OnListSel)
         mainSizer.Add(listSel,0)
-
+        
+        headSizer = wx.wx.BoxSizer(wx.HORIZONTAL) # non-scrolling header        
         self.panel = wxscroll.ScrolledPanel(self)        
         subSizer = wx.FlexGridSizer(cols=4,hgap=2,vgap=2)
-        subSizer.Add((-1,-1))
-        subSizer.Add(wx.StaticText(self.panel,wx.ID_ANY,'Parameter name  '))
-        subSizer.Add(wx.StaticText(self.panel,wx.ID_ANY,'refine?'))
-        subSizer.Add(wx.StaticText(self.panel,wx.ID_ANY,'value'),0,wx.ALIGN_RIGHT)
+        # header now gets created later
+#        subSizer.Add((-1,-1))
+#        subSizer.Add(wx.StaticText(self.panel,wx.ID_ANY,'Parameter name  '))
+#        subSizer.Add(wx.StaticText(self.panel,wx.ID_ANY,'refine?'))
+#        subSizer.Add(wx.StaticText(self.panel,wx.ID_ANY,'value'),0,wx.ALIGN_RIGHT)
         explainRefine = False
         count = 0
@@ -3421 +3423 @@
             subSizer.Add(wx.StaticText(self.panel,wx.ID_ANY,str(name)))
             if name in self.varyList:
-                subSizer.Add(wx.StaticText(self.panel,label='R'))   #TODO? maybe a checkbox for one stop refinemnt flag setting?
+                subSizer.Add(wx.StaticText(self.panel,label='R',size=(50,-1)))   #TODO? maybe a checkbox for one stop refinemnt flag setting?
             elif name in self.fullVaryList:
-                subSizer.Add(wx.StaticText(self.panel,label='C'))
+                subSizer.Add(wx.StaticText(self.panel,label='C',size=(50,-1)))
                 explainRefine = True
             else:
-                subSizer.Add((-1,-1))
+                subSizer.Add((50,-1))
             subSizer.Add(wx.StaticText(self.panel,label=value),0,wx.ALIGN_RIGHT)
             count += 1
@@ -3435 +3437 @@
                 mainSizer.Add((-1,10))
                 break
+        mainSizer.Add(headSizer,0)
         self.panel.SetSizer(subSizer)
         mainSizer.Add(self.panel,1,wx.ALL|wx.EXPAND,1)
@@ -3452 +3455 @@
         self.panel.SetupScrolling()
         self.SetMinSize(self.GetSize())        # Allow window to be enlarged but not made smaller
+        for txt,wid,loc in zip(['','Parameter name','refine?','value'],subSizer.GetColWidths(),
+                           [wx.ALIGN_LEFT,wx.ALIGN_LEFT,wx.ALIGN_LEFT,wx.ALIGN_RIGHT]):
+            headSizer.Add(wx.StaticText(self,wx.ID_ANY,txt,size=(wid,-1),style=loc),0,loc)
         self.SendSizeEvent()