Changeset da19985 in sasview for src/sas/sasgui/perspectives

Timestamp:

Jul 14, 2016 6:01: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:

750a823

Parents:

9f8209b

Message:

Handle deleting data properly

Location:

src/sas/sasgui/perspectives/corfunc

Files:

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

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

@@ -116 +116 @@
                         info='error'))
 
+    def delete_data(self, data):
+        """
+        Delete the data from the perspective
+        """
+        self.clear_data()
+        self.corfunc_panel.set_data(None)
+
     def show_data(self, data, label, reset=False, active_ctrl=None):
         """
@@ -147 +154 @@
                      NewPlotEvent(plot=new_plot, title=new_plot.title,
                         reset=reset))
-        if label == IQ_EXTRAPOLATED_DATA_LABEL or label == TRANSFORM_LABEL:
-            self.parent.update_theory(data_id=label, theory=new_plot)
         if label == IQ_DATA_LABEL or label == IQ_EXTRAPOLATED_DATA_LABEL:
             wx.CallAfter(self.corfunc_panel.plot_qrange, active=active_ctrl,

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

@@ -147 +147 @@
         """
         if data is None:
+            self._disable_inputs()
+            self.set_extracted_params(reset=True)
+            self._data = None
             return
         self._enable_inputs()