Changeset ec4a143 in sasview

Timestamp:

Oct 29, 2018 4:59:44 AM (6 years ago)

Author:

piotr

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:

7fb68060

Parents:

722b7d6

Message:

Allow magnetism for models with magnetic parameters defined. SASVIEW-1199

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingWidget.py (modified) (3 diffs)
• UnitTesting/FittingWidgetTest.py (modified) (3 diffs)

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

@@ -1010 +1010 @@
         Checks if the current model has magnetic scattering implemented
         """
-        current_model = self.cbModel.currentText()
-        return self.is2D and current_model in self.MAGNETIC_MODELS
+        has_params = False
+        if self.kernel_module:
+            has_mag_params = len(self.kernel_module.magnetic_params) > 0
+        return self.is2D and has_mag_params
 
     def onSelectModel(self):
@@ -1025 +1027 @@
         if not model:
             return
-        self.chkMagnetism.setEnabled(self.canHaveMagnetism())
-        self.tabFitting.setTabEnabled(TAB_MAGNETISM, self.chkMagnetism.isChecked() and self.canHaveMagnetism())
 
         # Reset parameters to fit
@@ -1164 +1164 @@
         self.SASModelToQModel(model, structure_factor)
 
+        # Enable magnetism checkbox for selected models
+        self.chkMagnetism.setEnabled(self.canHaveMagnetism())
+        self.tabFitting.setTabEnabled(TAB_MAGNETISM, self.chkMagnetism.isChecked() and self.canHaveMagnetism())
+
+        # Update column widths
         for column, width in self.lstParamHeaderSizes.items():
             self.lstParams.setColumnWidth(column, width)

src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingWidgetTest.py

@@ -177 +177 @@
 
         # test the model combo content
-        self.assertEqual(self.widget.cbModel.count(), 29)
+        self.assertEqual(self.widget.cbModel.count(), 28)
 
         # Try to change back to default
@@ -183 +183 @@
 
         # Observe no such luck
-        self.assertEqual(self.widget.cbCategory.currentIndex(), 7)
+        self.assertEqual(self.widget.cbCategory.currentIndex(), 6)
         self.assertEqual(self.widget.cbModel.count(), 29)
 
@@ -215 +215 @@
         # 
         # Now change the model
-        self.widget.cbModel.setCurrentIndex(3)
+        self.widget.cbModel.setCurrentIndex(2)
         self.assertEqual(self.widget.cbModel.currentText(),'dab')