Changeset 976604d in sasview

Timestamp:

Mar 25, 2011 10:05:47 AM (13 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:

84e5533

Parents:

dd1718e

Message:

working on load data from command line

File:

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

guiframe/gui_manager.py

@@ -1028 +1028 @@
                 self._data_panel.load_data_list(data_state)
                 self._mgr.GetPane(self._data_panel.window_name).Show(True)
-                     
+      
+    def load_from_cmd(self,  path):   
+        """
+        """ 
+        print "load_from_cmd", path
+        if path is  None:
+            return
+        else:
+            path = os.path.abspath(path)
+            if not os.path.isfile(path):
+               print "return abs path", path
+               return
+             
+            print "find a path -->", path
+
+        basename  = os.path.basename(path)
+        root, extension = os.path.splitext(basename)
+        if extension.lower() not in EXTENSIONS:
+            self.load_data(path)
+            print "load data"
+        else:
+            self.load_state(path)
+            "load state"
+        
     def load_state(self, path):   
         """
         """
-        if path and os.path.isfile(path):
+        if path and (path is not None) and os.path.isfile(path):
             basename  = os.path.basename(path)
             if APPLICATION_STATE_EXTENSION is not None \
@@ -1784 +1807 @@
                                  gui_style = DEFAULT_STYLE,
                                  size=size) 
-        #try to load file at the start
-        #try:
-        #    self.open_file()
-        #except:
-        #    raise
         self.s_screen = None
         # Display a splash screen on top of the frame.
@@ -1809 +1827 @@
             self.frame.special.SetCurrent()
         self.SetTopWindow(self.frame)
-        import time
-        
+        self.input_file = None
+        self.dir = None
+        print "sys.argv", sys.argv
+        if len(sys.argv) >= 2:
+            print "sys.argv 0", sys.argv[0]
+            cmd = sys.argv[0].lower()
+            if os.path.isfile(cmd):
+                basename  = os.path.basename(cmd)
+                self.dir = os.path.dirname(cmd)
+                print "basename", basename
+                if basename in ['sansview.py', 'sansview.exe']:
+                    print "sys.argv 1", sys.argv[1]
+                    self.input_file = sys.argv[1]
         return True
-    
-    def load(self, path):
-        """
-        """
+
+    def open_file(self):
+        """
+        open a state file at the start of the application
+        """
+        
         if self.frame is not None:
-            self.frame.load(path)
-            
-    def open_file(self):
-        """
-        open a state file at the start of the application
-        """
-        if len(sys.argv) >= 2:
-            if sys.argv[0].lower() in ['sansview.py', 'sansview.exe']:
-                path = sys.argv[1]
-                if os.path.isfile(path):
-                    self.load(path)
-                else:
-                    print "SansView cannot read this file: %s" % str(path)
+            self.frame.load_from_cmd(path=self.input_file)
+         
             
     def set_manager(self, manager):
@@ -1844 +1864 @@
         self.frame.build_gui()
         self.frame.post_init()
+        #try to load file at the start
+        try:
+            self.open_file()
+        except:
+            raise
         if self.s_screen is not None and self.s_screen.IsShown():
             self.s_screen.Close()