Changeset cb4ef58 in sasview for src/sas/sasgui/perspectives/fitting/basepage.py
- Timestamp:
- Apr 13, 2016 9:23:07 AM (8 years ago)
- Branches:
- master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
- Children:
- 16b769b
- Parents:
- fa4ea80
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/sasgui/perspectives/fitting/basepage.py
r08959b8 rcb4ef58 1896 1896 for model in self.model_list_box[mod_cat]: 1897 1897 if 'sasmodels.sasview_model.' in str(model): 1898 str_m = model. _model_info['id']1898 str_m = model.id 1899 1899 else: 1900 1900 str_m = str(model).split(".")[0] … … 1945 1945 mlist = [] 1946 1946 for models in list: 1947 model = models() 1948 name = model.__class__.__name__ 1949 if models.__name__ != "NoStructure": 1950 name = model.name 1951 mlist.append((name, models)) 1947 if models.name != "NoStructure": 1948 mlist.append((models.name, models)) 1952 1949 1953 1950 # Sort the models … … 2099 2096 if form_factor != None: 2100 2097 # set multifactor for Mutifunctional models 2101 if form_factor().__class__ in \ 2102 self.model_list_box["Multi-Functions"]: 2098 if form_factor.is_multiplicity_model: 2103 2099 m_id = self.multifactorbox.GetCurrentSelection() 2104 multiplicity = form_factor ().multiplicity_info[0]2100 multiplicity = form_factor.multiplicity_info[0] 2105 2101 self.multifactorbox.Clear() 2106 2102 self._set_multfactor_combobox(multiplicity) 2107 2103 self._show_multfactor_combobox() 2108 2104 #ToDo: this info should be called directly from the model 2109 text = form_factor ().multiplicity_info[1] # 'No. of Shells: '2105 text = form_factor.multiplicity_info[1] # 'No. of Shells: ' 2110 2106 2111 2107 self.mutifactor_text.SetLabel(text) … … 2117 2113 if self.multi_factor == None: 2118 2114 self.multi_factor = 0 2119 form_factor = form_factor(int(self.multi_factor))2120 2115 self.multifactorbox.SetSelection(m_id) 2121 2116 # Check len of the text1 and max_multiplicity … … 2131 2126 else: 2132 2127 self.sld_axes = "" 2133 2134 2128 else: 2135 2129 self._hide_multfactor_combobox() 2136 2130 self.show_sld_button.Hide() 2137 form_factor = form_factor()2138 2131 self.multi_factor = None 2139 2132 else: … … 2147 2140 if struct_factor != None: 2148 2141 from sas.sascalc.fit.MultiplicationModel import MultiplicationModel 2149 self.model = MultiplicationModel(form_factor, struct_factor()) 2142 self.model = MultiplicationModel(form_factor(self.multi_factor), 2143 struct_factor()) 2150 2144 # multifunctional form factor 2151 2145 if len(form_factor.non_fittable) > 0: 2152 2146 self.temp_multi_functional = True 2147 elif form_factor != None: 2148 self.model = form_factor(self.multi_factor) 2153 2149 else: 2154 if form_factor != None: 2155 self.model = form_factor 2156 else: 2157 self.model = None 2158 return self.model 2150 self.model = None 2151 return 2152 2159 2153 # check if model has magnetic parameters 2160 2154 if len(self.model.magnetic_params) > 0: … … 2286 2280 parameter's error of fit, 2287 2281 parameter's minimum value, 2288 par rameter's maximum value ,2282 parameter's maximum value , 2289 2283 parameter's units] 2290 2284 """
Note: See TracChangeset
for help on using the changeset viewer.