Changeset d828481 in sasview

Timestamp:

Feb 3, 2011 5:32:29 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:

f036c692

Parents:

9694eab

Message:

remove welcome panel menu depending on a new config

Location:

guiframe

Files:

• data_panel.py (modified) (1 diff)
• gui_manager.py (modified) (11 diffs)
• gui_style.py (modified) (1 diff)

guiframe/data_panel.py

@@ -191 +191 @@
         wx.EVT_BUTTON(self, self.bt_plot.GetId(), self.on_plot)
         
-        self.bt_remove = wx.Button(self, wx.NewId(), "Delete Data")
-        self.bt_remove.SetToolTipString("Delete data from the application")
+        self.bt_remove = wx.Button(self, wx.NewId(), "Remove Data")
+        self.bt_remove.SetToolTipString("Remove data from the application")
         wx.EVT_BUTTON(self, self.bt_remove.GetId(), self.on_remove)
         

guiframe/gui_manager.py

@@ -44 +44 @@
 from sans.guiframe.events import NewLoadedDataEvent
 from sans.guiframe.data_panel import DataPanel
+from sans.guiframe.panel_base import PanelBase
 
 STATE_FILE_EXT = ['.inv', '.fitv', '.prv']
@@ -106 +107 @@
         self._applications_menu_pos = -1
         self._applications_menu = None
+        self._edit_menu = None
         ## Find plug-ins
         # Modify this so that we can specify the directory to look into
@@ -356 +358 @@
                               MinimizeButton().
                               MinSize(wx.Size(w, h)).
-                              Show())
+                              Hide())
         style = self.__gui_style & GUIFRAME.MANAGER_ON
         if style != GUIFRAME.MANAGER_ON:
             self._mgr.GetPane(self.panels["data_panel"].window_name).Hide()
+            print "manager_on"
+        else:
+            self._mgr.GetPane(self.panels["data_panel"].window_name).Show()
             
         # Add the panels to the AUI manager
@@ -538 +543 @@
         # Help menu
         self._help_menu = wx.Menu()
-        # add the welcome panel menu item
-        if self.defaultPanel is not None:
-            id = wx.NewId()
-            self._help_menu.Append(id, '&Welcome', '')
-            self._help_menu.AppendSeparator()
-            wx.EVT_MENU(self, id, self.show_welcome_panel)
+        style = self.__gui_style & GUIFRAME.WELCOME_PANEL_ON
+        if style == GUIFRAME.WELCOME_PANEL_ON:
+            # add the welcome panel menu item
+            if self.defaultPanel is not None:
+                id = wx.NewId()
+                self._help_menu.Append(id, '&Welcome', '')
+                self._help_menu.AppendSeparator()
+                wx.EVT_MENU(self, id, self.show_welcome_panel)
         # Look for help item in plug-ins 
         for item in self.plugins:
@@ -604 +611 @@
             id = wx.NewId()
             self._window_menu.AppendSubMenu(preferences_menu,'&Preferences')
+        if self._window_menu.GetMenuItemCount() == 0:
+            pos = self._menubar.FindMenu('Window')
+            self._menubar.Remove(pos)
         #wx.EVT_MENU(self, id, self.show_preferences_panel)   
         """
@@ -658 +668 @@
         add menu file
         """
+        
          # File menu
         self._file_menu = wx.Menu()
-        # some menu of plugin to be seen under file menu
-        self._populate_file_menu()
-        id = wx.NewId()
-        self._file_menu.Append(id, '&Save Application',
-                             'Save state of the current active application')
-        wx.EVT_MENU(self, id, self._on_save_application)
-        id = wx.NewId()
-        self._file_menu.Append(id, '&Save Project',
-                             'Save the state of the whole application')
-        wx.EVT_MENU(self, id, self._on_save_project)
-        self._file_menu.AppendSeparator()
+        style = self.__gui_style & GUIFRAME.DATALOADER_ON
+        if style == GUIFRAME.DATALOADER_ON:
+            # some menu of plugin to be seen under file menu
+            self._populate_file_menu()
+            id = wx.NewId()
+            self._file_menu.Append(id, '&Save Application',
+                                 'Save state of the current active application')
+            wx.EVT_MENU(self, id, self._on_save_application)
+            id = wx.NewId()
+            self._file_menu.Append(id, '&Save Project',
+                                 'Save the state of the whole application')
+            wx.EVT_MENU(self, id, self._on_save_project)
+            self._file_menu.AppendSeparator()
         
         id = wx.NewId()
@@ -677 +690 @@
         # Add sub menus
         self._menubar.Append(self._file_menu, '&File')
