Changeset 7a67e075 in sasview

Timestamp:

Jan 26, 2011 1:54:16 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:

3feed3e

Parents:

0912feab

Message:

working on guiframe views

Location:

guiframe

Files:

• gui_manager.py (modified) (13 diffs)
• gui_style.py (modified) (2 diffs)
• latex_smeared.xml (added)
• local_perspectives/plotting/Plotter1D.py (modified) (3 diffs)

guiframe/gui_manager.py

@@ -56 +56 @@
     def __init__(self, parent, id, title, 
                  window_height=300, window_width=300,
-                 gui_style=GUIFRAME.SINGLE_APPLICATION):
+                 gui_style=GUIFRAME.DEFAULT_STYLE):
         """
         Initialize the Frame object
@@ -161 +161 @@
         default_flag = wx.aui.AUI_MGR_DEFAULT| wx.aui.AUI_MGR_ALLOW_ACTIVE_PANE
         self._mgr = wx.aui.AuiManager(self, flags=default_flag)
-        """
-        if self.__gui_style in [GUIFRAME.MULTIPLE_APPLICATIONS]:
-            from data_panel import DataPanel
-            self._data_panel = DataPanel(self)
-            """
+   
         # Load panels
         self._load_panels()
         self._mgr.Update()
         
-    def _layout(self, style):
-        """
-        Layout the frame according to a style
-        """
-        if self.__gui_style == GUIFRAME.SINGLE_APPLICATION:
-            #Divide the frame into 
-            print "GUIFRAME.SINGLE_APPLICATION"
-        elif self.__gui_style == GUIFRAME.MULTIPLE_APPLICATIONS:
-            print 'GUIFRAME.MULTIPLE_APPLICATION'
-        elif self.__gui_style == GUIFRAME.FLOATING_PANEL:
-            print "GUIFRAME.FLOATING_PANEL"
-            
     def SetStatusText(self, *args, **kwds):
         """
@@ -220 +204 @@
         plugins = []
         #import guiframe local plugins
-        if self.__gui_style == GUIFRAME.DATALOADER_ON:
+        #check if the style contain guiframe.dataloader
+        style1 = self.__gui_style & GUIFRAME.DATALOADER_ON
+        style2 = self.__gui_style & GUIFRAME.PLOTTIN_ON
+        style3 = self.__gui_style & (GUIFRAME.DATALOADER_ON|GUIFRAME.PLOTTIN_ON)
+       
+        if style1 == GUIFRAME.DATALOADER_ON:
             try:
                 from sans.guiframe.local_perspectives.data_loader import data_loader
@@ -229 +218 @@
                 msg += "cannot import dataloader plugin.\n %s" % sys.exc_value
                 logging.error(msg)
-        elif self.__gui_style == GUIFRAME.PLOTTIN_ON:
+        elif style2 == GUIFRAME.PLOTTIN_ON:
             try:
                 from sans.guiframe.local_perspectives.plotting import plotting
@@ -237 +226 @@
                 msg = "ViewerFrame._find_plugins:"
                 msg += "cannot import plotting plugin.\n %s" % sys.exc_value
-        elif self.__gui_style in [6, 7, 8]:
+        elif style3 in (GUIFRAME.DATALOADER_ON|GUIFRAME.PLOTTIN_ON):
             try:
                 from sans.guiframe.local_perspectives.data_loader import data_loader
@@ -362 +351 @@
                                           CenterPane().
                                           #BestSize(wx.Size(550,600)).
-                                          #MinSize(wx.Size(500,500)).
+                                 MinSize(wx.Size(self._window_width*3/5,-1)).
                                           Hide())
             else:
@@ -402 +391 @@
         ID = wx.NewId()
         self.panels[str(ID)] = p
-        
         count = 0
         for item in self.panels:
@@ -415 +403 @@
         p.window_caption = caption
             
-        self._mgr.AddPane(p, wx.aui.AuiPaneInfo().
-                          Name(windowname).Caption(caption).
-                          Floatable().
-                          #Float().
-                          Right().
-                          Dock().
-                          TopDockable().
-                          BottomDockable().
-                          LeftDockable().
-                          RightDockable().
-                          MinimizeButton().
-                          #Hide().
-                          #Show().
-                          Resizable(True).
-                          # Use a large best size to make sure the AUI manager
-                          # takes all the available space
-                          BestSize(wx.Size(400,400)))
+        style1 = self.__gui_style & GUIFRAME.FIXED_PANEL
+        style2 = self.__gui_style & GUIFRAME.FLOATING_PANEL
+        if style1 == GUIFRAME.FIXED_PANEL:
+            self._mgr.AddPane(p, wx.aui.AuiPaneInfo().
+                              Name(windowname).Caption(caption).
+                              Floatable().
+                              Right().
+                              Dock().
+                              TopDockable().
+                              BottomDockable().
+                              LeftDockable().
+                              RightDockable().
+                              MinimizeButton().
+                              #Hide().
+                              #Show().
+                              Resizable(True).
+                              # Use a large best size to make sure the AUI manager
+                              # takes all the available space
+                              BestSize(wx.Size(400,400)))
+        elif style2 in GUIFRAME.FLOATING_PANEL:
+            self._mgr.AddPane(p, wx.aui.AuiPaneInfo().
+                              Name(windowname).Caption(caption).
+                              Floatable().
+                              Float().
+                              
+                              #FloatingPosition(wx.Size(self._window_width/5,self._window_height/3)).
+                              Right().
+                              Dock().
+                              TopDockable().
+                              BottomDockable().
+                              LeftDockable().
+                              RightDockable().
+                              MinimizeButton().
+                              #Hide().
+                              #Show().
+                              Resizable(True).
+                              # Use a large best size to make sure the AUI manager
+                              # takes all the available space
+                              BestSize(wx.Size(400,400)))
+            
         pane = self._mgr.GetPane(windowname)
         self._mgr.MaximizePane(pane)
