Changeset ca30e36b in sasview

Timestamp:

Sep 28, 2018 2:31:33 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, unittest-saveload

Children:

ba1c145

Parents:

93c505b

Message:

make sure the current page is shown after all pages are updated

File:

• src/sas/sasgui/perspectives/fitting/fitting.py (modified) (3 diffs)

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
@@ -347 +346 @@
             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
@@ -400 +406 @@
                     #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)
+
         except Exception:
             logger.error("update_custom_combo: %s", sys.exc_value)