Changeset 05228b0 in sasview

Timestamp:

Apr 22, 2016 3:55:08 PM (9 years ago)

Author:

Paul Kienzle <pkienzle@…>

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:

243fbc0

Parents:

4188da8

Message:

use the new bumps fitter changed event to update the active fitter indicator

Location:

src/sas/sasgui/perspectives/fitting

Files:

• fitpanel.py (modified) (2 diffs)
• fitting.py (modified) (3 diffs)

src/sas/sasgui/perspectives/fitting/fitpanel.py

@@ -17 +17 @@
 import models
 _BOX_WIDTH = 80
-
 
 class FitPanel(nb, PanelBase):
@@ -154 +153 @@
         """
         """
-        from bumps.options import FIT_CONFIG
-        current = FIT_CONFIG.selected_name
-        self.parent.SetTitle(self.window_name + " - Active Fitting Optimizer: " + current)
         pos = self.GetSelection()
         if pos != -1:

src/sas/sasgui/perspectives/fitting/fitting.py

@@ -56 +56 @@
     ON_MAC = True
 
-
+import bumps.options
+from bumps.gui.fit_dialog import show_fit_config
+try:
+    from bumps.gui.fit_dialog import EVT_FITTER_CHANGED
+except ImportError:
+    EVT_FITTER_CHANGED = None  # type: wx.PyCommandEvent
 
 class Plugin(PluginBase):
@@ -501 +506 @@
         self.parent.Bind(EVT_SLICER_PANEL, self._on_slicer_event)
         self.parent.Bind(EVT_SLICER_PARS_UPDATE, self._onEVT_SLICER_PANEL)
+
+        if EVT_FITTER_CHANGED is not None:
+            self.parent.Bind(EVT_FITTER_CHANGED, self.on_fitter_changed)
+        self._set_fitter_label(bumps.options.FIT_CONFIG)
+
         #self.parent._mgr.Bind(wx.aui.EVT_AUI_PANE_CLOSE,self._onclearslicer)
         #Create reader when fitting panel are created
@@ -763 +773 @@
         Open the bumps options panel.
         """
-        try:
-            from bumps.gui.fit_dialog import show_fit_config
-            show_fit_config(self.parent, help=self.on_help)
-        except ImportError:
-            # CRUFT: Bumps 0.7.5.6 and earlier do not have the help button
-            from bumps.gui.fit_dialog import OpenFitOptions
-            OpenFitOptions()
+        show_fit_config(self.parent, help=self.on_help)
+
+    def on_fitter_changed(self, event):
+        self._set_fitter_label(event.config)
+
+    def _set_fitter_label(self, config):
+        self.fit_panel.parent.SetTitle(self.fit_panel.window_name
+                                       + " - Active Fitting Optimizer: "
+                                       + config.selected_name)
 
     def on_help(self, algorithm_id):