Changeset 91d910d in sasview for prview/perspectives/pr

Timestamp:

Mar 16, 2011 7:09:51 PM (14 years ago)

Author:

Gervaise Alina <gervyh@…>

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, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

b5e79f7

Parents:

20b482f

Message:

working on delete plot

Location:

prview/perspectives/pr

Files:

• inversion_panel.py (modified) (2 diffs)
• pr.py (modified) (3 diffs)

prview/perspectives/pr/inversion_panel.py

@@ -709 +709 @@
             pass
         
-    def on_reset(self, event):
+    def clear_panel(self):
+        """
+        """
+        self.plot_data.SetValue("")
+        self.on_reset(event=None)
+        
+    def on_reset(self, event=None):
         """
         Resets inversion parameters
@@ -747 +753 @@
             
             dataset = self.plot_data.GetValue()
-            self._manager.estimate_plot_inversion(alpha=alpha, nfunc=nfunc, 
+            if dataset.strip() != "":
+                self._manager.estimate_plot_inversion(alpha=alpha, nfunc=nfunc, 
                                                  d_max=dmax,
                                                  q_min=qmin, q_max=qmax,

prview/perspectives/pr/pr.py

@@ -96 +96 @@
         self._added_plots = {}
         self._default_Iq  = {}
+        self.list_plot_id = []
         
         # Associate the inversion state reader with .prv files
@@ -110 +111 @@
         logging.info("Pr(r) plug-in started")
         
+    def delete_data(self, data_id):
+        """
+        delete the data association with prview
+        """
+        if self.calc_thread is not None and self.calc_thread.isrunning():
+            msg = "Data in use in Prview\n"
+        if self.estimation_thread is not None and \
+            self.estimation_thread.isrunning():
+             msg = "Data in use in Prview\n"
+        self.control_panel.clear_panel()
+       
     def get_data(self):
         """
@@ -156 +168 @@
             #self.parent.set_perspective(self.perspective)  
             self.on_perspective(event=None)   
-            
             # Load the P(r) results
             #state = self.state_reader.get_state()