Changeset 31c5b58 in sasview for src/sas/qtgui/GuiUtils.py

Timestamp:

Nov 25, 2016 6:56:41 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

3968752

Parents:

14d9c7b

Message:

Refactored to allow running with run.py.
Minor fixes to plotting.

File:

• src/sas/qtgui/GuiUtils.py (modified) (7 diffs)

src/sas/qtgui/GuiUtils.py

@@ -46 +46 @@
     if os.path.isfile(os.path.join(app_path, "custom_config.py")):
         app_path = os.path.abspath(app_path)
-        logging.info("Using application path: %s", app_path)
+        #logging.info("Using application path: %s", app_path)
         return app_path
 
     # Next, try the current working directory
     if os.path.isfile(os.path.join(os.getcwd(), "custom_config.py")):
-        logging.info("Using application path: %s", os.getcwd())
+        #logging.info("Using application path: %s", os.getcwd())
         return os.path.abspath(os.getcwd())
 
@@ -58 +58 @@
     # clean all these module variables and put them into a config class
     # that can be passed by sasview.py.
-    logging.info(sys.executable)
-    logging.info(str(sys.argv))
+    #logging.info(sys.executable)
+    #logging.info(str(sys.argv))
     from sas import sasview as sasview
     app_path = os.path.dirname(sasview.__file__)
-    logging.info("Using application path: %s", app_path)
+    #logging.info("Using application path: %s", app_path)
     return app_path
 
@@ -84 +84 @@
         config_module = imp.load_module(confg_file, fObj, path_config, descr)
     except ImportError:
-        logging.error("Error loading %s/%s: %s" % (path, confg_file, sys.exc_value))
+        pass
+        #logging.error("Error loading %s/%s: %s" % (path, confg_file, sys.exc_value))
     finally:
         if fObj is not None:
             fObj.close()
-    logging.info("GuiManager loaded %s/%s" % (path, confg_file))
+    #logging.info("GuiManager loaded %s/%s" % (path, confg_file))
     return config_module
 
@@ -100 +101 @@
 # application or in the installation directory
 config = _find_local_config('local_config', PATH_APP)
+
 if config is None:
     config = _find_local_config('local_config', os.getcwd())
@@ -105 +107 @@
         # Didn't find local config, load the default
         import sas.sasgui.guiframe.config as config
-        logging.info("using default local_config")
+        #logging.info("using default local_config")
     else:
-        logging.info("found local_config in %s", os.getcwd())
+        pass
+        #logging.info("found local_config in %s", os.getcwd())
 else:
-    logging.info("found local_config in %s", PATH_APP)
+    pass
+    #logging.info("found local_config in %s", PATH_APP)
 
 
@@ -119 +123 @@
     if custom_config is None:
         msgConfig = "Custom_config file was not imported"
-        logging.info(msgConfig)
+        #logging.info(msgConfig)
     else:
-        logging.info("using custom_config in %s", os.getcwd())
+        pass
+        #logging.info("using custom_config in %s", os.getcwd())
 else:
-    logging.info("using custom_config from %s", c_conf_dir)
+    pass
+    #logging.info("using custom_config from %s", c_conf_dir)
 
 #read some constants from config
@@ -350 +356 @@
         msg = "Unable to find min/max of \n data named %s" % \
                     data.filename
-        logging.error(msg)
+        #logging.error(msg)
         raise ValueError, msg