Changeset d6113849 in sasview for prview

Timestamp:

Jun 30, 2008 3:30:22 PM (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:

d0802c3

Parents:

bd30f4a5

Message:

More improvements GUI

Location:

prview/perspectives/pr

Files:

• inversion_panel.py (modified) (1 diff)
• pr.py (modified) (4 diffs)

prview/perspectives/pr/inversion_panel.py

@@ -416 +416 @@
         self.nterms_estimate_ctl.SetToolTipString("Waiting for estimate...")
         
-        # EVT_TEXT would trigger an event for each character entered
-        #self.nfunc_ctl.Bind(wx.EVT_KILL_FOCUS, self._on_pars_changed)
-        #self.alpha_ctl.Bind(wx.EVT_KILL_FOCUS, self._read_pars)
-        #self.dmax_ctl.Bind(wx.EVT_KILL_FOCUS, self._on_pars_changed)
-        #self.dmax_ctl.Bind(wx.EVT_TEXT_ENTER, self._on_pars_changed)
-        #self.Bind(wx.EVT_TEXT_ENTER, self._on_pars_changed)
-        
-        self.nfunc_ctl.Bind(wx.EVT_TEXT, self._on_pars_changed)
+        self.nfunc_ctl.Bind(wx.EVT_TEXT, self._read_pars)
         self.alpha_ctl.Bind(wx.EVT_TEXT, self._read_pars)
         self.dmax_ctl.Bind(wx.EVT_TEXT, self._on_pars_changed)

prview/perspectives/pr/pr.py

@@ -440 +440 @@
         self.pr = pr
         
-        message = "Computation completed in %g seconds [chi2=%g]" % (elapsed, pr.chi2)
-        wx.PostEvent(self.parent, StatusEvent(status=message))
+        #message = "Computation completed in %g seconds [chi2=%g]" % (elapsed, pr.chi2)
+        #wx.PostEvent(self.parent, StatusEvent(status=message))
 
         cov = numpy.ascontiguousarray(cov)
@@ -450 +450 @@
         self.control_panel.oscillation = pr.oscillations(out)
         #print "OSCILL", pr.oscillations(out)
-        print "PEAKS:", pr.get_peaks(out) 
+        #print "PEAKS:", pr.get_peaks(out) 
         self.control_panel.positive = pr.get_positive(out)
         self.control_panel.pos_err  = pr.get_pos_err(out, cov)
@@ -473 +473 @@
             wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, title="Iq"))
                 
-        # Compute the fit I(Q=0)
-        try:
-            print "I(0) = ", self.pr.iq0(out)
-        except:
-            pass
-        
-        # Get R_g
-        print "Rg = ", self.pr.rg(out)
         # Show I(q) fit
         self.show_iq(out, self.pr)
@@ -724 +716 @@
             print "No estimate yet"
             pass
+        try:
+            estimate = int(self.control_panel.nterms_estimate)
+            self.control_panel.nfunc = estimate
+        except:
+            self.control_panel.nfunc = self.nfunc
+            print "No estimate yet"
+            pass
         
         self.current_plottable = panel.plots[dataset]
         self.control_panel.plotname = dataset
-        self.control_panel.nfunc = self.nfunc
+        #self.control_panel.nfunc = self.nfunc
         self.control_panel.d_max = self.max_length
         self.parent.set_perspective(self.perspective)