Changeset df27aa8 in sasview

Timestamp:

Mar 24, 2017 1:51:00 PM (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:

dfa1579

Parents:

ba90c32

git-author:

Jeff Krzywon <krzywon@…> (03/24/17 13:51:00)

git-committer:

krzywon <krzywon@…> (03/24/17 13:51:00)

Message:

Plot data so it is added to plot_manager. Add non-event drive slicer change method. Commented code.

File:

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

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

@@ -8 +8 @@
 from sas.sasgui.guiframe.events import EVT_SLICER
 from sas.sasgui.guiframe.events import SlicerParameterEvent, SlicerEvent
+from Plotter2D import ModelPanel2D
 
 
@@ -138 +139 @@
             main_window = self.parent.parent
             self.loaded_data = main_window._data_manager.data_name_dict
+            # TODO: remove 1D data from choices
+            # TODO: auto check current data set
             choices = self.loaded_data.keys()
             self.data_list = wx.CheckListBox(parent=self, id=id,
@@ -205 +208 @@
         for item in self.data_list.CheckedStrings:
             # Get data_id
-            data_dict = self.parent.parent._data_manager.get_by_name([item])
-            data_ids = data_dict.keys()
-            # Plot data
-            self.parent.parent.plot_data(state_id=[], data_id=data_ids, theory_id=[])
-            # TODO: apply slicer
+            num = len(item)
+            spp = self.parent.parent
+            data_panel = spp._data_panel
+            data_list = data_panel.list_cb_data
+            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 all checked data
+            data_panel.on_plot()
+            panel = plot_mgr = None
+            plot_mgrs = spp.plot_panels
+            for key, mgr in plot_mgrs.iteritems():
+                if isinstance(mgr, ModelPanel2D):
+                    plot_mgr = mgr
+                    break
+            if plot_mgr is not None:
+                # TODO: find proper plot window
+                panels = plot_mgr._manager.plot_panels
+                for _, pane in panels.iteritems():
+                    if pane.window_name == item:
+                        panel = pane
+                # TODO: apply slicer
+                print(panels)
+                if panel is not None:
+                    self._apply_slicer_to_plot(panel)
             # TODO: save file (if desired)
             # TODO: send to fitting (if desired)
-            plot = None
-            slicer = None
-            f_name = None
 
     def onChangeSlicer(self, evt):
         """
-        Change the slicer type when changed in the dropdown
+        Event driven slicer change when self.type_select changes
         :param evt: Event triggering this change
+        """
+        self._apply_slicer_to_plot(self.parent)
+
+    def _apply_slicer_to_plot(self, plot):
+        """
+        Apply a slicer to *any* plot window, not just parent window
+        :param plot:
+        :return:
         """
         type = self.type_select.GetStringSelection()
         if self.type != type:
             if type == "SectorInteractor":
-                self.parent.onSectorQ(None)
+                plot.onSectorQ(None)
             elif type == "AnnulusInteractor":
-                self.parent.onSectorPhi(None)
+                plot.onSectorPhi(None)
             elif type == "BoxInteractorX":
-                self.parent.onBoxavgX(None)
+                plot.onBoxavgX(None)
             elif type == "BoxInteractorY":
-                self.parent.onBoxavgY(None)
+                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)