Changeset f0365a2e in sasview for src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

Timestamp:

Sep 7, 2018 10:33:01 AM (6 years ago)

Author:

GitHub <noreply@…>

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:

9d23e4c, c0de493

Parents:

c2f3ca2 (diff), 5fb714b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Torin Cooper-Bennun <40573959+tcbennun@…> (09/07/18 10:33:01)

git-committer:

GitHub <noreply@…> (09/07/18 10:33:01)

Message:

Merge pull request #171 from SasView?/ESS_GUI_iss1032

SASVIEW-1032: Support for fixed-choice model parameters, e.g structure_factor_mode

File:

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

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

@@ -2073 +2073 @@
         self.shell_names = self.shellNamesList()
 
-        # Get new rows for QModel
-        new_rows = FittingUtilities.addParametersToModel(self.model_parameters, self.kernel_module, self.is2D)
-
         # Add heading row
         FittingUtilities.addHeadingRowToModel(self._model_model, model_name)
 
-        # Update QModel
-        for row in new_rows:
-            self._model_model.appendRow(row)
+        # Update the QModel
+        FittingUtilities.addParametersToModel(
+                self.model_parameters,
+                self.kernel_module,
+                self.is2D,
+                self._model_model,
+                self.lstParams)
 
     def fromStructureFactorToQModel(self, structure_factor):
@@ -2090 +2091 @@
             return
 
-        s_kernel = self.models[structure_factor]()
-        p_kernel = self.kernel_module
-
-        if p_kernel is None:
-            # Not a product model, just S(Q)
-            self.kernel_module = s_kernel
-            params = modelinfo.ParameterTable(self.kernel_module._model_info.parameters.kernel_parameters)
-            new_rows = FittingUtilities.addSimpleParametersToModel(params, self.is2D)
+        if self.kernel_module is None:
+            # Structure factor is the only selected model; build it and show all its params
+            self.kernel_module = self.models[structure_factor]()
+            s_params = self.kernel_module._model_info.parameters
+            s_params_orig = s_params
+
         else:
+            s_kernel = self.models[structure_factor]()
+            p_kernel = self.kernel_module
+
             p_pars_len = len(p_kernel._model_info.parameters.kernel_parameters)
             s_pars_len = len(s_kernel._model_info.parameters.kernel_parameters)
@@ -2107 +2109 @@
 
             # S(Q) params from the product model are not necessarily the same as those from the S(Q) model; any
-            # conflicting names with P(Q) params will cause a rename; we also lose radius_effective (for now...)
-
-            # TODO: merge rest of beta approx implementation in
-            # This is to ensure compatibility when we merge beta approx support in...!
-
-            # radius_effective is always s_params[0]
-
-            # if radius_effective_mode is in all_params, then all_params contains radius_effective and we want to
-            # keep it in the model
-
-            # if radius_effective_mode is NOT in all_params, then radius_effective should NOT be kept, because the user
-            # cannot specify it themselves; but, make sure we only remove it if it's actually there in the first place
-            # (sasmodels master removes it already)
+            # conflicting names with P(Q) params will cause a rename
+
             if "radius_effective_mode" in all_param_names:
                 # Show all parameters
@@ -2132 +2123 @@
                     s_params = modelinfo.ParameterTable(all_params[p_pars_len:p_pars_len+s_pars_len-1])
 
-            # Get new rows for QModel
-            # Any renamed parameters are stored as data in the relevant item, for later handling
-            new_rows = FittingUtilities.addSimpleParametersToModel(s_params, self.is2D, s_params_orig)
-
-            # TODO: merge rest of beta approx implementation in
-            # These parameters are not part of P(Q) nor S(Q), but are added only to the product model (e.g. specifying
-            # structure factor calculation mode)
-            # product_params = all_params[p_pars_len+s_pars_len:]
-
         # Add heading row
         FittingUtilities.addHeadingRowToModel(self._model_model, structure_factor)
 
-        # Update QModel
-        for row in new_rows:
-            self._model_model.appendRow(row)
-            # disable fitting of parameters not listed in self.kernel_module (probably radius_effective)
-            # if row[0].text() not in self.kernel_module.params.keys():
-            #     row_num = self._model_model.rowCount() - 1
-            #     FittingUtilities.markParameterDisabled(self._model_model, row_num)
+        # Get new rows for QModel
+        # Any renamed parameters are stored as data in the relevant item, for later handling
+        FittingUtilities.addSimpleParametersToModel(
+                s_params,
+                self.is2D,
+                s_params_orig,
+                self._model_model,
+                self.lstParams)
 
     def haveParamsToFit(self):
@@ -2813 +2796 @@
             self._model_model.removeRows(first_row, remove_rows)
 
-        new_rows = FittingUtilities.addShellsToModel(self.model_parameters, self._model_model, index, first_row)
+        new_rows = FittingUtilities.addShellsToModel(
+                self.model_parameters,
+                self._model_model,
+                index,
+                first_row,
+                self.lstParams)
+
         self._num_shell_params = len(new_rows)
-
         self.current_shell_displayed = index