Changeset 6f9abd3 in sasview for src/sas/sasgui/perspectives/fitting/fitpanel.py

Timestamp:

Sep 1, 2017 10:14:27 AM (7 years ago)

Author:

lewis

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:

b76e65a

Parents:

57b48ab

Message:

Don't send data to fit panel if it has an active theory and is in bg

Fixes #986

File:

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

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

@@ -501 +501 @@
             if data is None:
                 return None
+        focused_page = self.GetPage(self.GetSelection())
         for page in self.opened_pages.values():
             # check if the selected data existing in the fitpanel
             pos = self.GetPageIndex(page)
             if not check_data_validity(page.get_data()) and not page.batch_on:
+                if page.model is not None and page != focused_page:
+                    # Page has an active theory and is in background - don't
+                    # send data here.
+                    continue
                 # make sure data get placed in 1D empty tab if data is 1D
                 # else data get place on 2D tab empty tab