Changeset df4af9b in sasview

Timestamp:

Nov 1, 2017 2:43:39 AM (6 years ago)

Author:

gonzalezm

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:

1c206d9

Message:

Removing files corresponding to ticket #1007 from this PR

Location:

src/sas/sasgui/perspectives/fitting

Files:

• basepage.py (modified) (1 diff)
• fitpage.py (modified) (2 diffs)

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

@@ -3415 +3415 @@
                         if item[2].__class__.__name__ == "ComboBox":
                             if value[0] in self.model.fun_list:
-                                self.model.setParam(name, 0)
+                                fun_val = self.model.fun_list[value[0]]
+                                self.model.setParam(name, fun_val)
                                 # save state
                         try:

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

@@ -1733 +1733 @@
         ind = 0
         while(ind < len(list)):
-            fun_box.Append(list[ind])        
+            for key, val in list.items():
+                if val == ind:
+                    fun_box.Append(key, val)
+                    break
             ind += 1
 
@@ -1762 +1765 @@
         value = fun_box.GetValue()
         if value in self.model.fun_list:
-            fun_val = fun_box.GetSelection()
+            fun_val = self.model.fun_list[value]
 
         self.model.setParam(name, fun_val)