Changeset bfeb823 in sasview for src/sas/sasgui/perspectives/fitting

Timestamp:

Nov 30, 2017 11:18:07 AM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

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:

eee94bf

Parents:

0a9cbc3

Message:

fix gui to work with spherical_sld

File:

• src/sas/sasgui/perspectives/fitting/fitpage.py (modified) (2 diffs)

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

@@ -1726 +1726 @@
                 and not self.temp_multi_functional:
             return None
-        # Get the func name list
-        list = self.model.fun_list
-        if len(list) == 0:
-            return None
-        # build function (combo)box
-        ind = 0
-        while(ind < len(list)):
-            for key, val in list.items():
-                if val == ind:
-                    fun_box.Append(key, val)
-                    break
-            ind += 1
+        for index, choice in enumerate(self.model.fun_list):
+            fun_box.Append(choice, index)
 
     def _on_select_accuracy(self, event):
@@ -1765 +1755 @@
         value = fun_box.GetValue()
         if value in self.model.fun_list:
-            fun_val = self.model.fun_list[value]
+            fun_val = self.model.fun_list.index(value)
 
         self.model.setParam(name, fun_val)