Changeset 2ab812d in sasview for src/sas/sasgui/perspectives/fitting

Timestamp:

Apr 9, 2017 3:41:56 AM (7 years ago)

Author:

GitHub <noreply@…>

Parents:

527a190 (diff), ed28d8c (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:

Adam Washington <rprospero@…> (04/09/17 03:41:56)

git-committer:

GitHub <noreply@…> (04/09/17 03:41:56)

Message:

Merge ed28d8c9231b1ae5a84bb9caaf5d8794509e6500 into 527a1907e8dcf230cf6e6cdc74ed054c69493d0a

Location:

src/sas/sasgui/perspectives/fitting

Files:

• fitpage.py (modified) (1 diff)
• models.py (modified) (1 diff)

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

@@ -1239 +1239 @@
             mod_cat = self.categorybox.GetStringSelection()
             if mod_cat == custom_model:
+                temp_id = self.model.id
                 temp = self.parent.update_model_list()
+                for v in self.parent.model_dictionary.values():
+                    if v.id == temp_id:
+                        self.model = v()
                 if temp:
                     self.model_list_box = temp

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

@@ -319 +319 @@
         """
         new_plugins = self.findModels()
-        if len(new_plugins) > 0:
-            for name, plug in  new_plugins.iteritems():
-                if name not in self.stored_plugins.keys():
-                    self.stored_plugins[name] = plug
-                    self.plugins.append(plug)
-                    self.model_dictionary[name] = plug
+        if new_plugins:
+            for name, plug in  new_plugins.items():
+                self.stored_plugins[name] = plug
+                self.plugins.append(plug)
+                self.model_dictionary[name] = plug
             self.model_combobox.set_list("Plugin Models", self.plugins)
             return self.model_combobox.get_list()