Changeset 9c169f4 in sasview

Timestamp:

Mar 2, 2011 3:15:46 PM (14 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

053c769

Parents:

8ec6923

Message:

update data panel

File:

• guiframe/gui_manager.py (modified) (2 diffs)

guiframe/gui_manager.py

@@ -1205 +1205 @@
             pane.Show(False)
             self._mgr.Update()
-            #self.__gui_style = self.__gui_style | GUIFRAME.MANAGER_ON
             self.__gui_style = self.__gui_style & (~GUIFRAME.MANAGER_ON)
             self._data_panel_menu.SetText('Data Explorer ON')
@@ -1219 +1218 @@
             self._data_manager.add_data(data_list)
             avalaible_data = self._data_manager.get_all_data()
-
+        
+        # set data in the data panel
+        if self._data_panel is not None:
+            data_state = self._data_manager.get_selected_data()
+            self._data_panel.load_data_list(data_state)
         style = self.__gui_style & GUIFRAME.MANAGER_ON
         if style == GUIFRAME.MANAGER_ON:
+            #wait for button press from the data panel to set_data 
             if self._data_panel is not None:
-                data_state = self._data_manager.get_selected_data()
-                self._data_panel.load_data_list(data_state)
                 self._mgr.GetPane(self._data_panel.window_name).Show(True)
-                self._mgr.Update()
-                #wait for button press from the data panel to send data
+                self._mgr.Update() 
         else:
             #automatically send that to the current perspective