Changeset c9677c9 in sasview for src/sas/sasgui/perspectives/fitting/basepage.py
- Timestamp:
- Dec 1, 2016 2:09:36 PM (7 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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
- Children:
- 6fb6592
- Parents:
- 0b1d7d3 (diff), e42c8e9d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/sasgui/perspectives/fitting/basepage.py
rc8e1996 r0b1d7d3 1106 1106 """ 1107 1107 for key, value in self.master_category_dict.iteritems(): 1108 formfactor = state.formfactorcombobox.split(":") 1109 if isinstance(formfactor, list): 1110 formfactor = formfactor[0] 1108 1111 for list_item in value: 1109 if state.formfactorcomboboxin list_item:1112 if formfactor in list_item: 1110 1113 return self.categorybox.Items.index(key) 1111 1114 return 0 … … 1157 1160 category_pos = int(state.categorycombobox) 1158 1161 except: 1159 state.formfactorcombobox = state.formfactorcombobox.lower() 1160 state.formfactorcombobox = \ 1161 state.formfactorcombobox.replace('model', '') 1162 state.formfactorcombobox = unicode(state.formfactorcombobox) 1162 if state.formfactorcombobox is not None \ 1163 and not state._is_sasmodels(): 1164 state._convert_to_sasmodels() 1163 1165 state.categorycombobox = unicode(state.categorycombobox) 1164 1166 if state.categorycombobox in self.categorybox.Items: … … 1175 1177 formfactor_pos = int(state.formfactorcombobox) 1176 1178 except: 1179 if self.categorybox.GetValue() == 'Customized Models' \ 1180 and '[plug-in]' not in state.formfactorcombobox: 1181 state.formfactorcombobox = \ 1182 '[plug-in] ' + state.formfactorcombobox 1177 1183 formfactor_pos = 0 1178 1184 for ind_form in range(self.formfactorbox.GetCount()): … … 1528 1534 index_data = ((self.qmin_x <= self.data.x) & 1529 1535 (self.data.x <= self.qmax_x)) 1530 val = str(len( self.data.x[index_data is True]))1536 val = str(len([index_data is True])) 1531 1537 self.Npts_fit.SetValue(val) 1532 1538 else: … … 1574 1580 if len(statelist) == 0 or len(listtorestore) == 0: 1575 1581 return 1576 if len(statelist) != len(listtorestore):1577 return1578 1582 1579 1583 for j in range(len(listtorestore)): 1580 item_page = listtorestore[j] 1581 item_page_info = statelist[j] 1582 # change the state of the check box for simple parameters 1583 if item_page[0] is not None: 1584 item_page[0].SetValue(item_page_info[0]) 1585 if item_page[2] is not None: 1586 item_page[2].SetValue(item_page_info[2]) 1587 if item_page[2].__class__.__name__ == "ComboBox": 1588 if item_page_info[2] in self.model.fun_list: 1589 fun_val = self.model.fun_list[item_page_info[2]] 1590 self.model.setParam(item_page_info[1], fun_val) 1591 if item_page[3] is not None: 1592 # show or hide text +/- 1593 if item_page_info[2]: 1594 item_page[3].Show(True) 1595 else: 1596 item_page[3].Hide() 1597 if item_page[4] is not None: 1598 # show of hide the text crtl for fitting error 1599 if item_page_info[4][0]: 1600 item_page[4].Show(True) 1601 item_page[4].SetValue(item_page_info[4][1]) 1602 else: 1603 item_page[3].Hide() 1604 if item_page[5] is not None: 1605 # show of hide the text crtl for fitting error 1606 item_page[5].Show(item_page_info[5][0]) 1607 item_page[5].SetValue(item_page_info[5][1]) 1608 1609 if item_page[6] is not None: 1610 # show of hide the text crtl for fitting error 1611 item_page[6].Show(item_page_info[6][0]) 1612 item_page[6].SetValue(item_page_info[6][1]) 1584 for param in statelist: 1585 if param[1] == listtorestore[j][1]: 1586 item_page = listtorestore[j] 1587 item_page_info = param 1588 if (item_page_info[1] == "theta" or item_page_info[1] == 1589 "phi") and not self._is_2D(): 1590 break 1591 # change the state of the check box for simple parameters 1592 if item_page[0] is not None: 1593 item_page[0].SetValue(item_page_info[0]) 1594 if item_page[2] is not None: 1595 # TODO: On loading save state, should try to coerce 1596 # TODO: length and scale params to positive values 1597 item_page[2].SetValue(item_page_info[2]) 1598 if item_page[2].__class__.__name__ == "ComboBox": 1599 if item_page_info[2] in self.model.fun_list: 1600 fun_val = self.model.fun_list[item_page_info[2]] 1601 self.model.setParam(item_page_info[1], fun_val) 1602 if item_page[3] is not None: 1603 # show or hide text +/- 1604 if item_page_info[2]: 1605 item_page[3].Show(True) 1606 else: 1607 item_page[3].Hide() 1608 if item_page[4] is not None: 1609 # show of hide the text crtl for fitting error 1610 if item_page_info[4][0]: 1611 item_page[4].Show(True) 1612 item_page[4].SetValue(item_page_info[4][1]) 1613 else: 1614 item_page[3].Hide() 1615 if item_page[5] is not None: 1616 # show of hide the text crtl for fitting error 1617 item_page[5].Show(item_page_info[5][0]) 1618 item_page[5].SetValue(item_page_info[5][1]) 1619 1620 if item_page[6] is not None: 1621 # show of hide the text crtl for fitting error 1622 item_page[6].Show(item_page_info[6][0]) 1623 item_page[6].SetValue(item_page_info[6][1]) 1624 1625 break 1613 1626 1614 1627 def _reset_strparam_state(self, listtorestore, statelist):
Note: See TracChangeset
for help on using the changeset viewer.