Changeset 3450e7f in sasview

Timestamp:

Mar 30, 2011 3:33:33 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:

e030625

Parents:

1c95d15

Message:

make all derivative of guiframe being able to load from command line

File:

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

guiframe/gui_manager.py

@@ -217 +217 @@
             self.load_from_cmd(self._input_file)
         except:
-            raise
             msg = "%s Cannot load file %s\n" %(str(APPLICATION_NAME), 
                                              str(self._input_file))
@@ -616 +615 @@
         application_name = 'No Selected Application'
         panel_name = 'No Panel on Focus'
-        if self._toolbar is not None:
-            self._toolbar.update_toolbar(self.panel_on_focus)
+        if self._toolbar is  None:
+            return
+        self._toolbar.update_toolbar(self.panel_on_focus)
         if self._current_perspective is not None:
             application_name = self._current_perspective.sub_menu
@@ -1989 +1989 @@
             if os.path.isfile(cmd):
                 basename  = os.path.basename(cmd)
-                if basename in ['sansview.py', 'sansview.exe']:
+                app_py = str(APPLICATION_NAME).lower() + '.py'
+                app_exe = str(APPLICATION_NAME).lower() + '.exe'
+                if basename.lower() in [app_py, app_exe]:
                     input_file = sys.argv[1]
         if input_file is None:
@@ -1995 +1997 @@
         if self.frame is not None:
             self.frame.set_input_file(input_file=input_file)
-         
-            
+          
     def set_manager(self, manager):
         """