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

branch/2frame/GSASII.py

@@ -2563 +2563 @@
         self.mainPanel = GSASIIsplit(self,-1)
         self.treePanel = wx.Panel(self.mainPanel, wx.ID_ANY,
-                style = wx.TAB_TRAVERSAL|wx.SUNKEN_BORDER)
+            style = wx.TAB_TRAVERSAL|wx.SUNKEN_BORDER)
         self.treePanel.SetAutoLayout(True)
         self.dataPanel = wx.Panel(self.mainPanel, wx.ID_ANY,
-                style = wx.TAB_TRAVERSAL|wx.SUNKEN_BORDER)
-        self.dataPanel.SetAutoLayout(True)
+            style = wx.TAB_TRAVERSAL|wx.SUNKEN_BORDER)
         self.dataWindow = G2gd.DataWindow(self.dataPanel)
-        self.dataWindow.SetupScrolling()
+        self.dataWindow.SetAutoLayout(True)
+        self.dataWindow.SetInitialSize()
         self.mainPanel.SetMinimumPaneSize(100)
         self.mainPanel.SplitVertically(self.treePanel, self.dataPanel, 200)
@@ -2711 +2711 @@
         'Called to make PatternTree fill mainPanel'
         w,h = self.GetClientSizeTuple()
+        self.dataWindow.SetupScrolling()
+        self.mainPanel.SetSize(wx.Size(w,h+1))
         self.mainPanel.SetSize(wx.Size(w,h))
         self.PatternTree.SetSize(wx.Size(w,h))
+        self.dataWindow.SetSize(wx.Size(w,h))
+#        self.dataWindow.Refresh()
+#        self.dataWindow.Update()
         
     def SetDataSize(self):
         Size = self.GetSize()
+        Size[1] += 1        #kluge to ensure scrollbar settings & window properly displayed
         self.SetSize(Size)
-        Size[1] += 1        #kluge to ensure scrollbar settings & window properly displayed
+        Size[1] -= 1        #kluge to ensure scrollbar settings & window properly displayed
         self.SetSize(Size)