Changeset 377ca62f in sasview

Timestamp:

Apr 8, 2017 4:21:01 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:

7a80072

Parents:

cac1828

git-author:

Jeff Krzywon <krzywon@…> (04/08/17 04:21:01)

git-committer:

krzywon <krzywon@…> (04/08/17 04:21:01)

Message:

All files saved and reloaded into data manager. see #467

File:

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

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

@@ -9 +9 @@
 from sas.sasgui.guiframe.events import SlicerParameterEvent, SlicerEvent
 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()
@@ -28 +27 @@
         wx.Dialog.__init__(self, parent, *args, **kwargs)
         self.params = {}
+        self.iter = 0
         self.parent = parent
         self.type = None
@@ -364 +364 @@
         :param evt: Event that triggered the call to the method
         """
+        if self.iter == 0:
+            # Forces the event to be processed after dynamically generated evts
+            clone = evt.Clone()
+            wx.PostEvent(self, clone)
+            self.iter += 1
+            return
         if evt is None:
             return
+
+        # Start definitions
         writer = Reader()
         main_window = self.parent.parent
@@ -371 +379 @@
         append = evt.append_to_name
         names = []
+        file_list = []
         convert_dict = {"SectorInteractor": "SectorQ",
                         "AnnulusInteractor": "AnnulusPhi",
                         "BoxInteractorX": "SlabX",
                         "BoxInteractorY": "SlabY"}
+        # Get list of 2D data names for saving
         for f_name in evt.file_list:
             names.append(f_name.data2D.label)
+        # Find the correct plots to save
         for key, plot in main_window.plot_panels.iteritems():
             if not hasattr(plot, "data2D"):
@@ -383 +394 @@
                     if base in names:
                         data_dic[item] = plot.plots[item]
+        # Save files as XML
         for item, data1d in data_dic.iteritems():
             base = ('.').join(item.split('.')[:-1])
             save_to = evt.path + "\\" + base + append + ".xml"
             writer.write(save_to, data1d)
+            file_list.append(save_to)
+        # Load files into GUI
+        for item in file_list:
+            self.parent.parent.load_data(item)
 
     def on_auto_save_checked(self, evt=None):