Changeset 6f4a7c17 in sasview

Timestamp:

Feb 4, 2018 9:37:38 PM (7 years ago)

Author:

GitHub <noreply@…>

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:

baa3348

Parents:

b6f9c9f (diff), 1f4d708 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Paul Butler <butlerpd@…> (02/04/18 21:37:38)

git-committer:

GitHub <noreply@…> (02/04/18 21:37:38)

Message:

Merge pull request #141 from SasView?/boltzmann

Fix loading of projects with the Uniform distribution

This now seems to work even with the boltzman branch of sasmodels and Paul K approved merge already. There are some bad GUI issues however when using polydisersity/orientational distributions but those need to be addressed in a separate ticket so merging this to master

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):