- Timestamp:
- Dec 1, 2017 5:31:05 AM (7 years ago)
- Branches:
- master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
- Children:
- b6b81a3
- Parents:
- bfeb823
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/sasgui/perspectives/fitting/basepage.py
ree6ab94 reee94bf 1643 1643 if item_page[2].__class__.__name__ == "ComboBox": 1644 1644 if item_page_info[2] in self.model.fun_list: 1645 # to fix: fun_list is not a dictionary, but a tuple1646 # so the following line (commented) will fail1647 # fun_val = self.model.fun_list[item_page_info[2]]1648 # I guess the following should work, but1649 # could not test as I don't know when this1650 # part is used by SasView.1651 1645 fun_val = self.model.fun_list.index(item_page_info[2]) 1652 1646 self.model.setParam(item_page_info[1], fun_val) … … 1693 1687 selection = value 1694 1688 if value in self.model.fun_list: 1695 # to fix: fun_list is not a dictionary, so1696 # I commented the following original line1697 #selection = self.model.fun_list[value]1698 # and replaced by this.1699 # I think this should work, but could not test it.1700 1689 selection = self.model.fun_list.index(value) 1701 1690 item_page[2].SetValue(selection) … … 3376 3365 if item[2].__class__.__name__ == "ComboBox": 3377 3366 if content[name][1] in self.model.fun_list: 3378 # to fix: fun_list is not a dictionary, but a tuple3379 # so the following line (commented) will fail3380 # fun_val = self.model.fun_list[content[name][1]]3381 # I guess the following should work, but3382 # could not test as I don't know when this3383 # part is used by SasView.3384 3367 fun_val = self.model.fun_list.index(content[name][1]) 3385 3368 self.model.setParam(name, fun_val) … … 3432 3415 if item[2].__class__.__name__ == "ComboBox": 3433 3416 if value[0] in self.model.fun_list: 3434 # Fixed: fun_list not a dictionary!3435 # Arrives here when spherical_sld model is3436 # selected and number of shells modified.3437 3417 fun_val = self.model.fun_list.index(value[0]) 3438 3418 self.model.setParam(name, fun_val)
Note: See TracChangeset
for help on using the changeset viewer.