Changeset f6bb24d in sasview

Timestamp:

Mar 22, 2017 4:32:23 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:

24fc06a

Parents:

e075203

Message:

base prototype of the batch slicing window loads.

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

@@ -66 +66 @@
         else:
             title = wx.StaticText(self, -1,
-                                  "Slicer Parameters", style=wx.ALIGN_LEFT)
+                                  "Slicer Parameters:", style=wx.ALIGN_LEFT)
             self.bck.Add(title, (1, 0), (1, 2),
                          flag=wx.LEFT | wx.ALIGN_CENTER_VERTICAL, border=15)
@@ -124 +124 @@
 
             # batch slicing parameters
-            iy += 1
-            button_label = "Batch Slicing"
-            self.batch_slicer_button = wx.Button(parent=self, label=button_label)
-            self.Bind(wx.EVT_BUTTON, self.onToggleBatchSlicing)
+            title_text = "Batch Slicing Options:"
+            title = wx.StaticText(self, -1, title_text, style=wx.ALIGN_LEFT)
+            iy += 1
+            ln = wx.StaticLine(self, -1, style=wx.LI_VERTICAL)
+            ln.SetSize((60,60))
+            self.bck.Add(ln, (iy, ix), (1, 2),
+                         wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
+            iy += 1
+            self.bck.Add(title, (iy, ix), (1, 1),
+                         wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
+            iy += 1
+            id = wx.NewId()
+            # TODO: Get list of data objects already loaded
+            choices = ("a", "b", "c", "d")
+            self.data_list = wx.CheckListBox(parent=self, id=id,
+                                        choices=choices,
+                                        name="Apply Slicer to Data Sets:")
+            self.bck.Add(self.data_list, (iy, ix), (1, 1),
+                         wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
+            iy += 1
+            button_label = "Apply Slicer to Selected Files"
+            self.batch_slicer_button = wx.Button(parent=self,
+                                                 label=button_label)
+            self.Bind(wx.EVT_BUTTON, self.onBatchSlice)
             self.bck.Add(self.batch_slicer_button, (iy, ix), (1, 1),
                              wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
-            self.batch_slice_params = wx.GridBagSizer(5, 5)
-            self.bck.Hide(item=self.batch_slice_params, recursive=True)
-            iy += 1
-            self.bck.Add(self.batch_slice_params, (iy, ix), (1, 1),
-                         wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
-            iy += 1
-            ix = 1
+            # TODO: Check box for saving file
+            # TODO: append to file information and file type
+            # TODO: Send to fitting options
+
+            iy += 1
             self.bck.Add((5, 5), (iy, ix), (1, 1),
                          wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 5)
@@ -178 +196 @@
             wx.PostEvent(self.parent, event)
 
-    def onToggleBatchSlicing(self, evt=None):
-        """
-        Batch slicing parameters button is pushed
+    def onBatchSlice(self, evt=None):
+        """
+        Batch slicing button is pushed
         :param evt: Event triggering hide/show of the batch slicer parameters
         """
-        if self.bck.IsShown(item=self.batch_slice_params):
-            self.bck.Hide(item=self.batch_slice_params, recursive=True)
-        else:
-            self.bck.Show(item=self.batch_slice_params, recursive=True)
+        for item in self.data_list.Checked:
+            print item
+            # Process each data file
+            # TODO: plot data
+            # TODO: apply slicer
+            # TODO: save file (if desired)
+            # TODO: send to fitting (if desired)
+            plot = None
+            slicer = None
+            f_name = None
 
     def onChangeSlicer(self, evt):