Changeset 2366fb2 in sasview

Timestamp:

Oct 6, 2016 5:49:17 PM (8 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:

fca1f50

Parents:

630155bd

git-author:

Piotr Rozyczko <rozyczko@…> (10/06/16 17:48:06)

git-committer:

Piotr Rozyczko <rozyczko@…> (10/06/16 17:49:17)

Message:

Added a temporary solution for running the new GUI in place.

File:

• src/sas/qtgui/MainWindow.py (modified) (2 diffs, 1 prop)

src/sas/qtgui/MainWindow.py

@@ -9 +9 @@
 import SasviewLogger
 
+def updatePaths():
+    # Update paths
+    # TEMPORARY KLUDGE TO ALLOW INSTALL-LESS RUNS
+    # THIS WILL GO AWAY ONCE MERGED
+    #######################################################################
+    import imp
+    import os
+    import sys
+    def addpath(path):
+        """
+        Add a directory to the python path environment, and to the PYTHONPATH
+        environment variable for subprocesses.
+        """
+        path = os.path.abspath(path)
+        if 'PYTHONPATH' in os.environ:
+            PYTHONPATH = path + os.pathsep + os.environ['PYTHONPATH']
+        else:
+            PYTHONPATH = path
+        os.environ['PYTHONPATH'] = PYTHONPATH
+        sys.path.insert(0, path)
+
+    def import_package(modname, path):
+        """Import a package into a particular point in the python namespace"""
+        mod = imp.load_source(modname, os.path.abspath(os.path.join(path,'__init__.py')))
+        sys.modules[modname] = mod
+        mod.__path__ = [os.path.abspath(path)]
+        return mod
+
+    root = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", ".."))
+    addpath(os.path.join(root, 'src'))
+    #addpath(os.path.join(root, '../sasmodels/'))
+    import sas
+    from distutils.util import get_platform
+    sas.sasview = import_package('sas.sasview', os.path.join(root,'sasview'))
+    platform = '%s-%s'%(get_platform(),sys.version[:3])
+    build_path = os.path.join(root, 'build','lib.'+platform)
+    sys.path.append(build_path)
+    #######################################################################
+
 class MainSasViewWindow(QtGui.QMainWindow, Ui_MainWindow):
     # Main window of the application
@@ -18 +57 @@
         self.workspace = QtGui.QWorkspace(self)
         self.setCentralWidget(self.workspace)
+
+        updatePaths()
 
         # Create the gui manager