Changeset fa81e94 in sasview for src/sas/sasgui/perspectives/pr/explore_dialog.py

Timestamp:

Nov 15, 2017 2:33:09 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

d4881f6a

Parents:

7c487846

Message:

Initial commit of the P(r) inversion perspective.
Code merged from Jeff Krzywon's ESS_GUI_Pr branch.
Also, minor 2to3 mods to sascalc/sasgui to enble error free setup.

File:

• src/sas/sasgui/perspectives/pr/explore_dialog.py (modified) (3 diffs, 1 prop)

src/sas/sasgui/perspectives/pr/explore_dialog.py

@@ -35 +35 @@
 from sas.sasgui.plottools.plottables import Graph
 
-from pr_widgets import PrTextCtrl
+from .pr_widgets import PrTextCtrl
 
 # Default number of points on the output plot
@@ -331 +331 @@
         selection_msg = wx.StaticText(self, -1, "Select a dependent variable:")
         self.output_box = wx.ComboBox(self, -1, style=wx.CB_READONLY)
-        for item in self.results.outputs.keys():
+        for item in list(self.results.outputs.keys()):
             self.output_box.Append(item, "")
         self.output_box.SetStringSelection(DEFAULT_OUTPUT)
@@ -419 +419 @@
                 # This inversion failed, skip this D_max value
                 msg = "ExploreDialog: inversion failed "
-                msg += "for D_max=%s\n%s" % (str(d), sys.exc_value)
+                msg += "for D_max=%s\n%s" % (str(d), sys.exc_info()[1])
                 logger.error(msg)