Changeset 19b5c5c9 in sasview

Timestamp:

Jul 14, 2011 2:27:37 PM (13 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:

ce180bd

Parents:

7f291a3

Message:

made changes to fit the implementation of SANSVIEWPATH env.

File:

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

guiframe/gui_manager.py

@@ -20 +20 @@
 # Try to find a local config
 import imp
-path = os.getcwd()
-if(os.path.isfile("%s/%s.py" % (path, 'local_config'))) or \
-    (os.path.isfile("%s/%s.pyc" % (path, 'local_config'))):
-    fObj, path_config, descr = imp.find_module('local_config', [path])
+tem_path = sys.path[0]
+if os.path.isfile(tem_path):
+    tem_path = os.path.dirname(tem_path)
+os.chdir(tem_path)
+PATH_APP = os.getcwd()
+if(os.path.isfile("%s/%s.py" % (PATH_APP, 'local_config'))) or \
+    (os.path.isfile("%s/%s.pyc" % (PATH_APP, 'local_config'))):
+    fObj, path_config, descr = imp.find_module('local_config', [PATH_APP])
     try:
         config = imp.load_module('local_config', fObj, path_config, descr) 
@@ -35 +39 @@
     # Try simply importing local_config
     import local_config as config
-#path = os.path.sys.path[0]
-PATH_APP = path
 
 #import compileall
 import py_compile
-c_name = os.path.join(path, 'custom_config.py')
-if(os.path.isfile("%s/%s.py" % (path, 'custom_config'))):
+
+c_name = os.path.join(PATH_APP, 'custom_config.py')
+if(os.path.isfile("%s/%s.py" % (PATH_APP, 'custom_config'))):
     py_compile.compile(file=c_name)
     #compileall.compile_dir(dir=path, force=True, quiet=0)
-    cfObj, path_cconfig, descr = imp.find_module('custom_config', [path]) 
+    cfObj, path_cconfig, descr = imp.find_module('custom_config', [PATH_APP]) 
 try:
-    custom_config = imp.load_module('custom_config', cfObj, path, descr)
+    custom_config = imp.load_module('custom_config', cfObj, PATH_APP, descr)
 except:
     custom_config = None
@@ -976 +979 @@
         
         self.panel = ConfDialog(parent=self, gui=self.__gui_style)
-        #self.panel.Bind(wx.EVT_CLOSE, self._draw_masked_model)
         self.panel.ShowModal()
         #wx.PostEvent(self.parent, event)
         
-    def _draw_masked_model(self,event):
-        """
-        Draw model image w/mask
-        """
-        event.Skip()
-
-        is_valid_qrange = self._update_paramv_on_fit()
-
-        if is_valid_qrange:
-            # try re draw the model plot if it exists
-            self._draw_model()
-            self.panel.Destroy() # frame
-            self.set_npts2fit()
-        elif self.model == None:
-            self.panel.Destroy()
-            self.set_npts2fit()
-            msg= "No model is found on updating MASK in the model plot... "
-            wx.PostEvent(self.parent.parent, StatusEvent(status = msg ))
-        else:
-            msg = ' Please consider your Q range, too.'
-            self.panel.ShowMessage(msg)
 
     def _add_menu_window(self):
@@ -2524 +2505 @@
         self.frame.Hide()
         self.s_screen = None
+        temp_path = None
         try:
             # make sure the current dir is App dir when it starts
-            temp_path = os.path.dirname(os.path.sys.path[0])
+            temp_path = os.path.dirname(sys.path[0])
             os.chdir(temp_path)
         except:
             pass
+        try:
+            self.open_file()
+        except:
+            msg = "%s Could not load " % str(APPLICATION_NAME)
+            msg += "input file from command line.\n"
+            logging.error(msg)
         # Display a splash screen on top of the frame.
         if len(sys.argv) > 1 and '--time' in sys.argv[1:]:
@@ -2546 +2534 @@
             logging.error(msg)
             self.frame.Show()
-           
+ 
         if hasattr(self.frame, 'special'):
             self.frame.special.SetCurrent()
         self.SetTopWindow(self.frame)
-        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
 
@@ -2565 +2548 @@
         if len(sys.argv) >= 2:
             cmd = sys.argv[0].lower()
-            if os.path.isfile(cmd):
-                basename  = os.path.basename(cmd)
-                app_py = str(APPLICATION_NAME).lower() + '.py'
-                app_exe = str(APPLICATION_NAME).lower() + '.exe'
-                app_app = str(APPLICATION_NAME).lower() + '.app'
-                if basename.lower() in [app_py, app_exe, app_app]:
+            basename  = os.path.basename(cmd)
+            app_base = str(APPLICATION_NAME).lower()
+            if os.path.isfile(cmd) or basename.lower() == app_base:
+                app_py = app_base + '.py'
+                app_exe = app_base + '.exe'
+                app_app = app_base + '.app'
+                if basename.lower() in [app_py, app_exe, app_app, app_base]:
                     input_file = sys.argv[1]
         if input_file is None: