Changeset 09f2328 in sasview

Timestamp:

Mar 3, 2017 5:03:24 PM (7 years ago)

Author:

GitHub <noreply@…>

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:

39f0bf4, 05d167e, 082239e, d0764bf, c08756f, 7e98655

Parents:

951701c (diff), a45a298 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Paul Kienzle <pkienzle@…> (03/03/17 17:03:24)

git-committer:

GitHub <noreply@…> (03/03/17 17:03:24)

Message:

Merge pull request #17 from SasView?/expandable-de-688

Horizontal splitter to enable control of Data/Theory? boxes. Refs #688

File:

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

src/sas/sasgui/guiframe/data_panel.py

@@ -66 +66 @@
     IS_MAC = True
 
-STYLE_FLAG = wx.RAISED_BORDER | CT.TR_HAS_BUTTONS | CT.TR_HIDE_ROOT |\
-                    wx.WANTS_CHARS | CT.TR_HAS_VARIABLE_ROW_HEIGHT
+STYLE_FLAG = (wx.RAISED_BORDER | CT.TR_HAS_BUTTONS |
+                    wx.WANTS_CHARS | CT.TR_HAS_VARIABLE_ROW_HEIGHT)
 
 
@@ -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):
@@ -520 +520 @@
         Add a listcrtl in the panel
         """
-        tree_ctrl_label = wx.StaticText(self, -1, "Data")
-        tree_ctrl_label.SetForegroundColour('blue')
-        self.tree_ctrl = DataTreeCtrl(parent=self, style=wx.SUNKEN_BORDER)
+        # Add splitter
+        w, h = self.parent.GetSize()
+        splitter = wx.SplitterWindow(self)
+        splitter.SetMinimumPaneSize(50)
+        splitter.SetSashGravity(1.0)
+
+        file_sizer = wx.BoxSizer(wx.VERTICAL)
+        file_sizer.SetMinSize(wx.Size(w/13, h*2/5))
+        theory_sizer = wx.BoxSizer(wx.VERTICAL)
+        theory_sizer.SetMinSize(wx.Size(w/13, h*2/5))
+
+        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)
         self.tree_ctrl.Bind(CT.EVT_TREE_ITEM_MENU, self.on_right_click_data)
@@ -557 +569 @@
         wx.EVT_MENU(self, self.editmask_id, self.on_edit_data)
 
-        tree_ctrl_theory_label = wx.StaticText(self, -1, "Theory")
-        tree_ctrl_theory_label.SetForegroundColour('blue')
-        self.tree_ctrl_theory = DataTreeCtrl(parent=self,
-                                             style=wx.SUNKEN_BORDER)
+        self.tree_ctrl_theory = DataTreeCtrl(parent=splitter,
+                                             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.sizer1.Add(tree_ctrl_label, 0, wx.LEFT, 10)
-        self.sizer1.Add(self.tree_ctrl, 1, wx.EXPAND | wx.ALL, 10)
-        self.sizer1.Add(tree_ctrl_theory_label, 0,  wx.LEFT, 10)
-        self.sizer1.Add(self.tree_ctrl_theory, 1, wx.EXPAND | wx.ALL, 10)
+        splitter.SplitHorizontally(self.tree_ctrl, self.tree_ctrl_theory)
+        self.sizer1.Add(splitter, 1, wx.EXPAND | wx.ALL, 10)
 
     def on_right_click_theory(self, event):
@@ -722 +731 @@
             if self.tree_ctrl.root:
                 self.tree_ctrl.SortChildren(self.tree_ctrl.root)
+            # Expand root if # of data sets > 0
+            if self.tree_ctrl.GetCount() > 0:
+                self.tree_ctrl.root.Expand()
         self.enable_remove()
         self.enable_import()
@@ -760 +772 @@
                                        state_id=state_id,
                                        theory_list=theory_list)
+        if self.tree_ctrl_theory.GetCount() > 0:
+            self.tree_ctrl_theory.root.Expand()
 
     def append_theory_helper(self, tree, root, state_id, theory_list):