Changeset 3fd1ebc in sasview

Timestamp:

Jun 19, 2008 7:55:59 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:

7fef474

Parents:

aa4b8379

Message:

Better behavior of "compute" context menu item

Location:

prview/perspectives/pr

Files:

• inversion_panel.py (modified) (4 diffs)
• pr.py (modified) (2 diffs)

prview/perspectives/pr/inversion_panel.py

@@ -200 +200 @@
         """
         if name=='nfunc':
-            int(self.nfunc_ctl.GetValue())
+            try:
+                return int(self.nfunc_ctl.GetValue())
+            except:
+                return -1
         elif name=='d_max':
-            self.dmax_ctl.GetValue()
+            try:
+                return self.dmax_ctl.GetValue()
+            except:
+                return -1.0
         elif name=='alpha':
-            self.alpha_ctl.GetValue()
+            try:
+                return self.alpha_ctl.GetValue()
+            except:
+                return -1.0
         elif name=='chi2':
-            self.chi2_ctl.GetValue()
+            try:
+                return float(self.chi2_ctl.GetValue())
+            except:
+                return -1.0
         elif name=='q_min':
-            self.qmin_ctl.GetValue()
+            try:
+                return float(self.qmin_ctl.GetValue())
+            except:
+                return 0.0
         elif name=='q_max':
-            self.qmax_ctl.GetValue()
+            try:
+                return float(self.qmax_ctl.GetValue())
+            except:
+                return 0.0
         elif name=='elapsed':
-            self.time_ctl.GetValue()
+            try:
+                return float(self.time_ctl.GetValue())
+            except:
+                return -1.0
         elif name=='oscillation':
-            self.osc_ctl.GetValue()
+            try:
+                return float(self.osc_ctl.GetValue())
+            except:
+                return -1.0
         elif name=='pos':
-            self.pos_ctl.GetValue()
+            try:
+                return float(self.pos_ctl.GetValue())
+            except:
+                return -1.0
         elif name=='pos_err':
-            self.pos_err_ctl.GetValue()
+            return self.pos_err_ctl.GetValue()
         elif name=='alpha_estimate':
-            self.alpha_estimate_ctl.GetValue()
+            return self.alpha_estimate_ctl.GetLabel()
         elif name=='plotname':
             if self.standalone==False:
-                self.plot_data.GetValue()
+                return self.plot_data.GetValue()
         elif name=='datafile':
-            self.data_file.GetValue()
+            return self.data_file.GetValue()
         else:
             wx.Panel.__getattr__(self, name)
@@ -311 +338 @@
         self.alpha_ctl.Bind(wx.EVT_KILL_FOCUS, self._read_pars)
         self.dmax_ctl.Bind(wx.EVT_KILL_FOCUS, self._on_pars_changed)
-        self.Bind(wx.EVT_TEXT_ENTER, 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)
         
         sizer_params = wx.GridBagSizer(5,5)
@@ -343 +371 @@
         self.qmin_ctl = wx.TextCtrl(self, -1, size=(60,20))
         self.qmax_ctl = wx.TextCtrl(self, -1, size=(60,20))
+        self.qmin_ctl.Bind(wx.EVT_KILL_FOCUS, self._on_pars_changed)
+        self.qmax_ctl.Bind(wx.EVT_KILL_FOCUS, self._on_pars_changed)
         
         iy = 0
@@ -504 +534 @@
         nfunc = 5
         dmax  = 120
+        qmin  = 0
+        qmax  = 0
         
         flag = True

prview/perspectives/pr/pr.py

@@ -54 +54 @@
         ## Current invertor
         self.invertor    = None
+        self.pr          = None
         ## Calculation thread
         self.calc_thread = None
@@ -669 +670 @@
         
         # Store a reference to the current plottable
+        # If we have a suggested value, use it.
+        try:
+            estimate = float(self.control_panel.alpha_estimate)
+            self.control_panel.alpha = estimate
+        except:
+            self.control_panel.alpha = self.alpha
+            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.d_max = self.max_length
-        self.control_panel.alpha = self.alpha
         self.parent.set_perspective(self.perspective)
         self.control_panel._on_invert(None)