Changeset c1bffa5 in sasview

Timestamp:

Mar 23, 2015 1:28:37 PM (9 years ago)

Author:

Doucet, Mathieu <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:

701a155, 9dea723

Parents:

bf6b8d1

Message:

This should fix the suggested value buttons.

Location:

src/sas

Files:

• perspectives/pr/inversion_panel.py (modified) (2 diffs)
• pr/num_term.py (modified) (1 diff)

src/sas/perspectives/pr/inversion_panel.py

@@ -696 +696 @@
         try:
             alpha = self.alpha_estimate_ctl.GetLabel()
-            self.alpha_ctl.SetValue(float(alpha))
+            # Check that we have a number
+            float(alpha)
+            self.alpha_ctl.SetValue(alpha)
+        except ValueError:
+            logging.error("InversionControl._on_accept_alpha got a value that was not a number: %s" % alpha )
         except:
             # No estimate or bad estimate, either do nothing
@@ -708 +712 @@
         try:
             nterms = self.nterms_estimate_ctl.GetLabel()
-            self.nfunc_ctl.SetValue(float(nterms))
+            # Check that we have a number
+            float(nterms)
+            self.nfunc_ctl.SetValue(nterms)
+        except ValueError:
+            logging.error("InversionControl._on_accept_nterms got a value that was not a number: %s" % nterms )
         except:
             # No estimate or bad estimate, either do nothing

src/sas/pr/num_term.py

@@ -144 +144 @@
             return nt, self.alpha_list[nt - 10], self.mess_list[nt - 10]
         except:
-            logging.error("NTermEstimator.num_terms: %s" % sys.exc_value)
+            #TODO: check the logic above and make sure it doesn't 
+            # rely on the try-except.
             return self.nterm_min, self.invertor.alpha, ''