Changeset f15f144d in sasview for sansguiframe/src/sans/guiframe

Timestamp:

Aug 19, 2011 6:42:47 PM (13 years ago)

Author:

Jae Cho <jhjcho@…>

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

Children:

2ac8783

Parents:

b42650a

Message:

previous commit did not help, reverted

File:

• sansguiframe/src/sans/guiframe/gui_manager.py (modified) (3 diffs)

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -731 +731 @@
         """
         """
-        prev_id, data_state = wx.CallAfter(self._data_manager.update_data, 
-                                           prev_data=prev_data, 
-                                           new_data=new_data)
+        prev_id, data_state = self._data_manager.update_data(prev_data=prev_data, 
+                                       new_data=new_data)
         
         self._data_panel.remove_by_id(prev_id)
@@ -1957 +1956 @@
         list_data, _ = self._data_manager.get_by_id(data_id)
         if self._current_perspective is not None:
-            self._current_perspective.set_data(list_data.values())
             if self.cleanup_plots:
                 for uid, panel in self.plot_panels.iteritems():
@@ -1965 +1963 @@
                     if not window.IsFloating():
                         self.hide_panel(uid)
+            self._current_perspective.set_data(list_data.values())
             self.on_close_welcome_panel()
         else: