Changeset 3d250da3 in sasview

Timestamp:

Apr 2, 2015 8:46:38 AM (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:

0fa825c

Parents:

5f0be1f

Message:

Re #397 Removing breaking EVT_KILL_FOCUS callback.

Location:

src/sas

Files:

• perspectives/pr/explore_dialog.py (modified) (6 diffs)
• perspectives/pr/inversion_panel.py (modified) (1 diff)
• pr/invertor.py (modified) (1 diff)

src/sas/perspectives/pr/explore_dialog.py

@@ -45 +45 @@
     of D_max
     """
+    ## Title for plottools
+    window_caption = "D Explorer"
+
     def __init__(self, d_min, d_max, parent, id= -1, color=None, \
                  dpi=None, style=wx.NO_FULL_REPAINT_ON_RESIZE, **kwargs):
@@ -257 +260 @@
         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())
@@ -305 +307 @@
                          wx.EXPAND | wx.ADJUST_MINSIZE, 0)
         self.npts_ctl.SetValue("%g" % DEFAULT_NPTS)
-        self.npts_ctl.Bind(wx.EVT_KILL_FOCUS, self._recalc)
 
         ix += 1
@@ -315 +316 @@
                          wx.EXPAND | wx.ADJUST_MINSIZE, 0)
         self.dmin_ctl.SetValue(str(self._default_min))
-        self.dmin_ctl.Bind(wx.EVT_KILL_FOCUS, self._recalc)
 
         ix += 1
@@ -325 +325 @@
                          wx.EXPAND | wx.ADJUST_MINSIZE, 0)
         self.dmax_ctl.SetValue(str(self._default_max))
-        self.dmax_ctl.Bind(wx.EVT_KILL_FOCUS, self._recalc)
-
 
         # Ouput selection box
@@ -368 +366 @@
         """
         Not implemented
+        """
+        pass
+
+    def send_focus_to_datapanel(self, name):
+        """
+            The GUI manager sometimes calls this method
+            TODO: refactor this
         """
         pass

src/sas/perspectives/pr/inversion_panel.py

@@ -892 +892 @@
             pr = self._manager._create_plot_pr()
             dialog = ExploreDialog(pr, 10, None, -1, "")
-            dialog.ShowModal()
+            dialog.Show()
         else:
             message = "No data to analyze. Please load a data set to proceed."

src/sas/pr/invertor.py

@@ -537 +537 @@
             # number of terms
             best_alpha, _, _ = self.estimate_alpha(self.nfunc)
+            logging.warning("Invertor.estimate_numterms: %s" % sys.exc_value)
             return self.nfunc, best_alpha, "Could not estimate number of terms"