Changeset c363d74 in sasview

Timestamp:

Feb 4, 2010 12:35:07 PM (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:

b28278e

Parents:

1610976

Message:

allow opening the fitting perspetive when closing the welcome page

Location:

sansview

Files:

• perspectives/fitting.rar (added)
• sansview.py (modified) (1 diff)
• welcome_panel.py (modified) (3 diffs)

sansview/sansview.py

@@ -93 +93 @@
             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)
+        self.gui.set_default_perspective()
+       
     
 

sansview/welcome_panel.py

@@ -38 +38 @@
    
     
-    def __init__(self,parent,manager=None, *args, **kwds):
+    def __init__(self,parent, *args, **kwds):
         
         kwds["style"] = wx.aui.AUI_NB_DEFAULT_STYLE
@@ -45 +45 @@
         #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")
@@ -66 +65 @@
         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()