Changeset 9455d77 in sasview for sansview

Timestamp:

Feb 2, 2010 10:17:26 AM (15 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:

629e8b9

Parents:

c1469ebe

Message:

working on the close welcome page

Location:

sansview

Files:

• perspectives/fitting/fitting.py (modified) (2 diffs)
• sansview.py (modified) (4 diffs)
• welcome_panel.py (modified) (2 diffs)

sansview/perspectives/fitting/fitting.py

@@ -478 +478 @@
             if fitproblem_count == 1:
                 #qmin, qmax= self.current_pg.get_range()
-                print "went here fitproblem_count == 1",fitproblem_count == 1
+                #print "went here fitproblem_count == 1",fitproblem_count == 1
                 calc_fit=FitThread(parent =self.parent,
                                         fn= self.fitter,
@@ -634 +634 @@
             self.fitter.set_data(data=metadata,Uid=self.fit_id,
                                  smearer=smearer,qmin= qmin,qmax=qmax )
-            print "self.fitter.set_data"
+            #print "self.fitter.set_data"
             self.fitter.select_problem_for_fit(Uid= self.fit_id,
                                                value= value.get_scheduled())

sansview/sansview.py

@@ -42 +42 @@
         #from gui_manager import ViewApp
         self.gui = SansViewApp(0) 
-        
+        # Set the application manager for the GUI
+        self.gui.set_manager(self)
         # Add perspectives to the basic application
         # Additional perspectives can still be loaded
@@ -53 +54 @@
         try:
             import sans.perspectives.pr as module    
-            fitting_plug = module.Plugin(standalone=False)
-            self.gui.add_perspective(fitting_plug)
+            self.fitting_plug = module.Plugin(standalone=False)
+            self.gui.add_perspective(self.fitting_plug)
         except:
             logging.error("SansView: could not find P(r) plug-in module") 
@@ -76 +77 @@
         # Fitting perspective
         import perspectives.fitting as module    
-        fitting_plug = module.Plugin()
-        self.gui.add_perspective(fitting_plug)
-      
+        self.fitting_plug = module.Plugin()
+        self.gui.add_perspective(self.fitting_plug)
+        
         # Add welcome page
         self.gui.set_welcome_panel(WelcomePanel)
@@ -85 +86 @@
         self.gui.build_gui()
         
-        # Set the application manager for the GUI
-        self.gui.set_manager(self)
-        
         # Start the main loop
         self.gui.MainLoop()  
         
+    def on_close_welcome_panel(self):
+        """
+            When closing the welcome panel, set to the default perspective
+        """
+        default_perspective = self.fitting_plug.get_perspective()
+        return
+        self.fitting_plug.on_perspective(event=None)
+    
 
 if __name__ == "__main__": 

sansview/welcome_panel.py

@@ -13 +13 @@
 
 import wx
+import wx.aui
 import wx.lib.hyperlink
 import os.path
@@ -23 +24 @@
 else:
     FONT_VARIANT = 1 
+ 
+class WelcomePanel(wx.aui.AuiNotebook):
+    """
+        Panel created like about box  as a welcome page
+        Shows product name, current version, authors, and link to the product page.
+    """
+    ## Internal nickname for the window, used by the AUI manager
+    window_name = "default"
+    ## Name to appear on the window title bar
+    window_caption = "Welcome panel"
+    ## Flag to tell the AUI manager to put this panel in the center pane
+    CENTER_PANE = True
+   
     
-class WelcomePanel(wx.Panel):
+    def __init__(self,parent,manager=None, *args, **kwds):
+        
+        kwds["style"] = wx.aui.AUI_NB_DEFAULT_STYLE
+        
+        wx.aui.AuiNotebook.__init__(self, parent, *args, **kwds)
+        #For sansview the parent is guiframe
+        self.parent = parent
+        #For sansview the manager is sansview application
+        self.manager = manager
+        welcome_page = WelcomePage(self)
+        self.AddPage(page=welcome_page, caption="Welcome")
+        
+        pageClosedEvent = wx.aui.EVT_AUINOTEBOOK_PAGE_CLOSE
+        self.Bind(wx.aui.EVT_AUINOTEBOOK_PAGE_CLOSE, self.on_close_page)
+        self.Center()
+    
+    def set_manager(self, manager):
+        """
+            the manager of the panel in this case the application itself
+        """
+        self.manager = manager
+        
+    def on_close_page(self, event):
+        """
+            
+        """
+        if self.parent is not None:
+            self.parent.on_close_welcome_panel()
+        if self.manager is not None:
+            self.manager.on_close_welcome_panel()
+        event.Veto() 
+   
+class WelcomePage(wx.Panel):
     """
         Panel created like about box  as a welcome page