Changeset ee6ab94 in sasview for src/sas

Timestamp:

Nov 30, 2017 8:31:20 AM (7 years ago)

Author:

Gonzalez, Miguel <gonzalez@…>

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:

c66a0bb

Parents:

0be6b6b

Message:

Fixing ticket1007 and hopefully other similar sources of error

File:

• src/sas/sasgui/perspectives/fitting/basepage.py (modified) (4 diffs)

src/sas/sasgui/perspectives/fitting/basepage.py

@@ -1643 +1643 @@
                         if item_page[2].__class__.__name__ == "ComboBox":
                             if item_page_info[2] in self.model.fun_list:
-                                fun_val = self.model.fun_list[item_page_info[2]]
+                                # to fix: fun_list is not a dictionary, but a tuple
+                                # so the following line (commented) will fail
+                                # fun_val = self.model.fun_list[item_page_info[2]]
+                                # I guess the following should work, but 
+                                # could not test as I don't know when this
+                                # part is used by SasView.
+                                fun_val = self.model.fun_list.index(item_page_info[2])
                                 self.model.setParam(item_page_info[1], fun_val)
                     if item_page[3] is not None:
@@ -1687 +1693 @@
                 selection = value
                 if value in self.model.fun_list:
-                    selection = self.model.fun_list[value]
+                    # to fix: fun_list is not a dictionary, so 
+                    # I commented the following original line 
+                    #selection = self.model.fun_list[value]
+                    # and replaced by this.
+                    # I think this should work, but could not test it.
+                    selection = self.model.fun_list.index(value)
                 item_page[2].SetValue(selection)
                 self.model.setParam(param_name, selection)
@@ -3365 +3376 @@
                     if item[2].__class__.__name__ == "ComboBox":
                         if content[name][1] in self.model.fun_list:
-                            fun_val = self.model.fun_list[content[name][1]]
+                            # to fix: fun_list is not a dictionary, but a tuple
+                            # so the following line (commented) will fail
+                            # fun_val = self.model.fun_list[content[name][1]]
+                            # I guess the following should work, but 
+                            # could not test as I don't know when this
+                            # part is used by SasView.
+                            fun_val = self.model.fun_list.index(content[name][1])
                             self.model.setParam(name, fun_val)
                     try:
@@ -3415 +3432 @@
                         if item[2].__class__.__name__ == "ComboBox":
                             if value[0] in self.model.fun_list:
-                                self.model.setParam(name, 0)
+                                # Fixed: fun_list not a dictionary!
+                                # Arrives here when spherical_sld model is
+                                # selected and number of shells modified.
+                                fun_val = self.model.fun_list.index(value[0])
+                                self.model.setParam(name, fun_val)
                                 # save state
                         try: