Changeset 2d0e0c1 in sasview for src

Timestamp:

Jun 14, 2017 3:58:59 AM (7 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:

1643d8ed

Parents:

125c4be

Message:

Initial version of the Fitting Options dialog SASVIEW-276

Location:

src/sas/qtgui

Files:

• MainWindow/GuiManager.py (modified) (1 diff)
• Perspectives/Fitting/FittingOptions.py (added)
• Perspectives/Fitting/FittingPerspective.py (modified) (4 diffs)
• Perspectives/Fitting/UI/FittingOptionsUI.ui (added)

src/sas/qtgui/MainWindow/GuiManager.py

@@ -612 +612 @@
         """
         """
-        print("actionFit_Options TRIGGERED")
+        if getattr(self._current_perspective, "fit_options_widget"):
+            self._current_perspective.fit_options_widget.show()
         pass
 

src/sas/qtgui/Perspectives/Fitting/FittingPerspective.py

@@ -4 +4 @@
 from PyQt4 import QtGui
 
+from bumps import options
+from bumps import fitters
+
 import sas.qtgui.Utilities.ObjectLibrary as ObjectLibrary
 
 from sas.qtgui.Perspectives.Fitting.FittingWidget import FittingWidget
+from sas.qtgui.Perspectives.Fitting.FittingOptions import FittingOptions
 from sas.qtgui.Perspectives.Fitting import ModelUtilities
 
@@ -45 +49 @@
         self._allow_close = False
 
+        # Fit options - uniform for all tabs
+        self.fit_options = options.FIT_CONFIG
+        self.fit_options_widget = FittingOptions(self, config=self.fit_options)
+        self.fit_options.selected_id = fitters.LevenbergMarquardtFit.id
+
+        # Listen to GUI Manager signal updating fit options
+        self.fit_options_widget.fit_option_changed.connect(self.onFittingOptionsChange)
+
         self.menu_manager = ModelUtilities.ModelManager()
         # TODO: reuse these in FittingWidget properly
@@ -50 +62 @@
         self.model_dictionary = self.menu_manager.get_model_dictionary()
 
+        #self.setWindowTitle('Fit panel - Active Fitting Optimizer: %s' % self.optimizer)
+        self.updateWindowTitle()
+
+    def updateWindowTitle(self):
+        """
+        Update the window title with the current optimizer name
+        """
+        self.optimizer = self.fit_options.selected_name
         self.setWindowTitle('Fit panel - Active Fitting Optimizer: %s' % self.optimizer)
+
 
     def setClosable(self, value=True):
@@ -137 +158 @@
             else:
                 self.addFit(data)
+
+    def onFittingOptionsChange(self, fit_engine, fit_options):
+        """
+        """
+        fitter = [f.id for f in options.FITTERS if f.name == str(fit_engine)][0]
+
+        # set the optimizer
+        self.fit_options.selected_id = str(fitter)
+        # set the options
+        #
+        # Update the title
+        self.updateWindowTitle()
+
+        pass