Changes in / [01b4877:f0365a2e] in sasview

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingUtilities.py (modified) (2 diffs)
• FittingWidget.py (modified) (4 diffs)

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

@@ -167 +167 @@
     return rows
 
-def addSimpleParametersToModel(parameters, is2D, parameters_original=None, model=None, view=None, row_num=None):
+def addSimpleParametersToModel(parameters, is2D, parameters_original=None, model=None, view=None):
     """
     Update local ModelModel with sasmodel parameters (non-dispersed, non-magnetic)
@@ -216 +216 @@
         # Append to the model and use the combobox, if required
         if None not in (model, view):
-            if row_num is None:
-                model.appendRow(row)
-            else:
-                model.insertRow(row_num, row)
-                row_num += 1
-
+            model.appendRow(row)
             if cbox:
                 view.setIndexWidget(item2.index(), cbox)
-
         rows.append(row)
 

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

@@ -2091 +2091 @@
             return
 
-        product_params = None
-
         if self.kernel_module is None:
             # Structure factor is the only selected model; build it and show all its params
@@ -2098 +2096 @@
             s_params = self.kernel_module._model_info.parameters
             s_params_orig = s_params
+
         else:
             s_kernel = self.models[structure_factor]()
@@ -2114 +2113 @@
             if "radius_effective_mode" in all_param_names:
                 # Show all parameters
-                # In this case, radius_effective is NOT pruned by sasmodels.product
                 s_params = modelinfo.ParameterTable(all_params[p_pars_len:p_pars_len+s_pars_len])
                 s_params_orig = modelinfo.ParameterTable(s_kernel._model_info.parameters.kernel_parameters)
-                product_params = modelinfo.ParameterTable(
-                        self.kernel_module._model_info.parameters.kernel_parameters[p_pars_len+s_pars_len:])
             else:
                 # Ensure radius_effective is not displayed
                 s_params_orig = modelinfo.ParameterTable(s_kernel._model_info.parameters.kernel_parameters[1:])
                 if "radius_effective" in all_param_names:
-                    # In this case, radius_effective is NOT pruned by sasmodels.product
                     s_params = modelinfo.ParameterTable(all_params[p_pars_len+1:p_pars_len+s_pars_len])
-                    product_params = modelinfo.ParameterTable(
-                            self.kernel_module._model_info.parameters.kernel_parameters[p_pars_len+s_pars_len:])
                 else:
-                    # In this case, radius_effective is pruned by sasmodels.product
                     s_params = modelinfo.ParameterTable(all_params[p_pars_len:p_pars_len+s_pars_len-1])
-                    product_params = modelinfo.ParameterTable(
-                            self.kernel_module._model_info.parameters.kernel_parameters[p_pars_len+s_pars_len-1:])
 
         # Add heading row
@@ -2139 +2129 @@
         # Any renamed parameters are stored as data in the relevant item, for later handling
         FittingUtilities.addSimpleParametersToModel(
-                parameters=s_params,
-                is2D=self.is2D,
-                parameters_original=s_params_orig,
-                model=self._model_model,
-                view=self.lstParams)
-
-        # Insert product-only params into QModel
-        if product_params:
-            prod_rows = FittingUtilities.addSimpleParametersToModel(
-                    parameters=product_params,
-                    is2D=self.is2D,
-                    parameters_original=None,
-                    model=self._model_model,
-                    view=self.lstParams,
-                    row_num=2)
-
-            # Since this all happens after shells are dealt with and we've inserted rows, fix this counter
-            self._n_shells_row += len(prod_rows)
+                s_params,
+                self.is2D,
+                s_params_orig,
+                self._model_model,
+                self.lstParams)
 
     def haveParamsToFit(self):