Changeset 672c0e97 in sasview

Timestamp:

Oct 2, 2018 6:48:46 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:

a98014ab

Parents:

bb3e54dc

git-author:

Piotr Rozyczko <piotr.rozyczko@…> (10/02/18 06:48:06)

git-committer:

Piotr Rozyczko <piotr.rozyczko@…> (10/02/18 06:48:46)

Message:

Magnetism is enabled only for selected few models. SASVIEW-1199

File:

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

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

@@ -106 +106 @@
     Calc1DFinishedSignal = QtCore.pyqtSignal(dict)
     Calc2DFinishedSignal = QtCore.pyqtSignal(dict)
+
+    MAGNETIC_MODELS = ['sphere', 'core_shell_sphere', 'core_multi_shell', 'cylinder', 'parallelepiped']
 
     def __init__(self, parent=None, data=None, tab_id=1):
@@ -423 +425 @@
         self.chk2DView.setEnabled(False)
         self.chk2DView.setVisible(False)
-        self.chkMagnetism.setEnabled(self.is2D)
+        self.chkMagnetism.setEnabled(False)
         self.tabFitting.setTabEnabled(TAB_MAGNETISM, self.chkMagnetism.isChecked())
         # Combo box or label for file name"
@@ -1009 +1011 @@
         if not model:
             return
-
+        self.chkMagnetism.setEnabled(self.is2D and model in self.MAGNETIC_MODELS)
         # Reset parameters to fit
         self.resetParametersToFit()
@@ -2186 +2188 @@
             p_kernel = self.kernel_module
             # need to reset multiplicity to get the right product
-            p_kernel.multiplicity = p_kernel.multiplicity_info.number
+            if p_kernel.is_multiplicity_model:
+                p_kernel.multiplicity = p_kernel.multiplicity_info.number
 
             p_pars_len = len(p_kernel._model_info.parameters.kernel_parameters)
@@ -3170 +3173 @@
         self.cbStructureFactor.setEnabled(enabled)
 
-        self.chkPolydispersity.setEnabled(enabled)
-        self.chkMagnetism.setEnabled(enabled)
-        self.chk2DView.setEnabled(enabled)
-
     def enableInteractiveElements(self):
         """