Changes in / [db24ec1:9849f8a] in sasview

Location:

src/sas/sasgui/perspectives/fitting

Files:

• fitpage.py (modified) (2 diffs)
• fitting.py (modified) (2 diffs)

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

@@ -3 +3 @@
     fitting  a model and one data
 """
-from __future__ import print_function
-
 import sys
 import wx
@@ -1257 +1255 @@
         if saved_pars:
             self.get_paste_params(saved_pars)
-
-        # Make sure the model parameters correspond to the fit parameters
-        self._update_paramv_on_fit()
 
         if event is not None:

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

@@ -339 +339 @@
         Update custom model list in the fitpage combo box
         """
+        custom_model = 'Plugin Models'
         try:
             # Update edit menus
@@ -346 +347 @@
             if not new_pmodel_list:
                 return
-
-            # Redraws to a page not in focus are showing up as if they are
-            # in the current page tab.
-            current_page_index = self.fit_panel.GetSelection()
-            current_page = self.fit_panel.GetCurrentPage()
-            last_drawn_page = current_page
-
-            # Set the new plugin model list for all fit pages; anticipating
-            # categories, the updated plugin may be in either the form factor
-            # or the structure factor combo boxes
+            # Set the new plugin model list for all fit pages
             for uid, page in self.fit_panel.opened_pages.iteritems():
-                pbox = getattr(page, "formfactorbox", None)
-                sbox = getattr(page, "structurebox", None)
-                if pbox is None:
-                    continue
-
-                # Set the new model list for the page
-                page.model_list_box = new_pmodel_list
-
-                # Grab names of the P and S models from the page.  Need to do
-                # this before resetting the form factor box since that clears
-                # the structure factor box.
-                old_struct = old_form = None
-                form_name = pbox.GetValue()
-                struct_name = sbox.GetStringSelection()
-                if form_name:
-                    old_form = pbox.GetClientData(pbox.GetCurrentSelection())
-                if struct_name:
-                    old_struct = sbox.GetClientData(sbox.GetCurrentSelection())
-
-                # Reset form factor combo box.  We are doing this for all
-                # categories not just plugins since eventually the category
-                # manager will allow plugin models to be anywhere.
-                page._show_combox_helper()
-                form_index = pbox.FindString(form_name)
-                pbox.SetSelection(form_index)
-                new_form = (pbox.GetClientData(form_index)
-                            if form_index != wx.NOT_FOUND else None)
-                #print("form: %r"%form_name, old_form, new_form)
-
-                # Reset structure factor combo box; even if the model list
-                # hasn't changed, the model may have.  Show the structure
-                # factor combobox if the selected model is a form factor.
-                sbox.Clear()
-                page.initialize_combox()
-                if new_form is not None and getattr(new_form, 'is_form_factor', False):
-                    sbox.Show()
-                    sbox.Enable()
-                    page.text2.Show()
-                    page.text2.Enable()
-                struct_index = sbox.FindString(struct_name)
-                sbox.SetSelection(struct_index)
-                new_struct = (sbox.GetClientData(struct_index)
-                              if struct_index != wx.NOT_FOUND else None)
-                #print("struct: %r"%struct_name, old_struct, new_struct)
-
-                # Update the page if P or S has changed
-                if old_form != new_form or old_struct != new_struct:
-                    #print("triggering model update")
-                    page._on_select_model(keep_pars=True)
-                    last_drawn_page = page
-
-            # If last drawn is not the current, then switch the current to the
-            # last drawn then switch back.  Very ugly.
-            if last_drawn_page != current_page:
-                for page_index in range(self.fit_panel.PageCount):
-                    if self.fit_panel.GetPage(page_index) == last_drawn_page:
-                        self.fit_panel.SetSelection(page_index)
-                        break
-                self.fit_panel.SetSelection(current_page_index)
-
+                if hasattr(page, "formfactorbox"):
+                    page.model_list_box = new_pmodel_list
+                    mod_cat = page.categorybox.GetStringSelection()
+                    if mod_cat == custom_model:
+                        box = page.formfactorbox
+                        model_name = box.GetValue()
+                        model = (box.GetClientData(box.GetCurrentSelection())
+                                 if model_name else None)
+                        page._show_combox_helper()
+                        new_index = box.FindString(model_name)
+                        new_model = (box.GetClientData(new_index)
+                                     if new_index >= 0 else None)
+                        if new_index >= 0:
+                            box.SetStringSelection(model_name)
+                        else:
+                            box.SetStringSelection('')
+                        if model and new_model != model:
+                            page._on_select_model(keep_pars=True)
+                    if hasattr(page, "structurebox"):
+                        selected_name = page.structurebox.GetStringSelection()
+
+                        page.structurebox.Clear()
+                        page.initialize_combox()
+
+                        index = page.structurebox.FindString(selected_name)
+                        if index == -1:
+                            index = 0
+                        page.structurebox.SetSelection(index)
+                        page._on_select_model()
         except Exception:
             logger.error("update_custom_combo: %s", sys.exc_value)