Changeset 914ba0a in sasview for src/sas/sasview/sasview.py

Timestamp:

May 2, 2017 3:58:01 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

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, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

d66dbcc

Parents:

74d9780 (diff), 658dd57 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge with master

File:

• src/sas/sasview/sasview.py (modified) (10 diffs)

src/sas/sasview/sasview.py

@@ +1 @@
+# -*- coding: utf-8 -*-
 """
 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.
+# 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.
 #
-#See the license text in license.txt
+# See the license text in license.txt
 #
-#copyright 2009, University of Tennessee
+# copyright 2009, University of Tennessee
 ################################################################################
 import os
+import os.path
 import sys
-import logging
 import traceback
 
+from sas.sasview.logger_config import SetupLogger
 
 reload(sys)
 sys.setdefaultencoding("iso-8859-1")
 
-
-class StreamToLogger(object):
-    """
-        File-like stream object that redirects writes to a logger instance.
-    """
-    def __init__(self, logger, log_level=logging.INFO):
-        self.logger = logger
-        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)
-        for line in buf.rstrip().splitlines():
-            self.logger.log(self.log_level, line.rstrip())
+logger = SetupLogger(__name__).config_production()
+# Log the start of the session
+logger.info(" --- SasView session started ---")
+# Log the python version
+logger.info("Python: %s" % sys.version)
+
 
 PLUGIN_MODEL_DIR = 'plugin_models'
@@ -66 +56 @@
             self.gui.add_perspective(fitting_plug)
         except Exception:
-            logging.error("%s: could not find Fitting plug-in module"% APP_NAME)
-            logging.error(traceback.format_exc())
+            logger.error("%s: could not find Fitting plug-in module"% APP_NAME)
+            logger.error(traceback.format_exc())
 
         # P(r) perspective
@@ -75 +65 @@
             self.gui.add_perspective(pr_plug)
         except:
-            logging.error("%s: could not find P(r) plug-in module"% APP_NAME)
-            logging.error(traceback.format_exc())
-
-        #Invariant perspective
+            logger.error("%s: could not find P(r) plug-in module"% APP_NAME)
+            logger.error(traceback.format_exc())
+
+        # Invariant perspective
         try:
             import sas.sasgui.perspectives.invariant as module
@@ -84 +74 @@
             self.gui.add_perspective(invariant_plug)
         except Exception as e :
-            logging.error("%s: could not find Invariant plug-in module"% \
+            logger.error("%s: could not find Invariant plug-in module"% \
                           APP_NAME)
-            logging.error(traceback.format_exc())
-
-        #Calculator perspective
+            logger.error(traceback.format_exc())
+
+        # Corfunc perspective
+        try:
+            import sas.sasgui.perspectives.corfunc as module
+            corfunc_plug = module.Plugin()
+            self.gui.add_perspective(corfunc_plug)
+        except:
+            logger.error("Unable to load corfunc module")
+
+        # Calculator perspective
         try:
             import sas.sasgui.perspectives.calculator as module
@@ -94 +92 @@
             self.gui.add_perspective(calculator_plug)
         except:
-            logging.error("%s: could not find Calculator plug-in module"% \
+            logger.error("%s: could not find Calculator plug-in module"% \
                                                         APP_NAME)
-            logging.error(traceback.format_exc())
-
+            logger.error(traceback.format_exc())
+
+        # File converter tool
+        try:
+            import sas.sasgui.perspectives.file_converter as module
+            converter_plug = module.Plugin()
+            self.gui.add_perspective(converter_plug)
+        except:
+            logger.error("%s: could not find File Converter plug-in module"% \
+                                                        APP_NAME)
+            logger.error(traceback.format_exc())
 
         # Add welcome page
@@ -138 +145 @@
     WX_ENV_VAR = "SASVIEW_WX_VERSION"
     if WX_ENV_VAR in os.environ:
-        logging.info("You have set the %s environment variable to %s." % \
+        logger.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]):
-            logging.info("Version %s of wxPython is installed, so using that version." % os.environ[WX_ENV_VAR])
+            logger.info("Version %s of wxPython is installed, so using that version." % os.environ[WX_ENV_VAR])
             wxversion.select(os.environ[WX_ENV_VAR])
         else:
-            logging.error("Version %s of wxPython is not installed, so using default version." % os.environ[WX_ENV_VAR])
+            logger.error("Version %s of wxPython is not installed, so using default version." % os.environ[WX_ENV_VAR])
     else:
-        logging.info("You have not set the %s environment variable, so using default version of wxPython." % WX_ENV_VAR)
+        logger.info("You have not set the %s environment variable, so using default version of wxPython." % WX_ENV_VAR)
 
     import wx
 
     try:
-        logging.info("Wx version: %s" % wx.__version__)
+        logger.info("Wx version: %s" % wx.__version__)
     except:
-        logging.error("Wx version: error reading version")
+        logger.error("Wx version: error reading version")
 
     from . import wxcruft
@@ -165 +172 @@
 def setup_mpl():
     import sas.sasgui
+    # Always use private .matplotlib setup to avoid conflicts with other
     mplconfigdir = os.path.join(sas.sasgui.get_user_dir(), '.matplotlib')
     if not os.path.exists(mplconfigdir):
@@ -176 +184 @@
 
 
+    from matplotlib import backend_bases
+    backend_bases.FigureCanvasBase.filetypes.pop('pgf', None)
+
 def run_gui():
     """
@@ -197 +208 @@
     else:
         # Run sasview as a python script interpreter
+        ## Run sasview as an interactive python interpreter
+        # if sys.argv[1] == "-i":
+        #    sys.argv = ["ipython", "--pylab"]
+        #    from IPython import start_ipython
+        #    sys.exit(start_ipython())
         thing_to_run = sys.argv[1]
         sys.argv = sys.argv[1:]
@@ -205 +221 @@
             runpy.run_module(thing_to_run, run_name="__main__")
 
+
 if __name__ == "__main__":
     run_gui()
-