Changeset a00ee4c in sasview

Timestamp:

Jun 13, 2009 8:39:10 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:

164c7d0

Parents:

3595309d

Message:

prview: added d_max exploration dialog

Location:

prview/perspectives/pr

Files:

• explore_dialog.py (added)
• inversion_panel.py (modified) (6 diffs)
• pr_thread.py (modified) (3 diffs)
• test_pr_data.prv (added)

prview/perspectives/pr/inversion_panel.py

@@ -148 +148 @@
         self.alpha_estimate_ctl = None
         self.nterms_estimate_ctl = None
+        
+        ## D_max distance explorator
+        self.distance_explorator_ctl = None
         
         ## Data manager
@@ -307 +310 @@
             return self.plot_data.GetValue()
         else:
-            wx.Panel.__getattr__(self, name)
+            return wx.Panel.__getattribute__(self, name)
+            #return wx.Panel.__getattr__(self, name)
         
     def _save_state(self, evt=None):
@@ -569 +573 @@
         self.dmax_ctl.Bind(wx.EVT_TEXT, self._on_pars_changed)
         
+        # Distance explorator
+        id = wx.NewId()
+        self.distance_explorator_ctl = wx.Button(self, id, "Explore")
+        self.Bind(wx.EVT_BUTTON, self._on_explore, id = id)           
         
         
@@ -586 +594 @@
         sizer_params.Add(label_dmax, (iy,0), (1,1), wx.LEFT, 15)
         sizer_params.Add(self.dmax_ctl,   (iy,1), (1,1), wx.RIGHT, 0)
+        sizer_params.Add(self.distance_explorator_ctl,   (iy,2), (1,1), wx.LEFT, 15)
 
         boxsizer2.Add(sizer_params, 0)
@@ -712 +721 @@
         vbox.Add(sizer_button, (iy_vb,0), (1,1), wx.EXPAND|wx.BOTTOM|wx.TOP, 10)
 
+        self.Bind(wx.EVT_TEXT_ENTER, self._on_invert)
 
         self.SetSizer(vbox)
@@ -895 +905 @@
         return flag, alpha, dmax, nfunc, qmin, qmax, height, width
     
+    def _on_explore(self, evt):
+        """
+            Invoke the d_max exploration dialog
+        """
+        from explore_dialog import ExploreDialog
+        if self.manager._last_pr is not None:
+            pr = self.manager._create_plot_pr()
+            dialog = ExploreDialog(pr, 10, None, -1, "")
+            dialog.ShowModal()
+        else:
+            message = "No data to analyze. Please load a data set to proceed."
+            wx.PostEvent(self.manager.parent, StatusEvent(status=message))
+            
     def _on_invert(self, evt):
         """

prview/perspectives/pr/pr_thread.py

@@ -4 +4 @@
 class CalcPr(CalcThread):
     """
-        Compute 2D model
-        This calculation assumes a 2-fold symmetry of the model
-        where points are computed for one half of the detector
-        and I(qx, qy) = I(-qx, -qy) is assumed.
+        Compute P(r)
     """
     
@@ -45 +42 @@
 class EstimatePr(CalcThread):
     """
-        Compute 2D model
-        This calculation assumes a 2-fold symmetry of the model
-        where points are computed for one half of the detector
-        and I(qx, qy) = I(-qx, -qy) is assumed.
+        Estimate P(r)
     """
     
@@ -124 +118 @@
             if not self.error_func==None:
                 self.error_func("EstimatePr2.compute: %s" % sys.exc_value)
-
-