Changeset 31c5b58 in sasview for run.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:

• run.py (modified) (5 diffs, 1 prop)

run.py

@@ -57 +57 @@
     # build_path comes from context
     path = joinpath(build_path, *modname.split('.'))+ext
-    #print "importing", modname, "from", path
     return imp.load_dynamic(modname, path)
 
@@ -77 +76 @@
     os.environ['SASVIEW_DOC_PATH'] = joinpath(build_path, "doc")
 
-    # Make sure that we have a private version of mplconfig
-    #mplconfig = joinpath(abspath(dirname(__file__)), '.mplconfig')
-    #os.environ['MPLCONFIGDIR'] = mplconfig
-    #if not os.path.exists(mplconfig): os.mkdir(mplconfig)
-    #import matplotlib
-    #matplotlib.use('Agg')
-    #print matplotlib.__file__
-    #import pylab; pylab.hold(False)
     # add periodictable to the path
     try: import periodictable
@@ -91 +82 @@
     try: import bumps
     except: addpath(joinpath(root, '..','bumps'))
-
-    # select wx version
-    #addpath(os.path.join(root, '..','wxPython-src-3.0.0.0','wxPython'))
 
     # Build project if the build directory does not already exist.
@@ -112 +100 @@
     sas.sasview = import_package('sas.sasview', joinpath(root,'sasview'))
 
-    # The sas.models package Compiled Model files should be pulled in from the build directory even though
-    # the source is stored in src/sas/models.
-
     # Compiled modules need to be pulled from the build directory.
     # Some packages are not where they are needed, so load them explicitly.
@@ -129 +114 @@
     sys.path.append(build_path)
 
-    #print "\n".join(sys.path)
-
 if __name__ == "__main__":
     prepare()
-    from sas.sasview.sasview import run
+    from sas.qtgui.MainWindow import run
     run()