Changeset 64e44c1 in sasview

Timestamp:

Apr 6, 2011 2:40:35 PM (14 years ago)

Author:

Jae Cho <jhjcho@…>

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:

dd8ee14

Parents:

ba64348

Message:

revert some code

File:

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

guiframe/gui_manager.py

@@ -222 +222 @@
             self.load_from_cmd(self._input_file)
         except:
-            pass
+            msg = "%s Cannot load file %s\n" %(str(APPLICATION_NAME), 
+                                             str(self._input_file))
+            msg += str(sys.exc_value) + '\n'
+            print msg
         self.post_init()
         self.show_welcome_panel(None)
         self.Show(True)
-        self._check_update(None)
-    
-            
+        #self._check_update(None)
+             
     def _setup_layout(self):
         """
@@ -450 +452 @@
         data_pane = self._mgr.GetPane(self.panels["data_panel"].window_name)
         if style != GUIFRAME.MANAGER_ON:
-            data_pane.Hide()
+            self._mgr.GetPane(self.panels["data_panel"].window_name).Hide()
         else:
-            data_pane.Show()
-        
-   
+            self._mgr.GetPane(self.panels["data_panel"].window_name).Show()
+            
         # Add the panels to the AUI manager
         for panel_class in panels:
@@ -601 +602 @@
             
         pane = self._mgr.GetPane(windowname)
-        #self._mgr.MaximizePane(pane)
-        #self._mgr.RestoreMaximizedPane()
+        self._mgr.MaximizePane(pane)
+        self._mgr.RestoreMaximizedPane()
         # Register for showing/hiding the panel
         wx.EVT_MENU(self, ID, self._on_view)
@@ -2044 +2045 @@
             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: