Changeset efe730d in sasview for src/sas/sasview/sasview.py

Timestamp:

Jun 25, 2016 2:07:33 AM (8 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:

899e084

Parents:

9501661

git-author:

Paul Kienzle <pkienzle@…> (06/25/16 00:23:59)

git-committer:

Paul Kienzle <pkienzle@…> (06/25/16 02:07:33)

Message:

move sasview to src/sas/sasview and refactor bundled apps for easier debugging

File:

• src/sas/sasview/sasview.py (moved) (moved from sasview/sasview.py) (4 diffs)

src/sas/sasview/sasview.py

@@ -16 +16 @@
 import traceback
 
+log_file = os.path.join(os.path.expanduser("~"), 'sasview.log')
 logging.basicConfig(level=logging.INFO,
                     format='%(asctime)s %(levelname)s %(message)s',
-                    filename=os.path.join(os.path.expanduser("~"),
-                                          'sasview.log'))
+                    filename=log_file,
+)
 logging.captureWarnings(True)
 
@@ -75 +76 @@
     logging.error("Wx version: error reading version")
 
-import wxcruft
+from . import wxcruft
 wxcruft.call_later_fix()
 #wxcruft.trace_new_id()
-
 #Always use private .matplotlib setup to avoid conflicts with other
 #uses of matplotlib
-#Have to check if .sasview exists first 
-sasdir = os.path.join(os.path.expanduser("~"),'.sasview')
-if not os.path.exists(sasdir):
-    os.mkdir(sasdir)
-mplconfigdir = os.path.join(os.path.expanduser("~"),'.sasview','.matplotlib')
+
+import sas.sasgui
+mplconfigdir = os.path.join(sas.sasgui.get_user_dir(), '.matplotlib')
 if not os.path.exists(mplconfigdir):
     os.mkdir(mplconfigdir)
@@ -91 +89 @@
 reload(sys)
 sys.setdefaultencoding("iso-8859-1")
+
+
 from sas.sasgui.guiframe import gui_manager
-from sas.sasgui.guiframe.gui_style import GUIFRAME
-from welcome_panel import WelcomePanel
-# For py2exe, import config here
-import local_config
+from .welcome_panel import WelcomePanel
 PLUGIN_MODEL_DIR = 'plugin_models'
 APP_NAME = 'SasView'
@@ -175 +172 @@
     if len(sys.argv) > 1:
         ## 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())
+        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:]