Changeset dfa1579 in sasview

Timestamp:

Mar 30, 2017 9:47:56 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:

a099131

Parents:

df27aa8

git-author:

Jeff Krzywon <krzywon@…> (03/30/17 09:47:56)

git-committer:

krzywon <krzywon@…> (03/30/17 09:47:56)

Message:

Remove 1D data from batch slice list. Keep initial data set checked. Remove unused parameter.

Location:

src/sas/sasgui/guiframe/local_perspectives/plotting

Files:

• Plotter2D.py (modified) (1 diff)
• parameters_panel_slicer.py (modified) (3 diffs)

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

@@ -128 +128 @@
         self.title_font = None
         self.title_color = 'black'
-        self.batch_slicer = None
         ## Graph
         self.graph = Graph()

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

@@ -9 +9 @@
 from sas.sasgui.guiframe.events import SlicerParameterEvent, SlicerEvent
 from Plotter2D import ModelPanel2D
+from sas.sascalc.dataloader.data_info import Data1D, Data2D
 
 
@@ -136 +137 @@
                          wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
             iy += 1
-            id = wx.NewId()
-            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,
-                                        choices=choices,
-                                        name="Apply Slicer to Data Sets:")
+            self.process_list()
             self.bck.Add(self.data_list, (iy, ix), (1, 1),
                          wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
@@ -274 +267 @@
             for child_ctrl in data_ctrl.GetChildren():
                 self.tree_ctrl.CheckItem(child_ctrl, check_value)
+
+    def process_list(self):
+        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)
+        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)
+        self.data_list.Bind(wx.EVT_CHECKLISTBOX, self.onCheckBoxList)
+
+    def onCheckBoxList(self, e):
+        index = e.GetSelection()
+        if index == self.checkme:
+            self.data_list.Check(index)