+        
+    def _add_menu_edit(self):
+        """
+        add menu edit
+        """
+        # Edit Menu
+        self._edit_menu = wx.Menu()
+        
+        id = wx.NewId()
+        self._edit_menu.Append(id, '&Undo', 'Undo the previous action')
+        wx.EVT_MENU(self, id, self.on_undo_panel)
+        
+        id = wx.NewId()
+        self._edit_menu.Append(id, '&Redo', 'Redo the previous action')
+        wx.EVT_MENU(self, id, self.on_redo_panel)
+        self._edit_menu.AppendSeparator()
+        id = wx.NewId()
+        self._edit_menu.Append(id, '&Bookmark', 'bookmark current panel')
+        wx.EVT_MENU(self, id, self.on_bookmark_panel)
+        
+        id = wx.NewId()
+        self._edit_menu.Append(id, '&Save As', 'Save current panel into file')
+        wx.EVT_MENU(self, id, self.on_save_panel)
+        self._edit_menu.AppendSeparator()
+        id = wx.NewId()
+        self._edit_menu.Append(id, '&Print Preview', 'Preview current panel')
+        wx.EVT_MENU(self, id, self.on_preview_panel)
+        
+        id = wx.NewId()
+        self._edit_menu.Append(id, '&Print', 'Print current panel')
+        wx.EVT_MENU(self, id, self.on_print_panel)
+        self._edit_menu.AppendSeparator()
+        id = wx.NewId()
+        self._edit_menu.Append(id, '&Zoom', 'Zoom current panel')
+        wx.EVT_MENU(self, id, self.on_zoom_panel)
+        
+        id = wx.NewId()
+        self._edit_menu.Append(id, '&Zoom In', 'Zoom in current panel')
+        wx.EVT_MENU(self, id, self.on_zoom_in_panel)
+       
+        id = wx.NewId()
+        self._edit_menu.Append(id, '&Zoom Out', 'Zoom out current panel')
+        wx.EVT_MENU(self, id, self.on_zoom_out_panel)
+        
+        id = wx.NewId()
+        self._edit_menu.Append(id, '&Drag', 'Drag current panel')
+        wx.EVT_MENU(self, id, self.on_drag_panel)
+        
+        id = wx.NewId()
+        self._edit_menu.Append(id, '&Reset', 'Reset current panel')
+        wx.EVT_MENU(self, id, self.on_reset_panel)
+        
+        self.menubar.Append(self._edit_menu,  '&Edit')
         
     def _add_menu_data(self):
@@ -1119 +1185 @@
                     return 
                 else:
-                    if self.enable_add_data(new_plot):
+                    if self.enable_add_data(new_plot) and \
+                    hasattr(self.panel_on_focus, 'group_id'):
                         new_plot.group_id = self.panel_on_focus.group_id
             wx.PostEvent(self, NewPlotEvent(plot=new_plot,
@@ -1247 +1314 @@
     
         return is_data1d and not is_data2d and not is_theory and not is_state_data
-        
-class DefaultPanel(wx.Panel):
+    
+    def on_undo_panel(self, event=None):
+        """
+        undo previous action of the last panel on focus if possible
+        """
+    def on_redo_panel(self, event=None):
+        """
+        redo the last cancel action done on the last panel on focus
+        """
+    def on_bookmark_panel(self, event=None):
+        """
+        Bookmark available information of the panel on focus
+        """
+    def on_save_panel(self, event=None):
+        """
+        save possible information on the current panel
+        """
+    def on_preview_panel(self, event=None):
+        """
+        preview information on the panel on focus
+        """
+    def on_print_panel(self, event=None):
+        """
+        print available information on the last panel on focus
+        """
+    def on_zoom_panel(self, event=None):
+        """
+        zoom on the current panel if possible
+        """
+    def on_zoom_in_panel(self, event=None):
+        """
+        zoom in of the panel on focus
+        """
+    def on_zoom_out_panel(self, event=None):
+        """
+        zoom out on the panel on focus
+        """
+    def on_drag_panel(self, event=None):
+        """
+        drag apply to the panel on focus
+        """
+    def on_reset_panel(self, event=None):
+        """
+        reset the current panel
+        """
+        
+        
+class DefaultPanel(wx.Panel, PanelBase):
     """
     Defines the API for a panels to work with
@@ -1259 +1372 @@
     ## Flag to tell the AUI manager to put this panel in the center pane
     CENTER_PANE = True
+    
 
 
@@ -1268 +1382 @@
     TITLE = config.__appname__
     PROG_SPLASH_PATH = PROG_SPLASH_SCREEN
-    STYLE = GUIFRAME.DEFAULT_STYLE
+    STYLE = GUIFRAME.SINGLE_APPLICATION
     def OnInit(self):
         """

guiframe/gui_style.py

@@ -12 +12 @@
     TOOL_ON = 32
     SINGLE_APPLICATION = 64
+    WELCOME_PANEL_ON = 128
     DEFAULT_STYLE = SINGLE_APPLICATION|DATALOADER_ON|PLOTTING_ON|FIXED_PANEL
-    MULTIPLE_APPLICATIONS = DEFAULT_STYLE|MANAGER_ON
+    MULTIPLE_APPLICATIONS = DEFAULT_STYLE|MANAGER_ON|WELCOME_PANEL_ON
 
 if __name__ == "__main__":