Changeset a03d419 in sasview for guiframe/gui_manager.py

Timestamp:

May 13, 2011 4:08:36 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:

e26d0db

Parents:

13a63ab

Message:

add remove button

File:

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

guiframe/gui_manager.py

@@ -40 +40 @@
 from sans.guiframe.events import EVT_APPEND_BOOKMARK
 from sans.guiframe.events import EVT_PANEL_ON_FOCUS
+from sans.guiframe.events import EVT_NEW_LOAD_DATA
 from sans.guiframe.events import StatusEvent
 from sans.guiframe.events import NewPlotEvent
 from sans.guiframe.gui_style import GUIFRAME
 from sans.guiframe.gui_style import GUIFRAME_ID
-from sans.guiframe.events import NewLoadedDataEvent
+#from sans.guiframe.events import NewLoadedDataEvent
 from sans.guiframe.data_panel import DataPanel
 from sans.guiframe.panel_base import PanelBase
@@ -190 +191 @@
         self.Bind(EVT_PANEL_ON_FOCUS, self.set_panel_on_focus)
         self.Bind(EVT_APPEND_BOOKMARK, self.append_bookmark)
-        
-        
+        self.Bind(EVT_NEW_LOAD_DATA, self.on_load_data)
+        
+        
+    def on_load_data(self, event):
+        """
+        received an event to trigger load from data plugin
+        """
+        if self._data_plugin is not None:
+            self._data_plugin.load_data(event)
+            
     def get_current_perspective(self):
         """
@@ -958 +967 @@
         style = self.__gui_style & GUIFRAME.DATALOADER_ON
         style1 = self.__gui_style & GUIFRAME.MULTIPLE_APPLICATIONS
-        if style == GUIFRAME.DATALOADER_ON:
+        
+        id = wx.NewId()
+        hint_load_file = "read all analysis states save previously"
+        self._save_appl_menu = self._file_menu.Append(id, 
+                                '&Open Project', hint_load_file)
+        wx.EVT_MENU(self, id, self._on_open_state_project)
+            
+        if style1 == GUIFRAME.MULTIPLE_APPLICATIONS:
+            # some menu of plugin to be seen under file menu
+            hint_load_file = "Read a status files and load"
+            hint_load_file += " them into the analysis"
             id = wx.NewId()
-            hint_load_file = "read all analysis states save previously"
             self._save_appl_menu = self._file_menu.Append(id, 
-                                    '&Open Project', hint_load_file)
-            wx.EVT_MENU(self, id, self._on_open_state_project)
-            
-            if style1 == GUIFRAME.MULTIPLE_APPLICATIONS:
-                # some menu of plugin to be seen under file menu
-                hint_load_file = "Read a status files and load"
-                hint_load_file += " them into the analysis"
-                id = wx.NewId()
-                self._save_appl_menu = self._file_menu.Append(id, 
-                                        '&Open Analysis', hint_load_file)
-                wx.EVT_MENU(self, id, self._on_open_state_application)
+                                    '&Open Analysis', hint_load_file)
+            wx.EVT_MENU(self, id, self._on_open_state_application)
                 
-            self._file_menu.AppendSeparator()
+        self._file_menu.AppendSeparator()
+        id = wx.NewId()
+        self._file_menu.Append(id, '&Save Project',
+                             'Save the state of the whole analysis')
+        wx.EVT_MENU(self, id, self._on_save_project)
+        if style1 == GUIFRAME.MULTIPLE_APPLICATIONS:
+            #self._file_menu.AppendSeparator()
             id = wx.NewId()
-            self._file_menu.Append(id, '&Save Project',
-                                 'Save the state of the whole analysis')
-            
-            wx.EVT_MENU(self, id, self._on_save_project)
-            if style1 == GUIFRAME.MULTIPLE_APPLICATIONS:
-                #self._file_menu.AppendSeparator()
-                id = wx.NewId()
-                self._save_appl_menu = self._file_menu.Append(id, 
-                                                          '&Save Analysis',
-                            'Save state of the current active analysis panel')
-                wx.EVT_MENU(self, id, self._on_save_application)
-            
-            self._file_menu.AppendSeparator()
+            self._save_appl_menu = self._file_menu.Append(id, 
+                                                      '&Save Analysis',
+                        'Save state of the current active analysis panel')
+            wx.EVT_MENU(self, id, self._on_save_application)
+        
+        self._file_menu.AppendSeparator()
         
         id = wx.NewId()