Changes in / [516ee4b:cf8d6c9] in sasview

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingUtilities.py (modified) (1 diff)
• FittingWidget.py (modified) (2 diffs)

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

@@ -149 +149 @@
         item.append([item1, item2, item4, item5, item6])
     return item
-
-def markParameterDisabled(model, row):
-    """Given the QModel row number, format to show it is not available for fitting"""
-
-    # If an error column is present, there are a total of 6 columns.
-    items = [model.item(row, c) for c in range(6)]
-
-    model.blockSignals(True)
-
-    for item in items:
-        if item is None:
-            continue
-        item.setEditable(False)
-        item.setCheckable(False)
-
-    item = items[0]
-
-    font = QtGui.QFont()
-    font.setItalic(True)
-    item.setFont(font)
-    item.setForeground(QtGui.QBrush(QtGui.QColor(100, 100, 100)))
-    item.setToolTip("This parameter cannot be fitted.")
-
-    model.blockSignals(False)
 
 def addCheckedListToModel(model, param_list):

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

@@ -15 +15 @@
 from PyQt5 import QtWidgets
 
+from sasmodels import product
 from sasmodels import generate
 from sasmodels import modelinfo
 from sasmodels.sasview_model import load_standard_models
-from sasmodels.sasview_model import MultiplicationModel
 from sasmodels.weights import MODELS as POLYDISPERSITY_MODELS
 
@@ -1961 +1961 @@
         structure_module = generate.load_kernel_module(structure_factor)
         structure_parameters = modelinfo.make_parameter_table(getattr(structure_module, 'parameters', []))
-
         structure_kernel = self.models[structure_factor]()
-        form_kernel = self.kernel_module
-
-        self.kernel_module = MultiplicationModel(form_kernel, structure_kernel)
+
+        self.kernel_module._model_info = product.make_product_info(self.kernel_module._model_info, structure_kernel._model_info)
 
         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 counter used for multishell display
         self._last_model_row = self._model_model.rowCount()