Changeset c3f697e in sasview

Timestamp:

Mar 25, 2011 12:29:26 PM (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:

56681bd

Parents:

ec1584e

Message:

working on load file from cmd line

File:

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

guiframe/gui_manager.py

@@ -299 +299 @@
             for item in list:
                 toks = os.path.splitext(os.path.basename(item))
-                name = None
+                name = ''
                 if not toks[0] == '__init__':
                     
@@ -306 +306 @@
                 
                     path = [os.path.abspath(dir)]
-                    file = None
+                    file = ''
                     try:
                         if toks[1] == '':
@@ -1031 +1031 @@
     def load_from_cmd(self,  path):   
         """
+        load data from cmd or application
         """ 
-        print "load_from_cmd", path
-        if path is  None:
+        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):   
         """
+        load data from command line or application
         """
         if path and (path is not None) and os.path.isfile(path):
@@ -1073 +1068 @@
     def load_data(self, path):
         """
+        load data from command line
         """
         if not os.path.isfile(path):
@@ -1084 +1080 @@
             print log_msg
             return
-    
+        message = ""
+        log_msg = ''
+        output = {}
+        error_message = ""
         try:
-            print "Loading Data..." + str(path) + "\n"
+            print "Loading Data...:\n" + str(path) + "\n"
             temp =  self.loader.load(path)
             if temp.__class__.__name__ == "list":
                 for item in temp:
-                    data = self.parent.create_gui_data(item, path)
+                    data = self.create_gui_data(item, path)
                     output[data.id] = data
             else:
-                data = self.parent.create_gui_data(temp, path)
+                data = self.create_gui_data(temp, path)
                 output[data.id] = data
             
             self.add_data(data_list=output)
         except:
-            error_message = "Error while loading Data: %s\n" % str(path)
+            error_message = "Error while loading"
+            error_message += " Data from cmd:\n %s\n" % str(path)
             error_message += str(sys.exc_value) + "\n"
             print error_message
@@ -1827 +1827 @@
             self.frame.special.SetCurrent()
         self.SetTopWindow(self.frame)
-        self.input_file = None
-        self.dir = None
-        print "sys.argv", sys.argv
+        try:
+            self.open_file()
+        except:
+            msg = "%s Could not load " % str(APPLICATION_NAME)
+            msg += "input file from command line.\n"
+            logging.error(msg)
+        return True
+
+    def open_file(self):
+        """
+        open a state file at the start of the application
+        """
+        input_file = None
         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 open_file(self):
-        """
-        open a state file at the start of the application
-        """
-        
+                    input_file = sys.argv[1]
+        if input_file is None:
+            return
         if self.frame is not None:
-            self.frame.load_from_cmd(path=self.input_file)
+            self.frame.load_from_cmd(path=input_file)
          
             
@@ -1961 +1962 @@
         event.Skip()
       
-      
-
-        
-
 if __name__ == "__main__": 
     app = ViewApp(0)