Changeset ce0a245 in sasview for src/sas/sasgui/perspectives/fitting/fitpage.py

Timestamp:

Sep 20, 2017 12:13:53 PM (7 years ago)

Author:

GitHub <noreply@…>

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.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

d76c43a, fca1f50

Parents:

2a399ca (diff), 13374be (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 Kienzle <pkienzle@…> (09/20/17 12:13:53)

git-committer:

GitHub <noreply@…> (09/20/17 12:13:53)

Message:

Merge pull request #94 from SasView?/4_1_issues

4.1.1 updates

File:

• src/sas/sasgui/perspectives/fitting/fitpage.py (modified) (1 diff)

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

@@ -1243 +1243 @@
             wx.PostEvent(self.parent, new_event)
             # update list of plugins if new plugin is available
-            custom_model = CUSTOM_MODEL
             mod_cat = self.categorybox.GetStringSelection()
-            if mod_cat == custom_model:
+            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()
+                        break
                 if temp:
                     self.model_list_box = temp