Changeset 1150083 in sasview for src/sas/sasgui/perspectives/corfunc

Timestamp:

Jul 11, 2016 4:36:55 AM (8 years ago)

Author:

lewis

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.1.1, release-4.1.2, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

607b090

Parents:

1d4b9e5

git-author:

Lewis O'Driscoll <lewis.o'driscoll@…> (07/08/16 09:44:46)

git-committer:

Lewis O'Driscoll <lewis.o'driscoll@…> (07/11/16 04:36:55)

Message:

Reset panel correctly when new data is loaded

Location:

src/sas/sasgui/perspectives/corfunc

Files:

• corfunc.py (modified) (1 diff)
• corfunc_panel.py (modified) (3 diffs)

src/sas/sasgui/perspectives/corfunc/corfunc.py

@@ -153 +153 @@
                      NewPlotEvent(plot=new_plot, title=new_plot.title,
                         reset=reset))
+
+    def clear_data(self):
+        wx.PostEvent(self.parent,
+            NewPlotEvent(action='delete', group_id=GROUP_ID_TRANSFORM))
+        wx.PostEvent(self.parent,
+            NewPlotEvent(action='clear', group_id=GROUP_ID_IQ_DATA))

src/sas/sasgui/perspectives/corfunc/corfunc_panel.py

@@ -133 +133 @@
         self._data = data
         self._calculator.set_data(data)
+        # Reset the outputs
+        for key in OUTPUT_STRINGS.keys():
+            self._output_boxes[key].SetValue("-")
         if self._manager is not None:
             from sas.sasgui.perspectives.corfunc.corfunc import IQ_DATA_LABEL
+            self._manager.clear_data()
             self._manager.show_data(self._data, IQ_DATA_LABEL, reset=True)
+
         if set_qrange:
             lower = data.x[-1]*0.05
@@ -218 +223 @@
             value = params[key]
             self._output_boxes[key].SetValue(value)
-
-
 
     def save_project(self, doc=None):
@@ -254 +257 @@
         self._background_input.SetValue(str(bg))
         self._calculator.background = bg
+
 
     def _compute_background(self, event=None):