Changeset e75b5fa in sasview

Timestamp:

Feb 23, 2011 2:36:11 PM (13 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:

2ac5f09

Parents:

fdb5c19

Message:

add hide and show data panel menu

Location:

guiframe

Files:

• gui_manager.py (modified) (5 diffs)
• local_perspectives/data_loader/data_loader.py (modified) (4 diffs)

guiframe/gui_manager.py

@@ -104 +104 @@
         self._data_menu = None
         self._window_menu = None
-        self._window_menu = None
+        self._data_panel_menu = None
         self._help_menu = None
         self._tool_menu = None
@@ -381 +381 @@
                               Left().
                               MinimizeButton().
+                              CloseButton(False).
                               TopDockable(False).
                               BottomDockable(False).
@@ -634 +635 @@
      
         style = self.__gui_style & GUIFRAME.MANAGER_ON
+        id = wx.NewId()
+        self._data_panel_menu = self._window_menu.Append(id,
+                                                '&Data Explorer ON', '')
+        wx.EVT_MENU(self, id, self.show_data_panel)
         if style == GUIFRAME.MANAGER_ON:
-            id = wx.NewId()
-            self._window_menu.Append(id,'&Data Manager', '')
-            wx.EVT_MENU(self, id, self.show_data_panel)
+            self._data_panel_menu.SetText('Data Explorer OFF')
+        else:
+            self._data_panel_menu.SetText('Data Explorer ON')
             
         style = self.__gui_style & GUIFRAME.PLOTTING_ON
@@ -1174 +1179 @@
         show the data panel
         """
-        style = self.__gui_style & GUIFRAME.MANAGER_ON
-        if style == GUIFRAME.MANAGER_ON:
+        label = self._data_panel_menu.GetText()
+        if label == 'Data Explorer ON':
             pane = self._mgr.GetPane(self.panels["data_panel"].window_name)
             #if not pane.IsShown():
             pane.Show(True)
             self._mgr.Update()
+            self.__gui_style = self.__gui_style | GUIFRAME.MANAGER_ON
+            
+            self._data_panel_menu.SetText('Data Explorer OFF')
+        else:
+            pane = self._mgr.GetPane(self.panels["data_panel"].window_name)
+            #if not pane.IsShown():
+            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')
  
     def add_data(self, data_list):
@@ -1198 +1214 @@
                 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
         else:
             #automatically send that to the current perspective
-            style = self.__gui_style & GUIFRAME.SINGLE_APPLICATION
-            if style == GUIFRAME.SINGLE_APPLICATION:
-                self.set_data(data_list)
+            self.set_data(data_list)
                 
     def get_data_from_panel(self, data_id, plot=False,append=False):

guiframe/local_perspectives/data_loader/data_loader.py

@@ -57 +57 @@
         Load data
         """
+        path = None
         if self._default_save_location == None:
             self._default_save_location = os.getcwd()
@@ -72 +73 @@
             if len(file_list) >= 0 and not(file_list[0]is None):
                 self._default_save_location = os.path.dirname(file_list[0])
+                path = self._default_save_location
         dlg.Destroy()
         
-        if not file_list or file_list[0] is None:
+        if path is None or not file_list or file_list[0] is None:
             return
         self.get_data(file_list)
-        self.parent.show_data_panel(event=None)
+        
         
     def can_load_data(self):
@@ -90 +92 @@
         Load entire folder
         """
+        path = None
         if self._default_save_location == None:
             self._default_save_location = os.getcwd()
@@ -105 +108 @@
         file_list = self.get_file_path(path)
         self.get_data(file_list)
-        self.parent.show_data_panel(event=None)
-   
-   
+        
     def load_error(self, error=None):
         """