Changeset 6e6dd4c in sasview for src/sas/sasgui/guiframe/local_perspectives

Timestamp:

Apr 16, 2017 2:27:35 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

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:

914c49d5

Parents:

3e5648b (diff), e5cbbce (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into batch_slicer

Location:

src/sas/sasgui/guiframe/local_perspectives/plotting

Files:

• Plotter2D.py (modified) (9 diffs)
• SlicerParameters.py (deleted)
• parameters_panel_boxsum.py (moved) (moved from src/sas/sasgui/guiframe/local_perspectives/plotting/slicerpanel.py) (11 diffs)
• parameters_panel_slicer.py (added)

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

@@ -361 +361 @@
                 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()
@@ -532 +533 @@
 
         """
-        ## Clear current slicer
+        # Clear current slicer
         if self.slicer is not None:
             self.slicer.clear()
-        ## Create a new slicer
+        # Create a new slicer
         self.slicer_z += 1
         self.slicer = slicer(self, self.subplot, zorder=self.slicer_z)
         self.subplot.set_ylim(self.data2D.ymin, self.data2D.ymax)
         self.subplot.set_xlim(self.data2D.xmin, self.data2D.xmax)
-        ## Draw slicer
+        # Draw slicer
         self.update()
         self.slicer.update()
@@ -572 +573 @@
         npt = math.floor(npt)
         from sas.sascalc.dataloader.manipulations import CircularAverage
-        ## compute the maximum radius of data2D
+        # compute the maximum radius of data2D
         self.qmax = max(math.fabs(self.data2D.xmax),
                         math.fabs(self.data2D.xmin))
@@ -578 +579 @@
                         math.fabs(self.data2D.ymin))
         self.radius = math.sqrt(math.pow(self.qmax, 2) + math.pow(self.ymax, 2))
-        ##Compute beam width
+        # Compute beam width
         bin_width = (self.qmax + self.qmax) / npt
-        ## Create data1D circular average of data2D
+        # Create data1D circular average of data2D
         Circle = CircularAverage(r_min=0, r_max=self.radius,
                                  bin_width=bin_width)
@@ -599 +600 @@
         new_plot.name = "Circ avg " + self.data2D.name
         new_plot.source = self.data2D.source
-        #new_plot.info = self.data2D.info
+        # new_plot.info = self.data2D.info
         new_plot.interactive = True
         new_plot.detector = self.data2D.detector
 
-        ## If the data file does not tell us what the axes are, just assume...
+        # If the data file does not tell us what the axes are, just assume...
         new_plot.xaxis("\\rm{Q}", "A^{-1}")
         if hasattr(self.data2D, "scale") and \
@@ -615 +616 @@
         new_plot.id = "Circ avg " + self.data2D.name
         new_plot.is_data = True
-        self.parent.update_theory(data_id=self.data2D.id, \
-                                       theory=new_plot)
+        self.parent.update_theory(data_id=self.data2D.id, theory=new_plot)
         wx.PostEvent(self.parent,
                      NewPlotEvent(plot=new_plot, title=new_plot.name))
@@ -630 +630 @@
         """
         if self.slicer is not None:
-            from SlicerParameters import SlicerParameterPanel
+            from parameters_panel_slicer import SlicerParameterPanel
             dialog = SlicerParameterPanel(self, -1, "Slicer Parameters")
             dialog.set_slicer(self.slicer.__class__.__name__,
@@ -668 +668 @@
         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,
@@ -758 +758 @@
         if default_name.count('.') > 0:
             default_name = default_name.split('.')[0]
-        #default_name += "_out"
         if self.parent is not None:
             self.parent.show_data2d(data, default_name)
 
     def modifyGraphAppearance(self, e):
-        self.graphApp = graphAppearance(self, 'Modify graph appearance', legend=False)
+        self.graphApp = graphAppearance(self, 'Modify graph appearance',
+                                        legend=False)
         self.graphApp.setDefaults(self.grid_on, self.legend_on,
                                   self.xaxis_label, self.yaxis_label,

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

@@ -1 +1 @@
 import wx
 import wx.lib.newevent
-#from copy import deepcopy
+from parameters_panel_slicer import SlicerParameterPanel
 from sas.sasgui.guiframe.utils import format_number
-from sas.sasgui.guiframe.events import SlicerParameterEvent
-from sas.sasgui.guiframe.events import EVT_SLICER_PARS
-from sas.sasgui.guiframe.events import EVT_SLICER
+from sas.sasgui.guiframe.panel_base import PanelBase
+from sas.sasgui.guiframe.events import (SlicerParameterEvent, EVT_SLICER_PARS,
+                                        EVT_SLICER)
 
-from sas.sasgui.guiframe.panel_base import PanelBase
 
 class SlicerPanel(wx.Panel, PanelBase):
@@ -13 +12 @@
     Panel class to show the slicer parameters
     """
-    #TODO: show units
-    #TODO: order parameters properly
-    ## Internal name for the AUI manager
+    # Internal name for the AUI manager
     window_name = "Slicer panel"
-    ## Title to appear on top of the window
+    # Title to appear on top of the window
     window_caption = "Slicer Panel"
     CENTER_PANE = False
@@ -25 +22 @@
         wx.Panel.__init__(self, parent, id, *args, **kwargs)
         PanelBase.__init__(self)
-        ##  Initialization of the class
+        # Initialization of the class
         self.base = base
         if params is None:
@@ -44 +41 @@
         else:
             self.set_slicer(type, params)
-        ## Bindings
-        self.parent.Bind(EVT_SLICER, self.onEVT_SLICER)
-        self.parent.Bind(EVT_SLICER_PARS, self.onParamChange)
-
-    def onEVT_SLICER(self, event):
-        """
-        Process EVT_SLICER events
-        When the slicer changes, update the panel
-
-        :param event: EVT_SLICER event
-
-        """
-        event.Skip()
-        if event.obj_class is None:
-            self.set_slicer(None, None)
-        else:
-            self.set_slicer(event.type, event.params)
+        # Bindings
+        self.parent.Bind(EVT_SLICER, SlicerParameterPanel.on_evt_slicer)
+        self.parent.Bind(EVT_SLICER_PARS, SlicerParameterPanel.on_param_change)
 
     def set_slicer(self, type, params):
@@ -84 +67 @@
             keys.sort()
             for item in keys:
-                if not item.lower() in ["num_points", "avg", "avg_error", "sum", "sum_error"]:
+                if not item.lower() in ["num_points", "avg", "avg_error", "sum",
+                                        "sum_error"]:
                     n += 1
                     text = wx.StaticText(self, -1, item, style=wx.ALIGN_LEFT)
                     self.bck.Add(text, (n - 1, 0),
-                                 flag=wx.LEFT | wx.ALIGN_CENTER_VERTICAL, border=15)
+                                 flag=wx.LEFT | wx.ALIGN_CENTER_VERTICAL,
+                                 border=15)
                     ctl = wx.TextCtrl(self, -1, size=(80, 20),
                                       style=wx.TE_PROCESS_ENTER)
@@ -95 +80 @@
                     ctl.SetToolTipString(hint_msg)
                     ctl.SetValue(str(format_number(params[item])))
-                    self.Bind(wx.EVT_TEXT_ENTER, self.onTextEnter)
-                    ctl.Bind(wx.EVT_SET_FOCUS, self.onSetFocus)
-                    ctl.Bind(wx.EVT_KILL_FOCUS, self.onTextEnter)
+                    self.Bind(wx.EVT_TEXT_ENTER, self.on_text_enter)
+                    ctl.Bind(wx.EVT_SET_FOCUS, self.on_set_focus)
+                    ctl.Bind(wx.EVT_KILL_FOCUS, self.on_text_enter)
                     self.parameters.append([item, ctl])
-                    self.bck.Add(ctl, (n - 1, 1), flag=wx.TOP | wx.BOTTOM, border=0)
+                    self.bck.Add(ctl, (n - 1, 1), flag=wx.TOP | wx.BOTTOM,
+                                 border=0)
             for item in keys:
-                if  item.lower() in ["num_points", "avg", "avg_error", "sum", "sum_error"]:
+                if item.lower() in ["num_points", "avg", "avg_error", "sum",
+                                    "sum_error"]:
                     n += 1
-                    text = wx.StaticText(self, -1, item + ": ", style=wx.ALIGN_LEFT)
-                    self.bck.Add(text, (n - 1, 0), flag=wx.LEFT | wx.ALIGN_CENTER_VERTICAL,
+                    text = wx.StaticText(self, -1, item + ": ",
+                                         style=wx.ALIGN_LEFT)
+                    self.bck.Add(text, (n - 1, 0),
+                                 flag=wx.LEFT | wx.ALIGN_CENTER_VERTICAL,
                                  border=15)
                     ctl = wx.StaticText(self, -1,
@@ -110 +99 @@
                                         style=wx.ALIGN_LEFT)
                     ctl.SetToolTipString("Result %s" % item)
-                    self.bck.Add(ctl, (n - 1, 1), flag=wx.TOP | wx.BOTTOM, border=0)
+                    self.bck.Add(ctl, (n - 1, 1), flag=wx.TOP | wx.BOTTOM,
+                                 border=0)
         self.bck.Layout()
         self.Layout()
-        psizer = self.parent.GetSizer()
-        if psizer is not None:
-            psizer.Layout()
+        p_sizer = self.parent.GetSizer()
+        if p_sizer is not None:
+            p_sizer.Layout()
 
-    def onSetFocus(self, evt):
+    def on_set_focus(self, evt):
         """
         Highlight the txtcrtl
@@ -126 +116 @@
         # Select the whole control, after this event resolves
         wx.CallAfter(widget.SetSelection, -1, -1)
-        return
 
-    def onParamChange(self, evt):
-        """
-        Receive and event and reset the text field contained in self.parameters
-
-        """
-        evt.Skip()
-        for item in self.parameters:
-            if item[0] in evt.params:
-                item[1].SetValue(format_number(evt.params[item[0]]))
-                item[1].Refresh()
-
-    def onTextEnter(self, evt):
+    def on_text_enter(self, evt):
         """
         Parameters have changed
@@ -149 +127 @@
             try:
                 params[item[0]] = float(item[1].GetValue())
-                item[1].SetBackgroundColour(wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOW))
+                item[1].SetBackgroundColour(wx.SystemSettings_GetColour(
+                    wx.SYS_COLOUR_WINDOW))
                 item[1].Refresh()
             except:
@@ -155 +134 @@
                 item[1].SetBackgroundColour("pink")
                 item[1].Refresh()
-
-        if has_error == False:
+        if not has_error:
             # Post parameter event
-            ## base is guiframe is this case
+            # base is guiframe is this case
             event = SlicerParameterEvent(type=self.type, params=params)
             wx.PostEvent(self.base, event)
@@ -166 +144 @@
         On Close Event
         """
-        ID = self.uid
-        self.parent.delete_panel(ID)
+        uid = self.uid
+        self.parent.delete_panel(uid)
         self.frame.Destroy()