Changeset a3149c5 in sasview for prview/perspectives/pr

Timestamp:

Mar 11, 2011 12:15:59 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:

14cd91b1

Parents:

b2d9826

Message:

working on guiframe

Location:

prview/perspectives/pr

Files:

• inversion_state.py (modified) (1 diff)
• pr.py (modified) (12 diffs)

prview/perspectives/pr/inversion_state.py

@@ -409 +409 @@
         return None
     
-    def get_state(self):
-        return self.state
     def _parse_prstate(self, entry):
         """

prview/perspectives/pr/pr.py

@@ -158 +158 @@
             # Load the P(r) results
             #state = self.state_reader.get_state()
+            self.parent.add_data(data_list=[self.current_plottable])
             wx.PostEvent(self.parent, NewPlotEvent(plot=self.current_plottable,
                                         title=self.current_plottable.title))
@@ -223 +224 @@
         new_plot.id = "P_{obs}(r)"
         new_plot.title = title
+        self.parent.append_theory(data_id=self.current_plottable.id,
+                                       theory=new_plot)
         wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, title=title))
 
@@ -251 +254 @@
         new_plot.xaxis("\\rm{r}", 'A')
         new_plot.yaxis("\\rm{P(r)} ","cm^{-3}")
-        
+        new_plot.id = "P_{true}(r)"
+        group_id = "P_{true}(r)"
+        if group_id not in new_plot.group_id:
+            new_plot.group_id.append(group_id)
+        self.parent.append_theory(data_id=self.current_plottable.id,
+                                       theory=new_plot)
         #Put this call in plottables/guitools    
         wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, title="Sphere P(r)"))
@@ -312 +320 @@
                 new_plot.group_id.append( pr.info["plot_group_id"][index])
         new_plot.id = IQ_FIT_LABEL
-        #new_plot.group_id.append(2)
+        self.parent.append_theory(data_id=self.current_plottable.id,
+                                       theory=new_plot)
         wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, title=title))
         
@@ -342 +351 @@
             new_plot.id = IQ_SMEARED_LABEL
             new_plot.title = title
-            #new_plot.group_id.append(2)
+            self.parent.append_theory(data_id=self.current_plottable.id,
+                                       theory=new_plot)
             wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, title=title))
         
@@ -407 +417 @@
         # Make sure that the plot is linear
         new_plot.xtransform = "x"
-        new_plot.ytransform = "y"                 
+        new_plot.ytransform = "y"  
+        group_id = "P(r) fit"
+        if group_id not in new_plot.group_id:
+            new_plot.group_id.append(group_id)   
+        self.parent.append_theory(data_id=self.current_plottable.id,
+                                       theory=new_plot)            
         wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, title="P(r) fit"))
         
@@ -667 +682 @@
             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)        
             wx.PostEvent(self.parent, 
                          NewPlotEvent(plot=new_plot, update=True,
@@ -697 +713 @@
             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)        
             wx.PostEvent(self.parent, 
                          NewPlotEvent(plot=new_plot, update=True,
@@ -873 +890 @@
                 new_plot.group_id.append(pr.info["plot_group_id"])
             new_plot.id = IQ_DATA_LABEL
+            self.parent.append_theory(data_id=self.current_plottable.id,
+                                       theory=new_plot)
             wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, title="Iq"))
                 
@@ -921 +940 @@
         new_plot.id = IQ_DATA_LABEL
         new_plot.title = "I(q)"
+        self.parent.append_theory(data_id=self.current_plottable.id,
+                                       theory=new_plot)        
         wx.PostEvent(self.parent, 
                      NewPlotEvent(plot=new_plot, title="I(q)", reset=reset))
@@ -1263 +1284 @@
         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
@@ -1327 +1350 @@
         return [self.control_panel]
     
-    def set_data(self, data_list):
+    def set_data(self, data_list=None, theory_list=None):
         """
         receive a list of data to compute pr
         """
+        if data_list is None:
+            data_list = []
         if len(data_list) > 1:
             msg = "Pr panel does not allow multiple Data.\n"