@@ -464 +475 @@
         self._add_menu_application()
         self._add_menu_window()
-       
-
-        
- 
         # Tools menu
         # Go through plug-ins and find tools to populate the tools menu
@@ -547 +554 @@
             
             wx.EVT_MENU(self, id, self.show_welcome_panel)
-        if self.__gui_style in [GUIFRAME.MANAGER_ON,
-                                 GUIFRAME.MULTIPLE_APPLICATIONS]:
+        style = self.__gui_style & GUIFRAME.MANAGER_ON
+        if style == GUIFRAME.MANAGER_ON:
             id = wx.NewId()
             self._window_menu.Append(id,'&Data Manager', '')
-            
             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')
+        #wx.EVT_MENU(self, id, self.show_preferences_panel)   
         """
         if len(self.plugins) == 2:
@@ -580 +598 @@
         add menu application
         """
-        if self.__gui_style in [GUIFRAME.MULTIPLE_APPLICATIONS]:
+        style = self.__gui_style & GUIFRAME.MULTIPLE_APPLICATIONS
+        if style == GUIFRAME.MULTIPLE_APPLICATIONS:
             p_menu = wx.Menu()
             for plug in self.plugins:
@@ -625 +644 @@
                          '&Load Data File(s)', data_file_hint)
         wx.EVT_MENU(self, data_file_id, self._load_data)
-        if self.__gui_style == GUIFRAME.SINGLE_APPLICATION:
+        style = self.__gui_style & GUIFRAME.SINGLE_APPLICATION
+        if style == GUIFRAME.SINGLE_APPLICATION:
             self._menubar.Append(self._data_menu, '&Data')
             return 
@@ -1021 +1041 @@
         """
         self._current_perspective = perspective
+        
+    def set_plotpanel_floating(self, event):
+        """
+        make the plot panel floatable
+        """
+    def set_plotpanel_fixed(self, event):
+        """
+        make the plot panel fixed
+        """
 
 class DefaultPanel(wx.Panel):

guiframe/gui_style.py

@@ -7 +7 @@
     MANAGER_ON = 1
     FLOATING_PANEL = 2
-    FIXED_PANEL = 3
-    PLOTTIN_ON = 4
-    DATALOADER_ON = 5
-    SINGLE_APPLICATION = 6
-    MULTIPLE_APPLICATIONS = 7
-    
-    DEFAULT_STYLE = 8
+    FIXED_PANEL = 4
+    PLOTTIN_ON = 8
+    DATALOADER_ON = 16
+    TOOL_ON = 32
+    SINGLE_APPLICATION = 64
+    DEFAULT_STYLE = SINGLE_APPLICATION|DATALOADER_ON|PLOTTIN_ON|FIXED_PANEL
+    MULTIPLE_APPLICATIONS = DEFAULT_STYLE|MANAGER_ON
 
 if __name__ == "__main__":
@@ -19 +19 @@
     print GUIFRAME.DEFAULT_STYLE
     print GUIFRAME.FLOATING_PANEL
+    print GUIFRAME.SINGLE_APPLICATION
+    style = GUIFRAME.MULTIPLE_APPLICATIONS
+    style &= GUIFRAME.PLOTTIN_ON
+    print style == GUIFRAME.PLOTTIN_ON
+    style1 = GUIFRAME.MULTIPLE_APPLICATIONS
+    style1 &= (~GUIFRAME.MANAGER_ON)
+    print style1 == GUIFRAME.DEFAULT_STYLE
+    print style1
+    
  
-    value = GUIFRAME.MANAGER_ON|GUIFRAME.DATALOADER_ON
-    print value
-    print value in [1,2]
-    print value in [5,2]
-    print value in [GUIFRAME.MANAGER_ON,GUIFRAME.DATALOADER_ON]
+  

guiframe/local_perspectives/plotting/Plotter1D.py

@@ -87 +87 @@
         self.graph.render(self)
         #bind with event to contrst context menu
-        self.parent.Bind(EVT_NEW_LOADED_DATA, self._add_new_plot)
+        #self.parent.Bind(EVT_NEW_LOADED_DATA, self._add_new_plot)
         
     def on_add_new_plot(self, event):
@@ -253 +253 @@
         self._slicerpop.Append(id, '&Print Preview', 'image preview for print')
         wx.EVT_MENU(self, id, self.onPrinterPreview)
+        """
         #add plot
         self._menu_add_plot = wx.Menu()
@@ -262 +263 @@
         self._slicerpop.AppendSubMenu(self._menu_add_plot, '&Add New Plot')
         self._fill_menu_add_plot()
+        """
         self._slicerpop.AppendSeparator()
         #add menu of other plugins