Changeset f15da54 in sasview

Timestamp:

Apr 4, 2017 11:00:39 AM (8 years ago)

Author:

krzywon

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.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

1661cd5

Parents:

a099131

git-author:

Jeff Krzywon <krzywon@…> (04/04/17 11:00:39)

git-committer:

krzywon <krzywon@…> (04/04/17 11:00:39)

Message:

Apply slicer to plots via events. Look for loaded plots instead of loaded data.

File:

• src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (modified) (8 diffs)

src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py

@@ -11 +11 @@
 from Plotter2D import ModelPanel2D
 from sas.sascalc.dataloader.data_info import Data1D, Data2D
+ApplyParams, EVT_APPLY_PARAMS = wx.lib.newevent.NewEvent()
 
 
@@ -17 +18 @@
     Panel class to show the slicer parameters
     """
-    #TODO: show units
-    #TODO: order parameters properly
+    # TODO: show units
+    # TODO: order parameters properly
 
     def __init__(self, parent, *args, **kwargs):
@@ -40 +41 @@
         self.parent.Bind(EVT_SLICER, self.onEVT_SLICER)
         self.parent.Bind(EVT_SLICER_PARS, self.onParamChange)
+        self.Bind(EVT_APPLY_PARAMS, self.apply_params_list)
 
     def onEVT_SLICER(self, event):
@@ -141 +143 @@
                          wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
             iy += 1
-            button_label = "Apply Slicer to Selected Files"
+            button_label = "Apply Slicer to Selected Plots"
             self.batch_slicer_button = wx.Button(parent=self,
                                                  label=button_label)
@@ -196 +198 @@
     def onBatchSlice(self, evt=None):
         """
-        Batch slicing button is pushed
+        Method invoked with batch slicing button is pressed
         :param evt: Event triggering hide/show of the batch slicer parameters
         """
-        self.parent.parent._data_panel._uncheck_all()
         apply_to_list = []
-        plot_list = []
         spp = self.parent.parent
-        data_panel = spp._data_panel
-        data_list = data_panel.list_cb_data
         params = self.parent.slicer.get_params()
         type = self.type_select.GetStringSelection()
 
-        # Process each data file individually
-        for item in self.data_list.CheckedStrings:
-            # Get data_id
-            num = len(item)
-            for key in data_list:
-                loaded_key = (key[:num]) if len(key) > num else key
-                if loaded_key == item:
-                    selection = key
-                    break
-
-            # Check the data checkbox
-            data_ctrl = data_list[selection][0]
-            self.check_item_and_children(data_ctrl=data_ctrl, check_value=True)
-            plot_list.append(item)
-
-        # Plot all checked data
-        data_panel.on_plot()
-        time.sleep(1.0)
-
         # Find loaded 2D data panels
         for key, mgr in spp.plot_panels.iteritems():
-            if mgr.graph.prop['title'] in plot_list:
+            if mgr.graph.prop['title'] in self.data_list.CheckedStrings:
                 apply_to_list.append(mgr)
 
@@ -235 +214 @@
         for item in apply_to_list:
             self._apply_slicer_to_plot(item, type)
-            item.slicer.set_params(params)
-            item.slicer.base.update()
+
+        event = ApplyParams(params=params, plot_list=apply_to_list)
+        wx.PostEvent(self, event)
 
         # TODO: save file (if desired)
@@ -251 +231 @@
         """
         Apply a slicer to *any* plot window, not just parent window
-        :param plot:
-        :return:
+        :param plot: 2D plot panel to apply a slicer to
+        :param type: The type of slicer to apply to the panel
+        :return: Return the plot with the slicer applied
         """
         if type is None:
@@ -265 +246 @@
             plot.onBoxavgY(None)
 
-    def check_item_and_children(self, data_ctrl, check_value=True):
-        self.parent.parent._data_panel.tree_ctrl.CheckItem(data_ctrl,
-                                                           check_value)
-        if data_ctrl.HasChildren():
-            if check_value and not data_ctrl.IsExpanded():
-                # Only select children if control is expanded
-                # Always deselect children, regardless (see ticket #259)
-                return
-            for child_ctrl in data_ctrl.GetChildren():
-                self.tree_ctrl.CheckItem(child_ctrl, check_value)
-
     def process_list(self):
+        self.checkme = None
         main_window = self.parent.parent
         self.loaded_data = []
         id = wx.NewId()
-        for key, value in main_window._data_manager.stored_data.iteritems():
-            if isinstance(value.data, Data2D):
-                self.loaded_data.append(value.data.name)
-            if key == self.parent.data2D.id:
-                self.checkme = self.loaded_data.index(value.data.name)
+        for key, value in main_window.plot_panels.iteritems():
+            if isinstance(value, ModelPanel2D):
+                self.loaded_data.append(value.data2D.name)
+                if value.data2D.id == self.parent.data2D.id:
+                    self.checkme = self.loaded_data.index(value.data2D.name)
         self.data_list = wx.CheckListBox(parent=self, id=id,
                                          choices=self.loaded_data,
-                                         name="Apply Slicer to Data Sets:")
-        self.data_list.Check(self.checkme)
+                                         name="Apply Slicer to 2D Plots:")
+        if self.checkme is not None:
+            self.data_list.Check(self.checkme)
         self.data_list.Bind(wx.EVT_CHECKLISTBOX, self.onCheckBoxList)
 
     def onCheckBoxList(self, e):
+        """
+        Do not allow a checkbox to be unchecked
+        :param e: Event triggered when a checkbox list item is checked
+        """
         index = e.GetSelection()
         if index == self.checkme:
             self.data_list.Check(index)
+
+    def apply_params_list(self, evt=None):
+        for item in evt.plot_list:
+            item.slicer.set_params(evt.params)
+            item.slicer.base.update()
+        self.Destroy()