Changeset 982577b in sasview

Timestamp:

Apr 6, 2017 11:56:37 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:

71b25b2

Parents:

2df1bd1

git-author:

Jeff Krzywon <krzywon@…> (04/06/17 11:56:37)

git-committer:

krzywon <krzywon@…> (04/06/17 11:56:37)

Message:

File from the box loaded. Events not triggering in proper order.

File:

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

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

@@ -164 +164 @@
                          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:"
@@ -249 +251 @@
             # parent here is plotter2D
             event = SlicerParameterEvent(type=self.type, params=params)
-            wx.PostEvent(self.parent, event)
+            wx.PostEvent(self, event)
 
     def on_batch_slicer(self, evt=None):
@@ -366 +368 @@
         writer = Reader()
         main_window = self.parent.parent
-        data_list = []
+        data_dic = {}
         append = evt.append_to_name
         for key, plot in main_window.plot_panels.iteritems():
             if not hasattr(plot, "data2D"):
                 for item in plot.plots:
-                    data_list.append(item)
-        for item in data_list:
-            data1d = item.plots
-            base = item.name.split(".")[0]
-            save_to = evt.path + base + ".xml"
-            writer.write(path, data1d)
-
-        # TODO: determine data sets
-        # TODO: generate file names
-        # TODO: link one to the other
+                    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