Changeset 66aeb15 in sasview

Timestamp:

Mar 2, 2017 3:48:43 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

4afe1ba

Parents:

a97aebd

Message:

data panel: put the data/theory label in the tree root so it is visible even when the tree is closed

File:

• src/sas/sasgui/guiframe/data_panel.py (modified) (4 diffs)

src/sas/sasgui/guiframe/data_panel.py

@@ -74 +74 @@
     Check list control to be used for Data Panel
     """
-    def __init__(self, parent, *args, **kwds):
+    def __init__(self, parent, root, *args, **kwds):
         # agwstyle is introduced in wx.2.8.11 but is not working for mac
         if IS_MAC and wx_version < 812:
@@ -97 +97 @@
                     del kwds['style']
                     CT.CustomTreeCtrl.__init__(self, parent, *args, **kwds)
-        self.root = self.AddRoot("Available Data")
+        self.root = self.AddRoot(root)
 
     def OnCompareItems(self, item1, item2):
@@ -531 +531 @@
         theory_sizer.SetMinSize(wx.Size(w/13, h*2/5))
 
-        self.tree_ctrl = DataTreeCtrl(parent=splitter, style=wx.SUNKEN_BORDER)
+        self.tree_ctrl = DataTreeCtrl(parent=splitter,
+                                      style=wx.SUNKEN_BORDER,
+                                      root="Available Data")
 
         self.tree_ctrl.Bind(CT.EVT_TREE_ITEM_CHECKING, self.on_check_item)
@@ -568 +570 @@
 
         self.tree_ctrl_theory = DataTreeCtrl(parent=splitter,
-                                             style=wx.SUNKEN_BORDER)
+                                             style=wx.SUNKEN_BORDER,
+                                             root="Available Theory")
         self.tree_ctrl_theory.Bind(CT.EVT_TREE_ITEM_CHECKING,
                                    self.on_check_item)
         self.tree_ctrl_theory.Bind(CT.EVT_TREE_ITEM_MENU,
                                    self.on_right_click_theory)
-        self.tree_ctrl.InsertItem(self.tree_ctrl.root, -1, " Data")
-        self.tree_ctrl_theory.InsertItem(self.tree_ctrl_theory.root,
-                                         -1, " Theory")
         splitter.SplitHorizontally(self.tree_ctrl, self.tree_ctrl_theory)
         self.sizer1.Add(splitter, 1, wx.EXPAND | wx.ALL, 10)