Changeset db4ed82 in sasview for prview

Timestamp:

Mar 16, 2011 3:30: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:

27f4bee

Parents:

36cb4d2f

Message:

working data panel for prview

File:

• prview/perspectives/pr/pr.py (modified) (15 diffs)

prview/perspectives/pr/pr.py

@@ -73 +73 @@
         self.invertor    = None
         self.pr          = None
+        self.data_id = IQ_DATA_LABEL 
         # Copy of the last result in case we need to display it.
         self._last_pr    = None
@@ -222 +223 @@
         new_plot.id = "P_{obs}(r)"
         new_plot.title = title
-        self.parent.append_theory(data_id=self.current_plottable.id,
-                                       theory=new_plot)
+        self.parent.update_theory(data_id=self.data_id,  theory=new_plot)
         wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, title=title))
 
@@ -254 +254 @@
         new_plot.id = "P_{true}(r)"
         new_plot.group_id = "P_{true}(r)"
-        self.parent.append_theory(data_id=self.current_plottable.id,
-                                       theory=new_plot)
+        self.parent.update_theory(data_id=self.data_id, theory=new_plot)
         #Put this call in plottables/guitools    
-        wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, title="Sphere P(r)"))
+        wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot,
+                                                title="Sphere P(r)"))
        
         
@@ -314 +314 @@
             new_plot.group_id = pr.info["plot_group_id"]
         new_plot.id = IQ_FIT_LABEL
-        self.parent.append_theory(data_id=self.current_plottable.id,
-                                       theory=new_plot)
+        self.parent.update_theory(data_id=self.data_id, theory=new_plot)
         wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, title=title))
         
@@ -342 +341 @@
             new_plot.id = IQ_SMEARED_LABEL
             new_plot.title = title
-            self.parent.append_theory(data_id=self.current_plottable.id,
-                                       theory=new_plot)
+            self.parent.update_theory(data_id=self.data_id, theory=new_plot)
             wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, title=title))
-        
         
     def _on_pr_npts(self, evt):
@@ -410 +407 @@
         new_plot.ytransform = "y"  
         new_plot.group_id = "P(r) fit"
-        self.parent.append_theory(data_id=self.current_plottable.id,
-                                       theory=new_plot)            
+        self.parent.update_theory(data_id=self.data_id, theory=new_plot)    
         wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, title="P(r) fit"))
-        
         return x, pr.d_max
-        
-                
+          
     def load(self, data):
         """
@@ -669 +663 @@
             new_plot.xaxis("\\rm{r}", 'A')
             new_plot.yaxis("\\rm{P(r)} ","cm^{-3}")
-            self.parent.append_theory(data_id=self.current_plottable.id,
-                                       theory=new_plot)        
+            self.parent.update_theory(data_id=self.data_id, theory=new_plot)        
             wx.PostEvent(self.parent, 
                          NewPlotEvent(plot=new_plot, update=True,
@@ -700 +693 @@
             new_plot.xaxis("\\rm{r}", 'A')
             new_plot.yaxis("\\rm{P(r)} ","cm^{-3}")
-            self.parent.append_theory(data_id=self.current_plottable.id,
-                                       theory=new_plot)        
+            self.parent.update_theory(data_id=self.data_id,theory=new_plot)        
             wx.PostEvent(self.parent, 
                          NewPlotEvent(plot=new_plot, update=True,
@@ -747 +739 @@
         
         filename = os.path.basename(path)
-
         new_plot = Data1D(x, y)
         new_plot.symbol = GUIFRAME_ID.CURVE_SYMBOL_NUM
@@ -753 +744 @@
         new_plot.xaxis("\\rm{r}", 'A')
         new_plot.yaxis("\\rm{P(r)} ","cm^{-3}")
-            
         # Store a ref to the plottable for later use
         self._added_plots[filename] = new_plot
         self._default_Iq[filename]  = numpy.copy(y)
-        
         wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, title=filename))
         
-        
-
     def start_thread(self):
         """
@@ -798 +785 @@
         if not message==None:
             wx.PostEvent(self.parent, StatusEvent(status=str(message)))
-            
         self.perform_estimateNT()
-    
-
     
     def _estimateNT_completed(self, nterms, alpha, message, elapsed):
@@ -876 +860 @@
             if pr.info.has_key("plot_group_id"):
                 new_plot.group_id = pr.info["plot_group_id"]
-            new_plot.id = IQ_DATA_LABEL
-            self.parent.append_theory(data_id=self.current_plottable.id,
+            new_plot.id = self.data_id
+            self.parent.update_theory(data_id=self.data_id,
                                        theory=new_plot)
             wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, title="Iq"))
@@ -925 +909 @@
         new_plot.interactive = True
         new_plot.group_id = IQ_DATA_LABEL 
-        new_plot.id = IQ_DATA_LABEL
-        new_plot.title = "I(q)"
-        self.parent.append_theory(data_id=self.current_plottable.id,
-                                       theory=new_plot)        
+        new_plot.id = self.data_id
+        new_plot.title = "I(q)"    
         wx.PostEvent(self.parent, 
                      NewPlotEvent(plot=new_plot, title="I(q)", reset=reset))
@@ -1268 +1250 @@
         new_plot.xaxis("\\rm{Q}", 'A^{-1}')
         new_plot.yaxis("\\rm{Intensity} ","cm^{-1}")
-        self.parent.append_theory(data_id=self.current_plottable.id,
-                                       theory=new_plot)
         wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, title="Iq"))
         # Show I(q) fit
@@ -1354 +1334 @@
             if issubclass(data.__class__, Data1D):
                 try:
+                    self.data_id = data.id
                     self.control_panel._change_file(evt=None, data=data)
                 except: