Changes in / [7303357:19b5c886] in sasview

Location:

src/sas

Files:

• sascalc/fit/MultiplicationModel.py (modified) (3 diffs)
• sasgui/perspectives/fitting/basepage.py (modified) (4 diffs)
• sasgui/perspectives/fitting/fitpage.py (modified) (2 diffs)

src/sas/sascalc/fit/MultiplicationModel.py

@@ -68 +68 @@
         try:
             multiplicity = p_model.multiplicity
-        except AttributeError:
+        except:
             multiplicity = 1
         ## functional multiplicity of the model
@@ -76 +76 @@
         self.non_fittable = p_model.non_fittable
         self.multiplicity_info = []
-        self.fun_list = []
+        self.fun_list = {}
         if self.non_fittable > 1:
             try:
@@ -82 +82 @@
                 self.fun_list = p_model.fun_list
                 self.is_multiplicity_model = True
-            except AttributeError:
+            except:
                 pass
         else:

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.index(item_page_info[2])
+                                fun_val = self.model.fun_list[item_page_info[2]]
                                 self.model.setParam(item_page_info[1], fun_val)
                     if item_page[3] is not None:
@@ -1687 +1687 @@
                 selection = value
                 if value in self.model.fun_list:
-                    selection = self.model.fun_list.index(value)
+                    selection = self.model.fun_list[value]
                 item_page[2].SetValue(selection)
                 self.model.setParam(param_name, selection)
@@ -3365 +3365 @@
                     if item[2].__class__.__name__ == "ComboBox":
                         if content[name][1] in self.model.fun_list:
-                            fun_val = self.model.fun_list.index(content[name][1])
+                            fun_val = self.model.fun_list[content[name][1]]
                             self.model.setParam(name, fun_val)
                     try:
@@ -3415 +3415 @@
                         if item[2].__class__.__name__ == "ComboBox":
                             if value[0] in self.model.fun_list:
-                                fun_val = self.model.fun_list.index(value[0])
+                                fun_val = self.model.fun_list[value[0]]
                                 self.model.setParam(name, fun_val)
                                 # save state

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

@@ -1726 +1726 @@
                 and not self.temp_multi_functional:
             return None
-        for index, choice in enumerate(self.model.fun_list):
-            fun_box.Append(choice, index)
+        # 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
 
     def _on_select_accuracy(self, event):
@@ -1755 +1765 @@
         value = fun_box.GetValue()
         if value in self.model.fun_list:
-            fun_val = self.model.fun_list.index(value)
+            fun_val = self.model.fun_list[value]
 
         self.model.setParam(name, fun_val)