Changeset 415fb82 in sasview for sasview/sasview.py

Timestamp:

Apr 1, 2015 12:57:33 PM (9 years ago)

Author:

krzywon

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:

5f0be1f

Parents:

c4a7660

Message:

Fixed the perspectives loading error. Cleaned up the sasview.log by
removing any extra linefeeds/carraige returns and added a start session
and end session message.

File:

• sasview/sasview.py (modified) (14 diffs)

sasview/sasview.py

@@ -1 @@
-
+"""
+Base module for loading and running the main SasView application.
+"""
 ################################################################################
 #This software was developed by the University of Tennessee as part of the
 #Distributed Data Analysis of Neutron Scattering Experiments (DANSE)
-#project funded by the US National Science Foundation. 
+#project funded by the US National Science Foundation.
 #
 #See the license text in license.txt
@@ -28 +30 @@
         self.log_level = log_level
         self.linebuf = ''
- 
+
     def write(self, buf):
+        """
+        Main logging method
+        """
         # Write the message to stdout so we can see it when running interactively
         sys.stdout.write(buf)
@@ -38 +43 @@
 sl = StreamToLogger(stderr_logger, logging.ERROR)
 sys.stderr = sl
+
+# Log the start of the session
+logging.info(" --- SasView session started ---")
 
 # Log the python version
@@ -49 +57 @@
 WX_ENV_VAR = "SASVIEW_WX_VERSION"
 if WX_ENV_VAR in os.environ:
-    logging.info("You have set the %s environment variable to %s." % (WX_ENV_VAR, os.environ[WX_ENV_VAR]))
+    logging.info("You have set the %s environment variable to %s." % \
+                 (WX_ENV_VAR, os.environ[WX_ENV_VAR]))
     import wxversion
     if wxversion.checkInstalled(os.environ[WX_ENV_VAR]):
@@ -64 +73 @@
 except:
     logging.error("Wx version: error reading version")
-    
-# The below will make sure that sasview application uses the matplotlib font 
-# bundled with sasview. 
+
+# The below will make sure that sasview application uses the matplotlib font
+# bundled with sasview.
 if hasattr(sys, 'frozen'):
     mplconfigdir = os.path.join(os.path.expanduser("~"), '.matplotlib')
@@ -76 +85 @@
 from sas.guiframe import gui_manager
 from sas.guiframe.gui_style import GUIFRAME
-from welcome_panel import WelcomePanel
+from sas.sasview.welcome_panel import WelcomePanel
 # For py2exe, import config here
-import local_config
+import sas.sasview.local_config
 PLUGIN_MODEL_DIR = 'plugin_models'
 APP_NAME = 'SasView'
@@ -89 +98 @@
 class SasView():
     """
+    Main class for running the SasView application
     """
     def __init__(self):
@@ -94 +104 @@
         """
         #from gui_manager import ViewApp
-        self.gui = SasViewApp(0) 
+        self.gui = SasViewApp(0)
         # Set the application manager for the GUI
         self.gui.set_manager(self)
@@ -109 +119 @@
             fitting_plug = module.Plugin()
             self.gui.add_perspective(fitting_plug)
-        except Exception as inst:
+        except Exception:
             logging.error("%s: could not find Fitting plug-in module"% APP_NAME)
             logging.error(traceback.format_exc())
@@ -115 +125 @@
         # P(r) perspective
         try:
-            import sas.perspectives.pr as module    
+            import sas.perspectives.pr as module
             pr_plug = module.Plugin(standalone=False)
             self.gui.add_perspective(pr_plug)
@@ -124 +134 @@
         #Invariant perspective
         try:
-            import sas.perspectives.invariant as module    
+            import sas.perspectives.invariant as module
             invariant_plug = module.Plugin(standalone=False)
             self.gui.add_perspective(invariant_plug)
         except:
-            raise
             logging.error("%s: could not find Invariant plug-in module"% \
                           APP_NAME)
@@ -135 +144 @@
         #Calculator perspective   
         try:
-            import sas.perspectives.calculator as module    
+            import sas.perspectives.calculator as module
             calculator_plug = module.Plugin(standalone=False)
             self.gui.add_perspective(calculator_plug)
@@ -143 +152 @@
             logging.error(traceback.format_exc())
 
-            
+
         # Add welcome page
         self.gui.set_welcome_panel(WelcomePanel)
-      
+
         # Build the GUI
         self.gui.build_gui()
-        # delete unused model folder    
+        # delete unused model folder
         self.gui.clean_plugin_models(PLUGIN_MODEL_DIR)
         # Start the main loop
@@ -156 +165 @@
 
 def run():
+    """
+    __main__ method for loading and running SasView
+    """
     from multiprocessing import freeze_support
     freeze_support()