Changeset 1bcc48d in sasview for src/sas/sasgui

Timestamp:

Apr 8, 2017 9:14:48 AM (8 years ago)

Author:

Adam Washington <adam.washington@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

132f3d6

Parents:

dab94f6

git-author:

Adam Washington <adam.washington@…> (04/08/17 09:08:10)

git-committer:

Adam Washington <adam.washington@…> (04/08/17 09:14:48)

Message:

Work around namespace bug

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:
+                ################This is where the model dies###############
+                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

@@ -321 +321 @@
         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
+                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()