Changeset 39f0bf4 in sasview

Timestamp:

Mar 22, 2017 7:22:37 AM (7 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:

e075203

Parents:

09f2328

Message:

Modified slicer parameter panel to incorporate batch slicing. Added slicer combobox to slicer panel. Renamed files to be more explicit.

Location:

src/sas/sasgui/guiframe/local_perspectives/plotting

Files:

• Plotter2D.py (modified) (5 diffs)
• parameters_panel_boxsum.py (moved) (moved from src/sas/sasgui/guiframe/local_perspectives/plotting/slicerpanel.py)
• parameters_panel_slicer.py (moved) (moved from src/sas/sasgui/guiframe/local_perspectives/plotting/SlicerParameters.py) (4 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()
@@ -359 +360 @@
                 if self.slicer.__class__.__name__ != "BoxSum":
                     wx_id = ids.next()
-                    slicerpop.Append(wx_id, '&Edit Slicer Parameters')
+                    name = '&Edit Slicer Parameters and Batch Slicing'
+                    slicerpop.Append(wx_id, name)
                     wx.EVT_MENU(self, wx_id, self._onEditSlicer)
             slicerpop.AppendSeparator()
@@ -558 +560 @@
         """
         self.onCircular(event, True)
-
     def onCircular(self, event, ismask=False):
         """
@@ -628 +629 @@
         """
         if self.slicer != None:
-            from SlicerParameters import SlicerParameterPanel
+            from parameters_panel_slicer import SlicerParameterPanel
             dialog = SlicerParameterPanel(self, -1, "Slicer Parameters")
             dialog.set_slicer(self.slicer.__class__.__name__,
@@ -666 +667 @@
         params = self.slicer.get_params()
         ## Create a new panel to display results of summation of Data2D
-        from slicerpanel import SlicerPanel
+        from parameters_panel_boxsum import SlicerPanel
         win = MDIFrame(self.parent, None, 'None', (100, 200))
         new_panel = SlicerPanel(parent=win, id=-1,

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

@@ -7 +7 @@
 from sas.sasgui.guiframe.utils import format_number
 from sas.sasgui.guiframe.events import EVT_SLICER
-from sas.sasgui.guiframe.events import SlicerParameterEvent
+from sas.sasgui.guiframe.events import SlicerParameterEvent, SlicerEvent
 
 
@@ -56 +56 @@
         """
         self.bck.Clear(True)
+        self.bck.Add((5, 5), (0, 0), (1, 1),
+                     wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 5)
         self.type = type
         if type == None:
             label = "Right-click on 2D plot for slicer options"
             title = wx.StaticText(self, -1, label, style=wx.ALIGN_LEFT)
-            self.bck.Add(title, (0, 0), (1, 2),
+            self.bck.Add(title, (1, 0), (1, 2),
                          flag=wx.LEFT | wx.ALIGN_CENTER_VERTICAL, border=15)
         else:
             title = wx.StaticText(self, -1,
                                   "Slicer Parameters", style=wx.ALIGN_LEFT)
-            self.bck.Add(title, (0, 0), (1, 2),
+            self.bck.Add(title, (1, 0), (1, 2),
                          flag=wx.LEFT | wx.ALIGN_CENTER_VERTICAL, border=15)
             ix = 0
-            iy = 0
+            iy = 1
             self.parameters = []
             keys = params.keys()
@@ -104 +106 @@
                     self.bck.Add(ctl, (iy, ix), (1, 1),
                                  wx.EXPAND | wx.ADJUST_MINSIZE, 0)
+            ix = 0
+            iy += 1
+
+            # Change slicer within the window
+            txt = "Slicer"
+            text = wx.StaticText(self, -1, txt, style=wx.ALIGN_LEFT)
+            self.bck.Add(text, (iy, ix), (1, 1),
+                         wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
+            type_list = ["SectorInteractor", "AnnulusInteractor",
+                         "BoxInteractorX", "BoxInteractorY"]
+            self.type_select = wx.ComboBox(parent=self, choices=type_list)
+            self.Bind(wx.EVT_COMBOBOX, self.onChangeSlicer)
+            index = self.type_select.FindString(self.type)
+            self.type_select.SetSelection(index)
+            self.bck.Add(self.type_select, (iy, 1), (1, 1),
+                         wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
+
+            # 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)
+            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
-            self.bck.Add((20, 20), (iy, ix), (1, 1),
-                         wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
+            self.bck.Add((5, 5), (iy, ix), (1, 1),
+                         wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 5)
         self.bck.Layout()
         self.bck.Fit(self)
@@ -145 +176 @@
             event = SlicerParameterEvent(type=self.type, params=params)
             wx.PostEvent(self.parent, event)
+
+    def onToggleBatchSlicing(self, evt=None):
+        """
+        Batch slicing parameters 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)
+
+    def onChangeSlicer(self, evt):
+        """
+        Change the slicer type when changed in the dropdown
+        :param evt: Event triggering this change
+        """
+        type = self.type_select.GetStringSelection()
+        if self.type != type:
+            if type == "SectorInteractor":
+                self.parent.onSectorQ(None)
+            elif type == "AnnulusInteractor":
+                self.parent.onSectorPhi(None)
+            elif type == "BoxInteractorX":
+                self.parent.onBoxavgX(None)
+            elif type == "BoxInteractorY":
+                self.parent.onBoxavgY(None)