Changeset a97aebd in sasview for src/sas

Timestamp:

Mar 2, 2017 3:44:58 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:

66aeb15

Parents:

8fa3fb8 (diff), 951701c (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.

Message:

Merge branch 'master' into expandable-de-688

Location:

src/sas/sasgui

Files:

• perspectives/fitting/fitpage.py (modified) (6 diffs)
• perspectives/fitting/model_thread.py (modified) (1 diff)
• guiframe/data_panel.py (modified) (3 diffs)

src/sas/sasgui/perspectives/fitting/fitpage.py

@@ -164 +164 @@
         On_select_data
         """
-        if event is None and self.dataSource.GetCount() > 0:
-            data = self.dataSource.GetClientData(0)
-            self.set_data(data)
-        elif self.dataSource.GetCount() > 0:
-            pos = self.dataSource.GetSelection()
+        if self.dataSource.GetCount() > 0:
+            pos = self.dataSource.GetSelection() if event is not None else 0
             data = self.dataSource.GetClientData(pos)
             self.set_data(data)
@@ -256 +253 @@
         self.Bind(wx.EVT_RADIOBUTTON, self.onWeighting,
                   id=self.dI_idata.GetId())
-        self.dI_didata.SetValue(True)
+        self.dI_noweight.SetValue(True)
         # add 4 types of weighting to the sizer
         sizer_weighting.Add(self.dI_noweight, 0, wx.LEFT, 10)
@@ -266 +263 @@
         sizer_weighting.Add(self.dI_idata)
         sizer_weighting.Add((10, 10))
-        self.dI_noweight.Enable(False)
+        self.dI_noweight.Enable(True)
         self.dI_didata.Enable(False)
         self.dI_sqrdata.Enable(False)
@@ -1271 +1268 @@
             if copy_flag:
                 self.get_paste_params(copy_flag)
-                wx.CallAfter(self._onDraw, None)
+            wx.CallAfter(self._onDraw, None)
 
         else:
@@ -1627 +1624 @@
         elif data.dxl is not None or data.dxw is not None:
             self.smear_type = "Slit"
-            if data.dxl is not None and not numpy.all(data.dxl, 0):
+            if data.dxl is not None and numpy.all(data.dxl, 0):
                 self.dq_l = data.dxl[0]
-            if data.dxw is not None and not numpy.all(data.dxw, 0):
+            if data.dxw is not None and numpy.all(data.dxw, 0):
                 self.dq_r = data.dxw[0]
         # return self.smear_type,self.dq_l,self.dq_r
@@ -2016 +2013 @@
             self.EditMask_title.Disable()
 
-        self.onSmear(event=None)
+        self.on_smear_helper()
         self.on_set_focus(None)
         self.Refresh()

src/sas/sasgui/perspectives/fitting/model_thread.py

@@ -177 +177 @@
             unsmeared_output = numpy.zeros((len(self.data.x)))
             unsmeared_output[first_bin:last_bin+1] = self.model.evalDistribution(mask)
+            self.smearer.model = self.model
             output = self.smearer(unsmeared_output, first_bin, last_bin)
 

src/sas/sasgui/guiframe/data_panel.py

@@ -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)
+
         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 +567 @@
         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,
+        self.tree_ctrl_theory = DataTreeCtrl(parent=splitter,
                                              style=wx.SUNKEN_BORDER)
         self.tree_ctrl_theory.Bind(CT.EVT_TREE_ITEM_CHECKING,
@@ -565 +573 @@
         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)
+        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)
 
     def on_right_click_theory(self, event):