Changeset 29ef718 in sasview for guiframe

Timestamp:

Mar 29, 2011 11:28:14 AM (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:

2296316

Parents:

9466f2d6

Message:

load file before splashpage

File:

• guiframe/gui_manager.py (modified) (6 diffs)

guiframe/gui_manager.py

@@ -109 +109 @@
         
         ## Application manager
+        self._input_file = None
         self.app_manager = None
         self._mgr = None
@@ -164 +165 @@
         self.Bind(EVT_APPEND_BOOKMARK, self.append_bookmark)
     
+    def set_input_file(self, input_file):
+        """
+        :param input_file: file to read
+        """
+        self._input_file = input_file
+        
     def get_data_manager(self):
         """
@@ -200 +207 @@
         # set tool bar
         self._setup_tool_bar()
-        #self.Fit()
+        try:
+            self.load_from_cmd(self._input_file)
+        except:
+            pass
+        self.post_init()
+        self.Show(True)
         #self._check_update(None)
              
@@ -1855 +1867 @@
             return
         if self.frame is not None:
-            self.frame.load_from_cmd(path=input_file)
+            self.frame.set_input_file(input_file=input_file)
          
             
@@ -1869 +1881 @@
         Build the GUI
         """
-        self.frame.build_gui()
-        self.frame.post_init()
         #try to load file at the start
         try:
@@ -1876 +1886 @@
         except:
             raise
+        self.frame.build_gui()
         if self.s_screen is not None and self.s_screen.IsShown():
             self.s_screen.Close()