Changeset 9d8d52c in sasview

Timestamp:

Jan 30, 2018 6:54:09 AM (6 years ago)

Author:

krzywon

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:

72670ad2

Parents:

b6f9c9f

Message:

Use distribution name to check for array distribution instead of index.

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__)
+                index = POLYDISPERSITY_MODELS.values().index(disp_func.__class__)
+                return index, POLYDISPERSITY_MODELS.keys()[index]
             except ValueError:
                 pass  # Fall through to default class
-        return POLYDISPERSITY_MODELS.keys().index('gaussian')
+        return POLYDISPERSITY_MODELS.keys().index('gaussian'), 'gaussian'
 
     def on_reset_clicked(self, event):