Changes in / [f0365a2e:01b4877] in sasview
- Location:
- src/sas/qtgui/Perspectives/Fitting
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/qtgui/Perspectives/Fitting/FittingUtilities.py
r70f4458 r70f4458 167 167 return rows 168 168 169 def addSimpleParametersToModel(parameters, is2D, parameters_original=None, model=None, view=None ):169 def addSimpleParametersToModel(parameters, is2D, parameters_original=None, model=None, view=None, row_num=None): 170 170 """ 171 171 Update local ModelModel with sasmodel parameters (non-dispersed, non-magnetic) … … 216 216 # Append to the model and use the combobox, if required 217 217 if None not in (model, view): 218 model.appendRow(row) 218 if row_num is None: 219 model.appendRow(row) 220 else: 221 model.insertRow(row_num, row) 222 row_num += 1 223 219 224 if cbox: 220 225 view.setIndexWidget(item2.index(), cbox) 226 221 227 rows.append(row) 222 228 -
src/sas/qtgui/Perspectives/Fitting/FittingWidget.py
r5fb714b r5fb714b 2091 2091 return 2092 2092 2093 product_params = None 2094 2093 2095 if self.kernel_module is None: 2094 2096 # Structure factor is the only selected model; build it and show all its params … … 2096 2098 s_params = self.kernel_module._model_info.parameters 2097 2099 s_params_orig = s_params 2098 2099 2100 else: 2100 2101 s_kernel = self.models[structure_factor]() … … 2113 2114 if "radius_effective_mode" in all_param_names: 2114 2115 # Show all parameters 2116 # In this case, radius_effective is NOT pruned by sasmodels.product 2115 2117 s_params = modelinfo.ParameterTable(all_params[p_pars_len:p_pars_len+s_pars_len]) 2116 2118 s_params_orig = modelinfo.ParameterTable(s_kernel._model_info.parameters.kernel_parameters) 2119 product_params = modelinfo.ParameterTable( 2120 self.kernel_module._model_info.parameters.kernel_parameters[p_pars_len+s_pars_len:]) 2117 2121 else: 2118 2122 # Ensure radius_effective is not displayed 2119 2123 s_params_orig = modelinfo.ParameterTable(s_kernel._model_info.parameters.kernel_parameters[1:]) 2120 2124 if "radius_effective" in all_param_names: 2125 # In this case, radius_effective is NOT pruned by sasmodels.product 2121 2126 s_params = modelinfo.ParameterTable(all_params[p_pars_len+1:p_pars_len+s_pars_len]) 2127 product_params = modelinfo.ParameterTable( 2128 self.kernel_module._model_info.parameters.kernel_parameters[p_pars_len+s_pars_len:]) 2122 2129 else: 2130 # In this case, radius_effective is pruned by sasmodels.product 2123 2131 s_params = modelinfo.ParameterTable(all_params[p_pars_len:p_pars_len+s_pars_len-1]) 2132 product_params = modelinfo.ParameterTable( 2133 self.kernel_module._model_info.parameters.kernel_parameters[p_pars_len+s_pars_len-1:]) 2124 2134 2125 2135 # Add heading row … … 2129 2139 # Any renamed parameters are stored as data in the relevant item, for later handling 2130 2140 FittingUtilities.addSimpleParametersToModel( 2131 s_params, 2132 self.is2D, 2133 s_params_orig, 2134 self._model_model, 2135 self.lstParams) 2141 parameters=s_params, 2142 is2D=self.is2D, 2143 parameters_original=s_params_orig, 2144 model=self._model_model, 2145 view=self.lstParams) 2146 2147 # Insert product-only params into QModel 2148 if product_params: 2149 prod_rows = FittingUtilities.addSimpleParametersToModel( 2150 parameters=product_params, 2151 is2D=self.is2D, 2152 parameters_original=None, 2153 model=self._model_model, 2154 view=self.lstParams, 2155 row_num=2) 2156 2157 # Since this all happens after shells are dealt with and we've inserted rows, fix this counter 2158 self._n_shells_row += len(prod_rows) 2136 2159 2137 2160 def haveParamsToFit(self):
Note: See TracChangeset
for help on using the changeset viewer.