Changeset dab94f6 in sasview for src/sas

Timestamp:

Apr 7, 2017 4:04:37 AM (8 years ago)

Author:

krzywon

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

Children:

1bcc48d, 8eb9043

Parents:

7cbbacd

git-author:

Jeff Krzywon <krzywon@…> (04/07/17 04:04:37)

git-committer:

krzywon <krzywon@…> (04/07/17 04:04:37)

Message:

Deleting data from first fit page is no longer causing the issue. see #929

File:

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

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

@@ -395 +395 @@
                 temp_data = page.get_data()
                 if temp_data is not None and temp_data.id in data:
-                    self.SetSelection(pos)
-                    self.on_close_page(event=None)
-                    temp = self.GetSelection()
-                    self.DeletePage(temp)
+                    self.close_page_with_data(temp_data)
             if self.sim_page is not None:
                 if len(self.sim_page.model_list) == 0:
@@ -405 +402 @@
                     self.on_close_page(event=None)
                     temp = self.GetSelection()
-                    self.DeletePage(temp)
+                    self.DeletePage(pos)
                     self.sim_page = None
                     self.batch_on = False