Changes in / [9ba91b7:d6c4987] in sasview
- Location:
- src/sas/qtgui
- Files:
-
- 6 edited
-
MainWindow/DataExplorer.py (modified) (3 diffs)
-
Perspectives/Fitting/FittingLogic.py (modified) (4 diffs)
-
Perspectives/Fitting/FittingUtilities.py (modified) (6 diffs)
-
Perspectives/Fitting/FittingWidget.py (modified) (23 diffs)
-
Perspectives/Fitting/ModelThread.py (modified) (2 diffs)
-
Perspectives/Fitting/UnitTesting/FittingWidgetTest.py (modified) (19 diffs)
Legend:
- Unmodified
- Added
- Removed
-
src/sas/qtgui/MainWindow/DataExplorer.py
r60d55a7 rfd7ef36 560 560 # Now query the model item for available plots 561 561 plots = GuiUtils.plotsFromFilename(filename, model) 562 ids_keys = list(self.active_plots.keys()) 563 ids_vals = [val.data.id for val in self.active_plots.values()] 562 564 563 565 new_plots = [] 564 566 for item, plot in plots.items(): 565 if not self.updatePlot(plot): 567 plot_id = plot.id 568 if plot_id in ids_keys: 569 self.active_plots[plot_id].replacePlot(plot_id, plot) 570 elif plot_id in ids_vals: 571 list(self.active_plots.values())[ids_vals.index(plot_id)].replacePlot(plot_id, plot) 572 else: 566 573 # Don't plot intermediate results, e.g. P(Q), S(Q) 567 match = GuiUtils.theory_plot_ID_pattern.match(plot .id)574 match = GuiUtils.theory_plot_ID_pattern.match(plot_id) 568 575 # 2nd match group contains the identifier for the intermediate result, if present (e.g. "[P(Q)]") 569 576 if match and match.groups()[1] != None: … … 699 706 self.active_plots[plot_set.id] = old_plot 700 707 701 def updatePlot(self, data): 702 """ 703 Modify existing plot for immediate response and returns True. 704 Returns false, if the plot does not exist already. 705 """ 706 try: # there might be a list or a single value being passed 707 data = data[0] 708 except TypeError: 709 pass 708 def updatePlot(self, new_data): 709 """ 710 Modify existing plot for immediate response 711 """ 712 data = new_data[0] 710 713 assert type(data).__name__ in ['Data1D', 'Data2D'] 711 714 … … 716 719 if data_id in ids_keys: 717 720 self.active_plots[data_id].replacePlot(data_id, data) 718 return True719 721 elif data_id in ids_vals: 720 722 list(self.active_plots.values())[ids_vals.index(data_id)].replacePlot(data_id, data) 721 return True722 return False723 723 724 724 def chooseFiles(self): -
src/sas/qtgui/Perspectives/Fitting/FittingLogic.py
rdcabba7 r40975f8 161 161 Create a new 1D data instance based on fitting results 162 162 """ 163 return self._create1DPlot(tab_id, return_data['x'], return_data['y'], 164 return_data['model'], return_data['data']) 163 # Unpack return data from Calc1D 164 x, y, page_id, state, weight,\ 165 fid, toggle_mode_on, \ 166 elapsed, index, model, \ 167 data, update_chisqr, source, \ 168 unsmeared_output, unsmeared_data, unsmeared_error, \ 169 intermediate_results = return_data 170 171 return self._create1DPlot(tab_id, x, y, model, data) 165 172 166 173 def new2DPlot(self, return_data): … … 168 175 Create a new 2D data instance based on fitting results 169 176 """ 170 image = return_data['image']171 data = return_data['data']172 model = return_data['model']177 image, data, page_id, model, state, toggle_mode_on,\ 178 elapsed, index, fid, qmin, qmax, weight, \ 179 update_chisqr, source = return_data 173 180 174 181 np.nan_to_num(image) … … 176 183 new_plot.name = model.name + '2d' 177 184 new_plot.title = "Analytical model 2D " 178 new_plot.id = str( return_data['page_id']) + " " + data.name179 new_plot.group_id = str( return_data['page_id']) + " Model2D"185 new_plot.id = str(page_id) + " " + data.name 186 new_plot.group_id = str(page_id) + " Model2D" 180 187 new_plot.detector = data.detector 181 188 new_plot.source = data.source … … 211 218 (pq_plot, sq_plot). If either are unavailable, the corresponding plot is None. 212 219 """ 220 # Unpack return data from Calc1D 221 x, y, page_id, state, weight, \ 222 fid, toggle_mode_on, \ 223 elapsed, index, model, \ 224 data, update_chisqr, source, \ 225 unsmeared_output, unsmeared_data, unsmeared_error, \ 226 intermediate_results = return_data 227 213 228 plots = [] 214 for name, result in return_data['intermediate_results'].items(): 215 plots.append(self._create1DPlot(tab_id, return_data['x'], result, 216 return_data['model'], return_data['data'], 217 component=name)) 229 for name, result in intermediate_results.items(): 230 plots.append(self._create1DPlot(tab_id, x, result, model, data, component=name)) 218 231 return plots 219 232 -
src/sas/qtgui/Perspectives/Fitting/FittingUtilities.py
r70f4458 rb764ae5 124 124 return item 125 125 126 def addSimpleParametersToModel(parameters, is2D , parameters_original=None):126 def addSimpleParametersToModel(parameters, is2D): 127 127 """ 128 128 Update local ModelModel with sasmodel parameters 129 parameters_original: list of parameters before any tagging on their IDs, e.g. for product model130 (so that those are the display names; see below)131 129 """ 132 130 if is2D: … … 134 132 else: 135 133 params = parameters.iq_parameters 136 137 if parameters_original:138 # 'parameters_original' contains the parameters as they are to be DISPLAYED, while 'parameters'139 # contains the parameters as they were renamed; this is for handling name collisions in product model.140 # The 'real name' of the parameter will be stored in the item's user data.141 if is2D:142 params_orig = [p for p in parameters_original.kernel_parameters if p.type != 'magnetic']143 else:144 params_orig = parameters_original.iq_parameters145 else:146 # no difference in names anyway147 params_orig = params148 149 134 item = [] 150 for param , param_orig in zip(params, params_orig):135 for param in params: 151 136 # Create the top level, checkable item 152 item_name = param _orig.name137 item_name = param.name 153 138 item1 = QtGui.QStandardItem(item_name) 154 item1.setData(param.name, QtCore.Qt.UserRole)155 139 item1.setCheckable(True) 156 140 item1.setEditable(False) … … 160 144 item4 = QtGui.QStandardItem(str(param.limits[0])) 161 145 item5 = QtGui.QStandardItem(str(param.limits[1])) 162 item6 = QtGui.QStandardItem( str(param.units))146 item6 = QtGui.QStandardItem(param.units) 163 147 item6.setEditable(False) 164 148 item.append([item1, item2, item4, item5, item6]) … … 198 182 model.appendRow(item_list) 199 183 200 def addHeadingRowToModel(model, name):201 """adds a non-interactive top-level row to the model"""202 header_row = [QtGui.QStandardItem() for i in range(5)]203 header_row[0].setText(name)204 205 font = header_row[0].font()206 font.setBold(True)207 header_row[0].setFont(font)208 209 for item in header_row:210 item.setEditable(False)211 item.setCheckable(False)212 item.setSelectable(False)213 214 model.appendRow(header_row)215 216 184 def addHeadersToModel(model): 217 185 """ … … 259 227 model.header_tooltips = copy.copy(poly_header_error_tooltips) 260 228 261 def addShellsToModel(parameters, model, index, row_num=None): 262 """ 263 Find out multishell parameters and update the model with the requested number of them. 264 Inserts them after the row at row_num, if not None; otherwise, appends to end. 265 Returns a list of lists of QStandardItem objects. 229 def addShellsToModel(parameters, model, index): 230 """ 231 Find out multishell parameters and update the model with the requested number of them 266 232 """ 267 233 multishell_parameters = getIterParams(parameters) 268 234 269 rows = []270 235 for i in range(index): 271 236 for par in multishell_parameters: … … 294 259 item4 = QtGui.QStandardItem(str(par.limits[1])) 295 260 item5 = QtGui.QStandardItem(par.units) 296 row = [item1, item2, item3, item4, item5] 297 rows.append(row) 298 299 if row_num is None: 300 model.appendRow(row) 301 else: 302 model.insertRow(row_num, row) 303 row_num += 1 304 305 return rows 261 model.appendRow([item1, item2, item3, item4, item5]) 306 262 307 263 def calculateChi2(reference_data, current_data): -
src/sas/qtgui/Perspectives/Fitting/FittingWidget.py
r0109f2a r40975f8 91 91 fittingFinishedSignal = QtCore.pyqtSignal(tuple) 92 92 batchFittingFinishedSignal = QtCore.pyqtSignal(tuple) 93 Calc1DFinishedSignal = QtCore.pyqtSignal( dict)94 Calc2DFinishedSignal = QtCore.pyqtSignal( dict)93 Calc1DFinishedSignal = QtCore.pyqtSignal(tuple) 94 Calc2DFinishedSignal = QtCore.pyqtSignal(tuple) 95 95 96 96 def __init__(self, parent=None, data=None, tab_id=1): … … 219 219 # Utility variable to enable unselectable option in category combobox 220 220 self._previous_category_index = 0 221 # Utility variables for multishell display 222 self._n_shells_row = 0 223 self._num_shell_params = 0 221 # Utility variable for multishell display 222 self._last_model_row = 0 224 223 # Dictionary of {model name: model class} for the current category 225 224 self.models = {} … … 677 676 Return list of all parameters for the current model 678 677 """ 679 return [self._model_model.item(row).text() 680 for row in range(self._model_model.rowCount()) 681 if self.isCheckable(row)] 678 return [self._model_model.item(row).text() for row in range(self._model_model.rowCount())] 682 679 683 680 def modifyViewOnRow(self, row, font=None, brush=None): … … 707 704 assert isinstance(constraint, Constraint) 708 705 assert 0 <= row <= self._model_model.rowCount() 709 assert self.isCheckable(row)710 706 711 707 item = QtGui.QStandardItem() … … 728 724 max_col = self.lstParams.itemDelegate().param_max 729 725 for row in self.selectedParameters(): 730 assert(self.isCheckable(row))731 726 param = self._model_model.item(row, 0).text() 732 727 value = self._model_model.item(row, 1).text() … … 771 766 max_col = self.lstParams.itemDelegate().param_max 772 767 for row in range(self._model_model.rowCount()): 773 if not self.isCheckable(row):774 continue775 768 if not self.rowHasConstraint(row): 776 769 continue … … 801 794 For the given row, return its constraint, if any 802 795 """ 803 if self.isCheckable(row):796 try: 804 797 item = self._model_model.item(row, 1) 805 try: 806 return item.child(0).data() 807 except AttributeError: 808 # return none when no constraints 809 pass 810 return None 798 return item.child(0).data() 799 except AttributeError: 800 # return none when no constraints 801 return None 811 802 812 803 def rowHasConstraint(self, row): … … 814 805 Finds out if row of the main model has a constraint child 815 806 """ 816 if self.isCheckable(row): 817 item = self._model_model.item(row, 1) 818 if item.hasChildren(): 819 c = item.child(0).data() 820 if isinstance(c, Constraint): 821 return True 807 item = self._model_model.item(row, 1) 808 if item.hasChildren(): 809 c = item.child(0).data() 810 if isinstance(c, Constraint): 811 return True 822 812 return False 823 813 … … 826 816 Finds out if row of the main model has an active constraint child 827 817 """ 828 if self.isCheckable(row): 829 item = self._model_model.item(row, 1) 830 if item.hasChildren(): 831 c = item.child(0).data() 832 if isinstance(c, Constraint) and c.active: 833 return True 818 item = self._model_model.item(row, 1) 819 if item.hasChildren(): 820 c = item.child(0).data() 821 if isinstance(c, Constraint) and c.active: 822 return True 834 823 return False 835 824 … … 838 827 Finds out if row of the main model has an active, nontrivial constraint child 839 828 """ 840 if self.isCheckable(row): 841 item = self._model_model.item(row, 1) 842 if item.hasChildren(): 843 c = item.child(0).data() 844 if isinstance(c, Constraint) and c.func and c.active: 845 return True 829 item = self._model_model.item(row, 1) 830 if item.hasChildren(): 831 c = item.child(0).data() 832 if isinstance(c, Constraint) and c.func and c.active: 833 return True 846 834 return False 847 835 … … 1209 1197 self.updateData() 1210 1198 1211 # update in param model1212 if model_column in [delegate.poly_pd, delegate.poly_error, delegate.poly_min, delegate.poly_max]:1213 row = self.getRowFromName(parameter_name)1214 param_item = self._model_model.item(row)1215 self._model_model.blockSignals(True)1216 param_item.child(0).child(0, model_column).setText(item.text())1217 self._model_model.blockSignals(False)1218 1219 1199 def onMagnetModelChange(self, item): 1220 1200 """ … … 1589 1569 # internal so can use closure for param_dict 1590 1570 param_name = str(self._model_model.item(row, 0).text()) 1591 if not self.isCheckable(row) orparam_name not in list(param_dict.keys()):1571 if param_name not in list(param_dict.keys()): 1592 1572 return 1593 1573 # modify the param value … … 1601 1581 # Utility function for updateof polydispersity part of the main model 1602 1582 param_name = str(self._model_model.item(row, 0).text())+'.width' 1603 if not self.isCheckable(row) orparam_name not in list(param_dict.keys()):1583 if param_name not in list(param_dict.keys()): 1604 1584 return 1605 1585 # modify the param value … … 1978 1958 # Crete/overwrite model items 1979 1959 self._model_model.clear() 1980 self._poly_model.clear() 1981 self._magnet_model.clear()1982 1983 if model_name is None:1984 if structure_factor not in (None, "None"): 1985 # S(Q) on its own, treat the same as a form factor1986 self.kernel_module = None1987 self.fromStructureFactorToQModel(structure_factor)1988 else:1989 # No models selected1990 return1960 1961 # First, add parameters from the main model 1962 if model_name is not None: 1963 self.fromModelToQModel(model_name) 1964 1965 # Then, add structure factor derived parameters 1966 if structure_factor is not None and structure_factor != "None": 1967 if model_name is None: 1968 # Instantiate the current sasmodel for SF-only models 1969 self.kernel_module = self.models[structure_factor]() 1970 self.fromStructureFactorToQModel(structure_factor) 1991 1971 else: 1992 self.fromModelToQModel(model_name)1993 self.addExtraShells()1994 1995 1972 # Allow the SF combobox visibility for the given sasmodel 1996 1973 self.enableStructureFactorControl(structure_factor) 1997 1998 # Add S(Q)1999 1974 if self.cbStructureFactor.isEnabled(): 2000 1975 structure_factor = self.cbStructureFactor.currentText() 2001 1976 self.fromStructureFactorToQModel(structure_factor) 2002 1977 2003 # Add polydispersity to the model 2004 self.poly_params = {} 2005 self.setPolyModel() 2006 # Add magnetic parameters to the model 2007 self.magnet_params = {} 2008 self.setMagneticModel() 1978 # Then, add multishells 1979 if model_name is not None: 1980 # Multishell models need additional treatment 1981 self.addExtraShells() 1982 1983 # Add polydispersity to the model 1984 self.poly_params = {} 1985 self.setPolyModel() 1986 # Add magnetic parameters to the model 1987 self.magnet_params = {} 1988 self.setMagneticModel() 2009 1989 2010 1990 # Adjust the table cells width … … 2079 2059 self.shell_names = self.shellNamesList() 2080 2060 2081 # Get new rows forQModel2061 # Update the QModel 2082 2062 new_rows = FittingUtilities.addParametersToModel(self.model_parameters, self.kernel_module, self.is2D) 2083 2063 2084 # Add heading row2085 FittingUtilities.addHeadingRowToModel(self._model_model, model_name)2086 2087 # Update QModel2088 2064 for row in new_rows: 2089 2065 self._model_model.appendRow(row) 2066 # Update the counter used for multishell display 2067 self._last_model_row = self._model_model.rowCount() 2090 2068 2091 2069 def fromStructureFactorToQModel(self, structure_factor): … … 2095 2073 if structure_factor is None or structure_factor=="None": 2096 2074 return 2097 2098 s_kernel = self.models[structure_factor]() 2099 p_kernel = self.kernel_module 2100 2101 if p_kernel is None: 2102 # Not a product model, just S(Q) 2103 self.kernel_module = s_kernel 2104 params = modelinfo.ParameterTable(self.kernel_module._model_info.parameters.kernel_parameters) 2105 new_rows = FittingUtilities.addSimpleParametersToModel(params, self.is2D) 2106 else: 2107 p_pars_len = len(p_kernel._model_info.parameters.kernel_parameters) 2108 s_pars_len = len(s_kernel._model_info.parameters.kernel_parameters) 2109 2110 self.kernel_module = MultiplicationModel(p_kernel, s_kernel) 2111 all_params = self.kernel_module._model_info.parameters.kernel_parameters 2112 all_param_names = [param.name for param in all_params] 2113 2114 # S(Q) params from the product model are not necessarily the same as those from the S(Q) model; any 2115 # conflicting names with P(Q) params will cause a rename; we also lose radius_effective (for now...) 2116 2117 # TODO: merge rest of beta approx implementation in 2118 # This is to ensure compatibility when we merge beta approx support in...! 2119 2120 # radius_effective is always s_params[0] 2121 2122 # if radius_effective_mode is in all_params, then all_params contains radius_effective and we want to 2123 # keep it in the model 2124 2125 # if radius_effective_mode is NOT in all_params, then radius_effective should NOT be kept, because the user 2126 # cannot specify it themselves; but, make sure we only remove it if it's actually there in the first place 2127 # (sasmodels master removes it already) 2128 if "radius_effective_mode" in all_param_names: 2129 # Show all parameters 2130 s_params = modelinfo.ParameterTable(all_params[p_pars_len:p_pars_len+s_pars_len]) 2131 s_params_orig = modelinfo.ParameterTable(s_kernel._model_info.parameters.kernel_parameters) 2132 else: 2133 # Ensure radius_effective is not displayed 2134 s_params_orig = modelinfo.ParameterTable(s_kernel._model_info.parameters.kernel_parameters[1:]) 2135 if "radius_effective" in all_param_names: 2136 s_params = modelinfo.ParameterTable(all_params[p_pars_len+1:p_pars_len+s_pars_len]) 2137 else: 2138 s_params = modelinfo.ParameterTable(all_params[p_pars_len:p_pars_len+s_pars_len-1]) 2139 2140 # Get new rows for QModel 2141 # Any renamed parameters are stored as data in the relevant item, for later handling 2142 new_rows = FittingUtilities.addSimpleParametersToModel(s_params, self.is2D, s_params_orig) 2143 2144 # TODO: merge rest of beta approx implementation in 2145 # These parameters are not part of P(Q) nor S(Q), but are added only to the product model (e.g. specifying 2146 # structure factor calculation mode) 2147 # product_params = all_params[p_pars_len+s_pars_len:] 2148 2149 # Add heading row 2150 FittingUtilities.addHeadingRowToModel(self._model_model, structure_factor) 2151 2152 # Update QModel 2075 structure_module = generate.load_kernel_module(structure_factor) 2076 structure_parameters = modelinfo.make_parameter_table(getattr(structure_module, 'parameters', [])) 2077 2078 structure_kernel = self.models[structure_factor]() 2079 form_kernel = self.kernel_module 2080 2081 self.kernel_module = MultiplicationModel(form_kernel, structure_kernel) 2082 2083 new_rows = FittingUtilities.addSimpleParametersToModel(structure_parameters, self.is2D) 2153 2084 for row in new_rows: 2154 2085 self._model_model.appendRow(row) 2155 2086 # disable fitting of parameters not listed in self.kernel_module (probably radius_effective) 2156 # if row[0].text() not in self.kernel_module.params.keys(): 2157 # row_num = self._model_model.rowCount() - 1 2158 # FittingUtilities.markParameterDisabled(self._model_model, row_num) 2087 if row[0].text() not in self.kernel_module.params.keys(): 2088 row_num = self._model_model.rowCount() - 1 2089 FittingUtilities.markParameterDisabled(self._model_model, row_num) 2090 2091 # Update the counter used for multishell display 2092 self._last_model_row = self._model_model.rowCount() 2159 2093 2160 2094 def haveParamsToFit(self): … … 2182 2116 model_row = item.row() 2183 2117 name_index = self._model_model.index(model_row, 0) 2184 name_item = self._model_model.itemFromIndex(name_index)2185 2118 2186 2119 # Extract changed value. … … 2191 2124 return 2192 2125 2193 # if the item has user data, this is the actual parameter name (e.g. to handle duplicate names) 2194 if name_item.data(QtCore.Qt.UserRole): 2195 parameter_name = str(name_item.data(QtCore.Qt.UserRole)) 2196 else: 2197 parameter_name = str(self._model_model.data(name_index)) 2126 parameter_name = str(self._model_model.data(name_index)) # sld, background etc. 2198 2127 2199 2128 # Update the parameter value - note: this supports +/-inf as well … … 2423 2352 new_plots.append(plot) 2424 2353 2354 # Update/generate plots 2425 2355 for plot in new_plots: 2426 2356 self.communicate.plotUpdateSignal.emit([plot]) … … 2622 2552 def updateFunctionCaption(row): 2623 2553 # Utility function for update of polydispersity function name in the main model 2624 if not self.isCheckable(row):2625 return2626 self._model_model.blockSignals(True)2627 2554 param_name = str(self._model_model.item(row, 0).text()) 2628 self._model_model.blockSignals(False)2629 2555 if param_name != param.name: 2630 2556 return 2631 2557 # Modify the param value 2632 self._model_model.blockSignals(True)2633 2558 if self.has_error_column: 2634 2559 # err column changes the indexing … … 2636 2561 else: 2637 2562 self._model_model.item(row, 0).child(0).child(0,4).setText(combo_string) 2638 self._model_model.blockSignals(False)2639 2563 2640 2564 if combo_string == 'array': … … 2796 2720 2797 2721 self.lstParams.setIndexWidget(shell_index, func) 2798 self._ n_shells_row = shell_row - 12722 self._last_model_row = self._model_model.rowCount() 2799 2723 2800 2724 # Set the index to the state-kept value … … 2807 2731 """ 2808 2732 # Find row location of the combobox 2809 first_row = self._n_shells_row + 12810 remove_rows = self._ num_shell_params2733 last_row = self._last_model_row 2734 remove_rows = self._model_model.rowCount() - last_row 2811 2735 2812 2736 if remove_rows > 1: 2813 self._model_model.removeRows(first_row, remove_rows) 2814 2815 new_rows = FittingUtilities.addShellsToModel(self.model_parameters, self._model_model, index, first_row) 2816 self._num_shell_params = len(new_rows) 2817 2737 self._model_model.removeRows(last_row, remove_rows) 2738 2739 FittingUtilities.addShellsToModel(self.model_parameters, self._model_model, index) 2818 2740 self.current_shell_displayed = index 2819 2741 -
src/sas/qtgui/Perspectives/Fitting/ModelThread.py
rdcabba7 r40975f8 101 101 elapsed = time.time() - self.starttime 102 102 103 res = dict(image = output, data = self.data, page_id = self.page_id,104 model = self.model, state = self.state,105 toggle_mode_on = self.toggle_mode_on, elapsed = elapsed,106 index = index_model, fid = self.fid,107 qmin = self.qmin, qmax = self.qmax,108 weight = self.weight, update_chisqr = self.update_chisqr,109 source = self.source)110 111 103 if LocalConfig.USING_TWISTED: 112 return res 113 else: 114 self.completefn(res) 104 return (output, 105 self.data, 106 self.page_id, 107 self.model, 108 self.state, 109 self.toggle_mode_on, 110 elapsed, 111 index_model, 112 self.fid, 113 self.qmin, 114 self.qmax, 115 self.weight, 116 self.update_chisqr, 117 self.source) 118 else: 119 self.completefn((output, 120 self.data, 121 self.page_id, 122 self.model, 123 self.state, 124 self.toggle_mode_on, 125 elapsed, 126 index_model, 127 self.fid, 128 self.qmin, 129 self.qmax, 130 self.weight, 131 #qstep=self.qstep, 132 self.update_chisqr, 133 self.source)) 134 115 135 116 136 class Calc1D(CalcThread): … … 229 249 elapsed = time.time() - self.starttime 230 250 231 res = dict(x = self.data.x[index], y = output[index],232 page_id = self.page_id, state = self.state, weight = self.weight,233 fid = self.fid, toggle_mode_on = self.toggle_mode_on,234 elapsed = elapsed, index = index, model = self.model,235 data = self.data, update_chisqr = self.update_chisqr,236 source = self.source, unsmeared_output = unsmeared_output,237 unsmeared_data = unsmeared_data, unsmeared_error = unsmeared_error,238 intermediate_results = results_eval)239 240 251 if LocalConfig.USING_TWISTED: 241 return res 242 else: 243 self.completefn(res) 252 return (self.data.x[index], output[index], 253 self.page_id, 254 self.state, 255 self.weight, 256 self.fid, 257 self.toggle_mode_on, 258 elapsed, index, self.model, 259 self.data, 260 self.update_chisqr, 261 self.source, 262 unsmeared_output, unsmeared_data, unsmeared_error, 263 results_eval) 264 else: 265 self.completefn((self.data.x[index], output[index], 266 self.page_id, 267 self.state, 268 self.weight, 269 self.fid, 270 self.toggle_mode_on, 271 elapsed, index, self.model, 272 self.data, 273 self.update_chisqr, 274 self.source, 275 unsmeared_output, unsmeared_data, unsmeared_error, 276 results_eval)) 244 277 245 278 def results(self): -
src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingWidgetTest.py
r3fbd77b r66d4370 256 256 self.widget.cbStructureFactor.setCurrentIndex(structure_index) 257 257 258 # We have 3 more param rows now (radius_effective is removed), and a new heading258 # We have 4 more rows now 259 259 self.assertEqual(self.widget._model_model.rowCount(), rowcount+4) 260 260 … … 276 276 last_index = self.widget.cbStructureFactor.count() 277 277 self.widget.cbStructureFactor.setCurrentIndex(last_index-1) 278 # Do we have all the rows (incl. radius_effective & heading row)?279 self.assertEqual(self.widget._model_model.rowCount(), 5)278 # Do we have all the rows? 279 self.assertEqual(self.widget._model_model.rowCount(), 4) 280 280 281 281 # Are the command buttons properly enabled? … … 509 509 Test opening of the load file dialog for 'array' polydisp. function 510 510 """ 511 512 # open a non-existent file513 511 filename = os.path.join("UnitTesting", "testdata_noexist.txt") 514 with self.assertRaises(OSError, msg="testdata_noexist.txt should be a non-existent file"):515 os.stat(filename)516 512 QtWidgets.QFileDialog.getOpenFileName = MagicMock(return_value=(filename,'')) 517 513 self.widget.show() … … 529 525 530 526 # good file 531 # TODO: this depends on the working directory being src/sas/qtgui,532 # TODO: which isn't convenient if you want to run this test suite533 # TODO: individually534 527 filename = os.path.join("UnitTesting", "testdata.txt") 535 try:536 os.stat(filename)537 except OSError:538 self.assertTrue(False, "testdata.txt does not exist")539 528 QtWidgets.QFileDialog.getOpenFileName = MagicMock(return_value=(filename,'')) 540 529 … … 602 591 603 592 # Assure we have the combobox available 604 cbox_row = self.widget._n_shells_row605 func_index = self.widget._model_model.index( cbox_row, 1)593 last_row = self.widget._last_model_row 594 func_index = self.widget._model_model.index(last_row-1, 1) 606 595 self.assertIsInstance(self.widget.lstParams.indexWidget(func_index), QtWidgets.QComboBox) 607 608 # get number of rows before changing shell count609 last_row = self.widget._model_model.rowCount()610 596 611 597 # Change the combo box index … … 1041 1027 1042 1028 # Check the model 1043 self.assertEqual(self.widget._model_model.rowCount(), 7)1029 self.assertEqual(self.widget._model_model.rowCount(), 6) 1044 1030 self.assertEqual(self.widget._model_model.columnCount(), 5) 1045 1031 … … 1157 1143 # two rows selected 1158 1144 index1 = self.widget.lstParams.model().index(1, 0, QtCore.QModelIndex()) 1159 index2 = self.widget.lstParams.model().index( 3, 0, QtCore.QModelIndex())1145 index2 = self.widget.lstParams.model().index(2, 0, QtCore.QModelIndex()) 1160 1146 selection_model = self.widget.lstParams.selectionModel() 1161 1147 selection_model.select(index1, selection_model.Select | selection_model.Rows) … … 1193 1179 # several random parameters 1194 1180 self.assertEqual(self.widget.getRowFromName('scale'), 0) 1195 self.assertEqual(self.widget.getRowFromName('length'), 6)1181 self.assertEqual(self.widget.getRowFromName('length'), 5) 1196 1182 1197 1183 def testGetParamNames(self): … … 1230 1216 # Create a constraint object 1231 1217 const = Constraint(parent=None, value=7.0) 1232 row = 31218 row = 2 1233 1219 1234 1220 spy = QtSignalSpy(self.widget, self.widget.constraintAddedSignal) … … 1249 1235 # assign complex constraint now 1250 1236 const = Constraint(parent=None, param='radius', func='5*sld') 1251 row = 51237 row = 4 1252 1238 # call the method tested 1253 1239 self.widget.addConstraintToRow(constraint=const, row=row) … … 1308 1294 self.widget.cbModel.setCurrentIndex(model_index) 1309 1295 1296 # select two rows 1310 1297 row1 = 1 1311 row2 = 5 1312 1313 param1 = "background" 1314 param2 = "radius" 1315 1316 #default_value1 = "0.001" 1317 default_value2 = "20" 1318 1319 # select two rows 1298 row2 = 4 1320 1299 index1 = self.widget.lstParams.model().index(row1, 0, QtCore.QModelIndex()) 1321 1300 index2 = self.widget.lstParams.model().index(row2, 0, QtCore.QModelIndex()) … … 1334 1313 1335 1314 # delete one of the constraints 1336 self.widget.deleteConstraintOnParameter(param= param1)1315 self.widget.deleteConstraintOnParameter(param='background') 1337 1316 1338 1317 # see that the other constraint is still present 1339 cons = self.widget.getConstraintForRow( row2)1340 self.assertEqual(cons.param, param2)1341 self.assertEqual(cons.value, default_value2)1318 cons = self.widget.getConstraintForRow(4) # 4 = radius 1319 self.assertEqual(cons.param, "radius") 1320 self.assertEqual(cons.value, "20") 1342 1321 1343 1322 # kill the other constraint … … 1345 1324 1346 1325 # see that the other constraint is still present 1347 self.assertEqual(self.widget.getConstraintsForModel(), [( param2, None)])1326 self.assertEqual(self.widget.getConstraintsForModel(), [('radius', None)]) 1348 1327 1349 1328 def testGetConstraintForRow(self): … … 1365 1344 self.widget.cbModel.setCurrentIndex(model_index) 1366 1345 1346 # select two rows 1367 1347 row1 = 1 1368 row2 = 5 1369 1370 # select two rows 1348 row2 = 4 1371 1349 index1 = self.widget.lstParams.model().index(row1, 0, QtCore.QModelIndex()) 1372 1350 index2 = self.widget.lstParams.model().index(row2, 0, QtCore.QModelIndex()) … … 1378 1356 self.widget.addSimpleConstraint() 1379 1357 1380 con_list = [False, True, False, False, False,True, False]1358 con_list = [False, True, False, False, True, False] 1381 1359 new_list = [] 1382 1360 for row in range(self.widget._model_model.rowCount()): … … 1396 1374 self.widget.cbModel.setCurrentIndex(model_index) 1397 1375 1376 # select two rows 1398 1377 row1 = 1 1399 row2 = 5 1400 1401 # select two rows 1378 row2 = 4 1402 1379 index1 = self.widget.lstParams.model().index(row1, 0, QtCore.QModelIndex()) 1403 1380 index2 = self.widget.lstParams.model().index(row2, 0, QtCore.QModelIndex()) … … 1413 1390 constraint_objects[0].active = False 1414 1391 1415 con_list = [False, False, False, False, False,True, False]1392 con_list = [False, False, False, False, True, False] 1416 1393 new_list = [] 1417 1394 for row in range(self.widget._model_model.rowCount()): … … 1434 1411 self.assertEqual(self.widget.getConstraintsForModel(),[]) 1435 1412 1413 # select two rows 1436 1414 row1 = 1 1437 row2 = 5 1438 1439 param1 = "background" 1440 param2 = "radius" 1441 1442 default_value1 = "0.001" 1443 default_value2 = "20" 1444 1445 # select two rows 1415 row2 = 4 1446 1416 index1 = self.widget.lstParams.model().index(row1, 0, QtCore.QModelIndex()) 1447 1417 index2 = self.widget.lstParams.model().index(row2, 0, QtCore.QModelIndex()) … … 1455 1425 # simple constraints 1456 1426 # self.assertEqual(self.widget.getConstraintsForModel(), [('background', '0.001'), ('radius', '20')]) 1457 cons = self.widget.getConstraintForRow( row1)1458 self.assertEqual(cons.param, param1)1459 self.assertEqual(cons.value, default_value1)1460 cons = self.widget.getConstraintForRow( row2)1461 self.assertEqual(cons.param, param2)1462 self.assertEqual(cons.value, default_value2)1427 cons = self.widget.getConstraintForRow(1) # 1 - background 1428 self.assertEqual(cons.param, "background") 1429 self.assertEqual(cons.value, "0.001") 1430 cons = self.widget.getConstraintForRow(4) # 4 = radius 1431 self.assertEqual(cons.param, "radius") 1432 self.assertEqual(cons.value, "20") 1463 1433 1464 1434 objects = self.widget.getConstraintObjectsForModel() 1465 1435 self.assertEqual(len(objects), 2) 1466 self.assertEqual(objects[1].value, default_value2) 1467 self.assertEqual(objects[0].param, param1) 1468 1436 self.assertEqual(objects[1].value, '20') 1437 self.assertEqual(objects[0].param, 'background') 1438 1439 # add complex constraint 1440 const = Constraint(parent=None, param='scale', func='5*sld') 1469 1441 row = 0 1470 param = "scale"1471 func = "5*sld"1472 1473 # add complex constraint1474 const = Constraint(parent=None, param=param, func=func)1475 1442 self.widget.addConstraintToRow(constraint=const, row=row) 1476 1443 #self.assertEqual(self.widget.getConstraintsForModel(),[('scale', '5*sld'), ('background', '0.001'), ('radius', None)]) 1477 cons = self.widget.getConstraintForRow( row2)1478 self.assertEqual(cons.param, param2)1479 self.assertEqual(cons.value, default_value2)1444 cons = self.widget.getConstraintForRow(4) # 4 = radius 1445 self.assertEqual(cons.param, "radius") 1446 self.assertEqual(cons.value, "20") 1480 1447 1481 1448 objects = self.widget.getConstraintObjectsForModel() 1482 1449 self.assertEqual(len(objects), 3) 1483 self.assertEqual(objects[0].func, func)1450 self.assertEqual(objects[0].func, '5*sld') 1484 1451 1485 1452 def testReplaceConstraintName(self):
Note: See TracChangeset
for help on using the changeset viewer.
