Changeset f712bf30 in sasview

Timestamp:

Sep 9, 2018 2:56:21 AM (6 years ago)

Author:

Torin Cooper-Bennun <torin.cooper-bennun@…>

Branches:

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

Children:

bb477f5

Parents:

2b8286c

Message:

add default number of shells when a multi-shell model is selected

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingWidget.py (modified) (1 diff)
• UnitTesting/FittingWidgetTest.py (modified) (1 diff)

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

@@ -2813 +2813 @@
         self._n_shells_row = shell_row - 1
 
-        # Set the index to the state-kept value
-        func.setCurrentIndex(self.current_shell_displayed
-                             if self.current_shell_displayed < func.count() else 0)
+        # Get the default number of shells for the model
+        kernel_pars = self.kernel_module._model_info.parameters.kernel_parameters
+        shell_par = None
+        for par in kernel_pars:
+            if par.name == param_name:
+                shell_par = par
+                break
+        if not shell_par:
+            logger.error("Could not find %s in kernel parameters.", param_name)
+        default_shell_count = shell_par.default
+
+        # Add default number of shells to the model
+        func.setCurrentIndex(default_shell_count)
 
     def modifyShellsInList(self, index):

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

@@ -613 +613 @@
 
         # Check that the number of rows increased
+        # (note that n == 1 by default in core_multi_shell so this increases index by 2)
         more_rows = self.widget._model_model.rowCount() - last_row
-        self.assertEqual(more_rows, 6) # 6 new rows: 2 params per index
-
-        # Back to 0
+        self.assertEqual(more_rows, 4) # 4 new rows: 2 params per index
+
+        # Set to 0
         self.widget.lstParams.indexWidget(func_index).setCurrentIndex(0)
-        self.assertEqual(self.widget._model_model.rowCount(), last_row)
+        self.assertEqual(self.widget._model_model.rowCount(), last_row - 2) # 2 fewer rows than default
 
     def testPlotTheory(self):