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

Timestamp:

Sep 6, 2018 9:34:38 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:

04ce9ac

Parents:

dda8f16

Message:

cherry-pick fixed-choice param support, made more generic and cleaner

File:

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

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

@@ -2050 +2050 @@
 
         # Update the QModel
-        new_rows = FittingUtilities.addParametersToModel(self.model_parameters, self.kernel_module, self.is2D)
-
-        for row in new_rows:
-            self._model_model.appendRow(row)
+        FittingUtilities.addParametersToModel(
+                self._model_model,
+                self.lstParams,
+                self.model_parameters,
+                self.kernel_module,
+                self.is2D)
+
         # Update the counter used for multishell display
         self._last_model_row = self._model_model.rowCount()
@@ -2071 +2074 @@
         self.kernel_module = MultiplicationModel(form_kernel, structure_kernel)
 
-        new_rows = FittingUtilities.addSimpleParametersToModel(structure_parameters, self.is2D)
-        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)
+        # Update the QModel
+        FittingUtilities.addSimpleParametersToModel(
+                self._model_model,
+                self.lstParams,
+                structure_parameters,
+                self.is2D)
+
+        # Any parameters removed from the structure factor when producing the product model, e.g. radius_effective, must
+        # be disabled (greyed out, etc.)
+        for r in range(self._last_model_row, self._model_model.rowCount()):
+            param_name = self._model_model.item(r, 0).text()
+            if param_name not in self.kernel_module.params.keys():
+                FittingUtilities.markParameterDisabled(self._model_model, r)
 
         # Update the counter used for multishell display