Changeset 4f20b27 in sasview

Timestamp:

May 15, 2009 12:08:44 PM (16 years ago)

Author:

Jae Cho <jhjcho@…>

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:

111acd2

Parents:

650f87d3

Message:

Added pr module to sansview and removed some conflicts with sansview

Location:

sansview/perspectives/pr

Files:

• inversion_panel.py (modified) (1 diff)
• pr.py (modified) (3 diffs)
• pr_thread.py (modified) (1 diff)

sansview/perspectives/pr/inversion_panel.py

@@ -983 +983 @@
         path = None
         dlg = wx.FileDialog(self, "Choose a file", os.getcwd(), "", "*.txt", wx.OPEN)
+
         if dlg.ShowModal() == wx.ID_OK:
             path = dlg.GetPath()

sansview/perspectives/pr/pr.py

@@ -326 +326 @@
         new_plot.xaxis("\\rm{r}", 'A')
         new_plot.yaxis("\\rm{P(r)} ","cm^{-3}")
+        new_plot.xtransform="x"
+        new_plot.ytransform="y"        
             
         wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, title="P(r) fit"))
@@ -520 +522 @@
 
             elif item.name==graph.selected_plottable:
-                return [["Compute P(r)", "Compute P(r) from distribution", self._on_context_inversion]]      
+                if  item.name=="$I_{obs}(q)$":
+                    return [["Compute P(r)", "Compute P(r) from distribution", self._on_context_inversion]]     
+
+                    
                 
         return []
@@ -1100 +1105 @@
         self.perspective = []
         self.perspective.append(self.control_panel.window_name)
-        
         self.parent.Bind(EVT_PR_FILE, self._on_new_file)
         

sansview/perspectives/pr/pr_thread.py

@@ -1 +1 @@
 import sys, time
-from calcthread import CalcThread
+from perspectives.fitting.calcthread import CalcThread
 
 class CalcPr(CalcThread):