Changeset f552ff3 in sasview for src/sas/perspectives

Timestamp:

Mar 24, 2015 10:42:33 PM (9 years ago)

Author:

butler

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:

f71700b

Parents:

dea2f6e (diff), 9f7fbd9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://github.com/SasView/sasview.git

Location:

src/sas/perspectives/pr

Files:

• explore_dialog.py (modified) (2 diffs)
• inversion_panel.py (modified) (2 diffs)

src/sas/perspectives/pr/explore_dialog.py

@@ -257 +257 @@
         or when a new computation is finished.
         """
+        self.npts_ctl.SetFocus()
         # Get the output type selection
         output_type = self.output_box.GetString(self.output_box.GetSelection())
@@ -329 +330 @@
         # Ouput selection box
         selection_msg = wx.StaticText(self, -1, "Select a dependent variable:")
-        self.output_box = wx.ComboBox(self, -1)
+        self.output_box = wx.ComboBox(self, -1, style=wx.CB_READONLY)
         for item in self.results.outputs.keys():
             self.output_box.Append(item, "")
         self.output_box.SetStringSelection(DEFAULT_OUTPUT)
+        self.output_box.SetEditable(False)
 
         output_sizer = wx.GridBagSizer(5, 5)

src/sas/perspectives/pr/inversion_panel.py

@@ -703 +703 @@
         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
@@ -715 +719 @@
         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