Changeset 660b1e6 in sasview

Timestamp:

Jun 11, 2008 6:32:21 AM (16 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

de9483d

Parents:

38fc601

Message:

Loaded data is now shown before hitting the inversion button.

Location:

prview

Files:

• data_loader.py (deleted)
• perspectives/pr/inversion_panel.py (modified) (1 diff)
• perspectives/pr/pr.py (modified) (4 diffs)
• perspectives/pr/requirements.txt (modified) (1 diff)

prview/perspectives/pr/inversion_panel.py

@@ -571 +571 @@
                 self.file_radio.SetValue(True)
                 self._on_pars_changed(None)
+                self.manager.show_data(path)
         
 

prview/perspectives/pr/pr.py

@@ -227 +227 @@
             else:
                 (value, dy[i]) = pr.pr_err(out, cov2, x[i])
-            sum += value
+            sum += value*pr.d_max/len(x)
             y[i] = value
             
-        y = y/sum*pr.d_max/len(x)
-        dy = dy/sum*pr.d_max/len(x)
+        y = y/sum
+        dy = dy/sum
         
         if cov2==None:
@@ -292 +292 @@
             return 0.0
 
-    def get_context_menu(self, plot_id=None):
+    def get_context_menu(self, graph=None):
         """
             Get the context menu items available for P(r)
-            @param plot_id: Unique ID of a plot, so that we can recognize those
-                            that we created
+            @param graph: the Graph object to which we attach the context menu
             @return: a list of menu items with call-back function
         """
+        # Look whether this Graph contains P(r) data
+        for item in graph.plottables:
+            if item.name=="P_{fit}(r)":
+                
+                return [["Compute P(r)", "Compute P(r) from distribution", self._on_context_inversion],
+                       ["Add P(r) data", "Load a data file and display it on this plot", self._on_add_data]]
+                
         return [["Compute P(r)", "Compute P(r) from distribution", self._on_context_inversion]]
-    
+
+    def _on_add_data(self, evt):
+        """
+            Add a data curve to the plot
+            WARNING: this will be removed once guiframe.plotting has its full functionality
+        """
+        path = self.choose_file()
+        if path==None:
+            return
+        
+        x, y, err = self.parent.load_ascii_1D(path)
+        
+        new_plot = Data1D(x, y, dy=err)
+        new_plot.name = "P_{loaded}(r)"
+        new_plot.xaxis("\\rm{r}", 'A')
+        new_plot.yaxis("\\rm{P(r)} ","cm^{-3}")
+            
+        wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, title="P(r) fit"))
+        
+        
 
     def start_thread(self):
@@ -380 +405 @@
         # Popup result panel
         #result_panel = InversionResults(self.parent, -1, style=wx.RAISED_BORDER)
+        
+    def show_data(self, path=None):
+        if not path==None:
+            self._create_file_pr(path)  
+              
+        # Make a plot of I(q) data
+        new_plot = Data1D(self.pr.x, self.pr.y, self.pr.err)
+        new_plot.name = "I_{obs}(q)"
+        new_plot.xaxis("\\rm{Q}", 'A^{-1}')
+        new_plot.yaxis("\\rm{Intensity} ","cm^{-1}")
+        #new_plot.group_id = "test group"
+        wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, title="Iq"))
+        
         
     def setup_plot_inversion(self, alpha, nfunc, d_max, q_min=None, q_max=None):
@@ -540 +578 @@
         
         
-          
           
     def _on_context_inversion(self, event):

prview/perspectives/pr/requirements.txt

@@ -27 +27 @@
 23. Plot I(q) immediately when you choose a new file.
 24. *** probably need to ship the perspectives separately...
+25. If no data is available, disable the Fit button.