Changeset 4753fc2 in sasview

Timestamp:

Feb 2, 2011 2:43:57 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:

52725d6

Parents:

2096e78

Message:

update dummy example

Location:

guiframe

Files:

• dummyapp.py (modified) (3 diffs)
• gui_manager.py (modified) (7 diffs)

guiframe/dummyapp.py

@@ -4 +4 @@
 """
 import gui_manager
+from sans.guiframe.gui_style import GUIFRAME
+from sans.guiframe.plugin_base import PluginBase
 
-class TestPlugin(gui_manager.Plugin):
+class DummyView(gui_manager.ViewApp):
+    """
+    """
+    PROG_SPLASH_PATH = None
+    STYLE = GUIFRAME.SINGLE_APPLICATION
     
-    def populate_menu(self, id, parent):
+class TestPlugin(PluginBase):
+    
+    def populate_menu(self, parent):
         """
         Create and return the list of application menu
         items for the plug-in. 
-        
-        :param id: deprecated. Un-used.
         :param parent: parent window
         
@@ -32 +38 @@
     
         # Returns the menu and a name for it.
-        return [(id, plug_menu, "DummyApp")]    
+        return [(plug_menu, "DummyApp")]    
     
     def get_panels(self, parent):
@@ -103 +109 @@
         Initialization
         """
-        self.gui = gui_manager.ViewApp(0)
+        self.gui = DummyView(0)
         
         fitting_plug = TestPlugin()

guiframe/gui_manager.py

@@ -53 +53 @@
 GUIFRAME_WIDTH = 1000
 GUIFRAME_HEIGHT = 800
+PROG_SPLASH_SCREEN = "images/danse_logo.png" 
 
 class ViewerFrame(wx.Frame):
@@ -60 +61 @@
     
     def __init__(self, parent, title, 
-                 size=(GUIFRAME_WIDTH,GUIFRAME_HEIGHT),
+                 size=(GUIFRAME_WIDTH, GUIFRAME_HEIGHT),
                  gui_style=GUIFRAME.DEFAULT_STYLE, 
                  pos=wx.DefaultPosition):
@@ -581 +582 @@
             for (menu, name) in self._plotting_plugin.populate_menu(self):
                 self._window_menu.AppendSubMenu(menu, name)
-        self._window_menu.AppendSeparator()
         self._menubar.Append(self._window_menu, '&Window')
      
@@ -590 +590 @@
             wx.EVT_MENU(self, id, self.show_data_panel)
             
-        id = wx.NewId()
-        preferences_menu = wx.Menu()
-        hint = "Plot panels will floating"
-        preferences_menu.Append(id, '&Floating Plot Panel', hint)
-        wx.EVT_MENU(self, id, self.set_plotpanel_floating)
-        id = wx.NewId()
-        hint = "Plot panels will displayed within the frame"
-        preferences_menu.Append(id, '&Fixed Plot Panel', hint)
-        wx.EVT_MENU(self, id, self.set_plotpanel_fixed)
-        id = wx.NewId()
-        self._window_menu.AppendSubMenu(preferences_menu,'&Preferences')
+        style = self.__gui_style & GUIFRAME.PLOTTING_ON
+        if style == GUIFRAME.PLOTTING_ON:
+            self._window_menu.AppendSeparator()
+            id = wx.NewId()
+            preferences_menu = wx.Menu()
+            hint = "Plot panels will floating"
+            preferences_menu.Append(id, '&Floating Plot Panel', hint)
+            wx.EVT_MENU(self, id, self.set_plotpanel_floating)
+            id = wx.NewId()
+            hint = "Plot panels will displayed within the frame"
+            preferences_menu.Append(id, '&Fixed Plot Panel', hint)
+            wx.EVT_MENU(self, id, self.set_plotpanel_fixed)
+            id = wx.NewId()
+            self._window_menu.AppendSubMenu(preferences_menu,'&Preferences')
         #wx.EVT_MENU(self, id, self.show_preferences_panel)   
         """
@@ -670 +673 @@
         wx.EVT_MENU(self, data_file_id, self._load_data)
         style = self.__gui_style & GUIFRAME.MULTIPLE_APPLICATIONS
-        style1 = self.__gui_style & GUIFRAME.SINGLE_APPLICATION
+        style1 = self.__gui_style & GUIFRAME.DATALOADER_ON
         if style == GUIFRAME.MULTIPLE_APPLICATIONS:
             #menu for data from folder
@@ -679 +682 @@
             wx.EVT_MENU(self, data_folder_id, self._load_folder)
             self._menubar.Append(self._data_menu, '&Data')
-        elif style1 == GUIFRAME.SINGLE_APPLICATION:
+        elif style1 == GUIFRAME.DATALOADER_ON:
             self._menubar.Append(self._data_menu, '&Data')
         
@@ -1236 +1239 @@
     CENTER_PANE = True
 
-PROG_SPLASH_SCREEN = "images/danse_logo.png" 
+
 # Toy application to test this Frame
 class ViewApp(wx.App):