Changeset cac1828 in sasview for src/sas

Timestamp:

Apr 7, 2017 11:39:57 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:

377ca62f

Parents:

71b25b2

git-author:

Jeff Krzywon <krzywon@…> (04/07/17 11:39:57)

git-committer:

krzywon <krzywon@…> (04/07/17 11:39:57)

Message:

Refactor to fix window redraw issues.

File:

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

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

@@ -3 +3 @@
 import wx
 import wx.lib.newevent
-import time
 from sas.sascalc.dataloader.readers.cansas_reader import Reader
 from sas.sasgui.guiframe.events import EVT_SLICER_PARS
@@ -37 +36 @@
         self.auto_save = None
         self.path = None
-        self.type_list = ["SectorInteractor", "AnnulusInteractor",
-                          "BoxInteractorX", "BoxInteractorY"]
-        self.type_select = wx.ComboBox(parent=self, choices=self.type_list)
-        self.append_name = wx.TextCtrl(parent=self, id=wx.NewId(),
-                                       name="Append to file name:")
+        self.type_list = []
+        self.type_select = None
+        self.append_name = None
         self.data_list = None
         label = "Right-click on 2D plot for slicer options"
@@ -49 +46 @@
         # Bindings
         self.parent.Bind(EVT_SLICER, self.onEVT_SLICER)
-        self.parent.Bind(EVT_SLICER_PARS, self.onParamChange)
+        self.Bind(EVT_SLICER_PARS, self.onParamChange)
         self.Bind(EVT_APPLY_PARAMS, self.apply_params_list_and_process)
         self.Bind(EVT_AUTO_SAVE, self.save_files)
@@ -128 +125 @@
             self.bck.Add(text, (iy, ix), (1, 1),
                          wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
+            self.type_list = ["SectorInteractor", "AnnulusInteractor",
+                              "BoxInteractorX", "BoxInteractorY"]
+            self.type_select = wx.ComboBox(parent=self, choices=self.type_list)
             self.Bind(wx.EVT_COMBOBOX, self.onChangeSlicer)
             index = self.type_select.FindString(type)
@@ -174 +174 @@
             default_value = ""
             for key in params:
-                default_value += "_{0}-".format(key)
-                default_value += "{:.5f}".format(params[key])
+                default_value += "_{0}".format(key).split(" [")[0]
+                default_value += "-{:.5f}".format(params[key])
             append_text = "Append to file name:"
             append = wx.StaticText(self, -1, append_text, style=wx.ALIGN_LEFT)
+            self.append_name = wx.TextCtrl(parent=self, id=wx.NewId(),
+                                           name="Append to file name:")
             self.append_name.SetValue(default_value)
             self.append_name.Enable(False)
@@ -246 +248 @@
             # parent here is plotter2D
             event = SlicerParameterEvent(type=self.type, params=params)
-            wx.PostEvent(self, event)
+            wx.PostEvent(self.parent, event)
 
     def on_batch_slicer(self, evt=None):
         """
-        Method invoked with batch slicing button is pressed
+        Method invoked when batch slicing button is pressed
         :param evt: Event triggering hide/show of the batch slicer parameters
         """
@@ -271 +273 @@
 
         # Post an event to apply appropriate slicer params to each slicer
-        # Event needed due to how apply_slicer_to_plot works
-        event = apply_params(params=params, plot_list=apply_to_list,
+        event_params = apply_params(params=params, apply_to_list=apply_to_list,
                              auto_save=save, append=append,
                              path=path, type=type)
-        wx.PostEvent(self, event)
+        wx.PostEvent(self, event_params)
 
     def onChangeSlicer(self, evt):
@@ -292 +293 @@
         # Skip redrawing the current plot if no change
         if self.parent == plot and self.type == type:
+            return
+        # Do not draw a slicer on a 1D plot
+        if not isinstance(plot, ModelPanel2D):
             return
         if type is None:
@@ -345 +349 @@
         """
         # Apply parameter list to each plot as desired
-        for item in evt.plot_list:
+        for item in evt.apply_to_list:
             event = SlicerParameterEvent(type=evt.type, params=evt.params)
             wx.PostEvent(item, event)
@@ -351 +355 @@
         if evt.auto_save:
             event = auto_save(append_to_name=evt.append,
-                              file_list=evt.plot_list,
+                              file_list=evt.apply_to_list,
                               path=evt.path, type=evt.type)
             wx.PostEvent(self, event)
@@ -380 +384 @@
                         data_dic[item] = plot.plots[item]
         for item, data1d in data_dic.iteritems():
-            base = item.split(".")[0]
+            base = ('.').join(item.split('.')[:-1])
             save_to = evt.path + "\\" + base + append + ".xml"
             writer.write(save_to, data1d)