Changeset 13374be in sasview for src/sas/sasgui/perspectives/fitting/fitpanel.py
- Timestamp:
- Sep 20, 2017 7:55:53 AM (7 years ago)
- 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:
- fca1f50
- Parents:
- 6d62b7f (diff), 2a399ca (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/sasgui/perspectives/fitting/fitpanel.py
rc9ecd1b r13374be 503 503 if data is None: 504 504 return None 505 focused_page = self.GetPage(self.GetSelection()) 505 506 for page in self.opened_pages.values(): 506 507 # check if the selected data existing in the fitpanel 507 508 pos = self.GetPageIndex(page) 508 509 if not check_data_validity(page.get_data()) and not page.batch_on: 510 if page.model is not None and page != focused_page: 511 # Page has an active theory and is in background - don't 512 # send data here. 513 continue 509 514 # make sure data get placed in 1D empty tab if data is 1D 510 515 # else data get place on 2D tab empty tab
Note: See TracChangeset
for help on using the changeset viewer.