Changes in src/sas/sasgui/perspectives/fitting/basepage.py [58a8f76:1f4d708] in sasview

File:

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

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

@@ -1367 +1367 @@
             except Exception:
                 logger.error(traceback.format_exc())
-            selection = self._find_polyfunc_selection(disp_model)
+            index, selection = self._find_polyfunc_selection(disp_model)
             for list in self.fittable_param:
                 if list[1] == key and list[7] is not None:
-                    list[7].SetSelection(selection)
+                    list[7].SetSelection(index)
                     # For the array disp_model, set the values and weights
-                    if selection == 1:
+                    if selection == 'array':
                         disp_model.set_weights(self.values[key],
                                                self.weights[key])
@@ -1385 +1385 @@
                             logger.error(traceback.format_exc())
             # For array, disable all fixed params
-            if selection == 1:
+            if selection == 'array':
                 for item in self.fixed_param:
                     if item[1].split(".")[0] == key.split(".")[0]:
@@ -2668 +2668 @@
     def _find_polyfunc_selection(self, disp_func=None):
         """
-        FInd Comboox selection from disp_func
+        Find Combobox selection from disp_func
 
         :param disp_function: dispersion distr. function
@@ -2675 +2675 @@
         if disp_func is not None:
             try:
-                return POLYDISPERSITY_MODELS.values().index(disp_func.__class__)
+                return (list(POLYDISPERSITY_MODELS).index(disp_func.type),
+                       disp_func.type)
             except ValueError:
                 pass  # Fall through to default class
-        return POLYDISPERSITY_MODELS.keys().index('gaussian')
+        return (list(POLYDISPERSITY_MODELS).index('gaussian'), 'gaussian')
 
     def on_reset_clicked(self, event):