Changeset d4216ac in sasview

Timestamp:

Sep 27, 2018 5:50:03 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

b38871e

Parents:

4f8c17f

Message:

Remember status of fitted parameters and respond to checkbox changes
accordingly. SASVIEW-1163

File:

• src/sas/qtgui/Perspectives/Fitting/FittingWidget.py (modified) (3 diffs)

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

@@ -469 +469 @@
         """ Enable/disable the polydispersity tab """
         self.tabFitting.setTabEnabled(TAB_POLY, isChecked)
+        # Check if any parameters are ready for fitting
+        self.cmdFit.setEnabled(self.haveParamsToFit())
 
     def toggleMagnetism(self, isChecked):
         """ Enable/disable the magnetism tab """
         self.tabFitting.setTabEnabled(TAB_MAGNETISM, isChecked)
+        # Check if any parameters are ready for fitting
+        self.cmdFit.setEnabled(self.haveParamsToFit())
 
     def toggleChainFit(self, isChecked):
@@ -1575 +1579 @@
         self.updateKernelModelWithExtraParams(model)
 
-        params_to_fit = self.main_params_to_fit
+        params_to_fit = copy.deepcopy(self.main_params_to_fit)
         if self.chkPolydispersity.isChecked():
             params_to_fit += self.poly_params_to_fit
@@ -2244 +2248 @@
         Finds out if there are any parameters ready to be fitted
         """
-        return (self.main_params_to_fit!=[]
-                or self.poly_params_to_fit!=[]
-                or self.magnet_params_to_fit != []) and \
-                self.logic.data_is_loaded
+        if not self.logic.data_is_loaded:
+            return False
+        if self.main_params_to_fit:
+            return True
+        if self.chkPolydispersity.isChecked() and self.poly_params_to_fit:
+            return True
+        if self.chkMagnetism.isChecked() and self.magnet_params_to_fit:
+            return True
+        return False
 
     def onMainParamsChange(self, item):