Changeset 71b25b2 in sasview

Timestamp:

Apr 7, 2017 6:38:01 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:

cac1828

Parents:

982577b

git-author:

Jeff Krzywon <krzywon@…> (04/07/17 06:38:01)

git-committer:

krzywon <krzywon@…> (04/07/17 06:38:01)

Message:

Only save plots associated with selected slicer.

File:

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

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

@@ -9 +9 @@
 from sas.sasgui.guiframe.events import EVT_SLICER
 from sas.sasgui.guiframe.events import SlicerParameterEvent, SlicerEvent
-from Plotter1D import ModelPanel1D
 from Plotter2D import ModelPanel2D
 from sas.sascalc.dataloader.data_info import Data1D, Data2D
 apply_params, EVT_APPLY_PARAMS = wx.lib.newevent.NewEvent()
 auto_save, EVT_AUTO_SAVE = wx.lib.newevent.NewEvent()
-auto_close, EVT_ON_CLOSE = wx.lib.newevent.NewEvent()
 
 
@@ -54 +52 @@
         self.Bind(EVT_APPLY_PARAMS, self.apply_params_list_and_process)
         self.Bind(EVT_AUTO_SAVE, self.save_files)
-        self.Bind(EVT_ON_CLOSE, self.on_close)
 
     def onEVT_SLICER(self, event):
@@ -157 +154 @@
             # Checkbox for autosaving data
             iy += 1
-
             self.auto_save = wx.CheckBox(parent=self, id=wx.NewId(),
                                          label="Auto save generated 1D:")
@@ -164 +160 @@
                          wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
             iy += 1
-            # TODO: Get list of loaded data, not plots - plot again
-            # TODO: try/catch block to catch wx._core.PyDeadObjectError (pass)
             # File browser
             save_to = "Save files to:"
@@ -178 +172 @@
             # Append to file
             iy += 1
-            default_value = "_{0}".format(self.type)
+            default_value = ""
             for key in params:
-                default_value += "_%d.2" % params[key]
+                default_value += "_{0}-".format(key)
+                default_value += "{:.5f}".format(params[key])
             append_text = "Append to file name:"
             append = wx.StaticText(self, -1, append_text, style=wx.ALIGN_LEFT)
@@ -279 +274 @@
         event = apply_params(params=params, plot_list=apply_to_list,
                              auto_save=save, append=append,
-                             path=path)
-        wx.PostEvent(self, event)
-        event = auto_close()
+                             path=path, type=type)
         wx.PostEvent(self, event)
 
@@ -297 +290 @@
         :param type: The type of slicer to apply to the panel
         """
+        # Skip redrawing the current plot if no change
+        if self.parent == plot and self.type == type:
+            return
         if type is None:
             type = self.type_select.GetStringSelection()
@@ -350 +346 @@
         # Apply parameter list to each plot as desired
         for item in evt.plot_list:
-            item.slicer.set_params(evt.params)
-            item.slicer.base.update()
+            event = SlicerParameterEvent(type=evt.type, params=evt.params)
+            wx.PostEvent(item, event)
         # Post an event to save each data set to file
         if evt.auto_save:
             event = auto_save(append_to_name=evt.append,
                               file_list=evt.plot_list,
-                              path=evt.path)
+                              path=evt.path, type=evt.type)
             wx.PostEvent(self, event)
 
@@ -370 +366 @@
         data_dic = {}
         append = evt.append_to_name
+        names = []
+        convert_dict = {"SectorInteractor": "SectorQ",
+                        "AnnulusInteractor": "AnnulusPhi",
+                        "BoxInteractorX": "SlabX",
+                        "BoxInteractorY": "SlabY"}
+        for f_name in evt.file_list:
+            names.append(f_name.data2D.label)
         for key, plot in main_window.plot_panels.iteritems():
             if not hasattr(plot, "data2D"):
                 for item in plot.plots:
-                    data_dic[item] = plot.plots[item]
+                    base = item.replace(convert_dict[evt.type], "")
+                    if base in names:
+                        data_dic[item] = plot.plots[item]
         for item, data1d in data_dic.iteritems():
             base = item.split(".")[0]
             save_to = evt.path + "\\" + base + append + ".xml"
             writer.write(save_to, data1d)
-        # TODO: save all files
 
     def on_auto_save_checked(self, evt=None):
@@ -387 +391 @@
         self.append_name.Enable(self.auto_save.IsChecked())
         self.path.Enable(self.auto_save.IsChecked())
-    
-    def on_close(self, evt=None):
-        """
-        Auto close the panel
-        """
-        self.Destroy()