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

branch/2frame/GSASIIgrid.py

@@ -1627 +1627 @@
         '''
         self.datamenu = menu
-        self.GetGrandParent().GetParent().FillMainMenu(menu,addhelp=False) # add the data tree menu items to the main menu
+        self.GetTopLevelParent().FillMainMenu(menu,addhelp=False) # add the data tree menu items to the main menu
         if not empty:
             menu.Append(wx.Menu(title=''),title='|') # add a separator
@@ -1826 +1826 @@
                         ):
             objlist = []
-            for obj in self.parent.GetParent().GetParent().exporterlist:
+            for obj in self.parent.GetTopLevelParent().exporterlist:
                 if lbl.lower() in obj.exporttype:
                     try:
@@ -2376 +2376 @@
         # setup a cascade menu for the formats that have been defined
         self.ReImportMenuId = {}  # points to readers for each menu entry
-        for reader in self.parent.GetParent().GetParent().ImportPhaseReaderlist:
+        for reader in self.parent.GetTopLevelParent().ImportPhaseReaderlist:
             item = submenu.Append(
                 wx.ID_ANY,help=reader.longFormatName,
@@ -2599 +2599 @@
         self.SetBackgroundColour(wx.WHITE)
         self.DestroyChildren()
-#        self.SetSize(self.GetParent().GetSize())
+        self.SetSize(self.GetParent().GetSize())
+        self.SetAutoLayout(True)
+        self.SetupScrolling()
         
 #TODO - remove         
@@ -2698 +2700 @@
     G2frame.SetLabel(G2frame.GetLabel().split('||')[0]+' || '+'Comments')
     G2frame.dataWindow.ClearData()
-    G2frame.dataWindow.SetupScrolling()
+#    G2frame.dataWindow.SetupScrolling()
     text = wx.TextCtrl(parent=G2frame.dataWindow,size=G2frame.dataWindow.GetSize(),
         style=wx.TE_MULTILINE|wx.TE_READONLY|wx.TE_DONTWRAP)