Changeset 5612152 in sasview

Timestamp:

Jul 24, 2009 8:30:23 PM (15 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

e2da832

Parents:

f9e803e

Message:

sansview: modified the application to pass a welcome panel class to the gui manager instead of making it part of the fit perspective.

Location:

sansview/perspectives/fitting

Files:

• fitpanel.py (modified) (1 diff)
• fitting.py (modified) (2 diffs)
• welcome_panel.py (deleted)

sansview/perspectives/fitting/fitpanel.py

@@ -145 +145 @@
         
         pageClosedEvent = wx.aui.EVT_AUINOTEBOOK_PAGE_CLOSE
-        self.Bind(wx.aui.EVT_AUINOTEBOOK_PAGE_CLOSE, self.onClosePage)
-        ##Creating the default page --welcomed page
-        self.about_page=None
-        from welcome_panel import PanelAbout
-        self.about_page = PanelAbout(self, -1)
-        self.AddPage(self.about_page,"Welcome!")
-      
+        self.Bind(wx.aui.EVT_AUINOTEBOOK_PAGE_CLOSE, self.onClosePage)      
        
         #dictionary of miodel {model class name, model class}

sansview/perspectives/fitting/fitting.py

@@ +1 @@
+"""
+This software was developed by the University of Tennessee as part of the
+Distributed Data Analysis of Neutron Scattering Experiments (DANSE)
+project funded by the US National Science Foundation. 
+
+See the license text in license.txt
+
+copyright 2009, University of Tennessee
+"""
 import  re,copy
 import sys, wx, logging
@@ -249 +258 @@
         """
             Post initialization call back to close the loose ends
-            [Somehow openGL needs this call]
-        """
-        self.parent.set_perspective(self.perspective)
+        """
+        # Do not show the fitting perspective immediately and 
+        # let the application show the Welcome Page.
+        #self.parent.set_perspective(self.perspective)
+        pass