Changeset 97f05432 in sasview

Timestamp:

Oct 7, 2016 3:45:57 PM (8 years ago)

Author:

davidm

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:

7451b88

Parents:

e207c3f (diff), 2366fb2 (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 branch 'ESS_GUI' of ​https://github.com/SasView/sasview into ESS_GUI

Location:

src/sas/qtgui

Files:

• MainWindow.py (modified) (2 diffs, 1 prop)
• AboutBox.py (modified) (1 diff)
• LocalConfig.py (modified) (2 diffs)
• UI/AboutUI.ui (modified) (3 diffs)
• UnitTesting/AboutBoxTest.py (modified) (1 diff)
• images/ansto_logo.png (added)
• images/icons/ansto_logo.png (added)
• images/images.qrc (modified) (1 diff)

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

src/sas/qtgui/AboutBox.py

@@ -60 +60 @@
         self.cmdLinkILL.clicked.connect(functools.partial(
             GuiUtils.openLink, LocalConfig._ill_url))
+        self.cmdLinkANSTO.clicked.connect(functools.partial(
+            GuiUtils.openLink, LocalConfig._ansto_url))
 
         self.cmdOK.clicked.connect(self.close)

src/sas/qtgui/LocalConfig.py

@@ -69 +69 @@
 _ess_logo = os.path.join(icon_path, "ess_logo.png")
 _ill_logo = os.path.join(icon_path, "ill_logo.png")
+_ansto_logo = os.path.join(icon_path, "ansto_logo.png")
 _nsf_logo = os.path.join(icon_path, "nsf_logo.png")
 _danse_logo = os.path.join(icon_path, "danse_logo.png")
@@ -79 +80 @@
 _ess_url = "http://ess-scandinavia.eu/"
 _ill_url = "http://www.ill.eu/"
+_ansto_url = "http://www.ansto.gov.au/"
 _danse_url = "http://www.cacr.caltech.edu/projects/danse/release/index.html"
 _inst_url = "http://www.utk.edu"

src/sas/qtgui/UI/AboutUI.ui

@@ -7 +7 @@
     <x>0</x>
     <y>0</y>
-    <width>695</width>
+    <width>1107</width>
     <height>449</height>
    </rect>
@@ -160 +160 @@
       </widget>
      </item>
+     <item row="0" column="7">
+      <widget class="QPushButton" name="cmdLinkANSTO">
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset resource="../images/images.qrc">
+         <normaloff>:/about/ansto_logo.png</normaloff>:/about/ansto_logo.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>175</width>
+         <height>48</height>
+        </size>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
@@ -217 +234 @@
      </property>
      <property name="text">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This work originally developed as part of the DANSE project funded by the NSF under grant DMR-0520547, and currently maintained by NIST, UMD, ORNL, ISIS, ESS and ILL.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This work originally developed as part of the DANSE project funded by the NSF under grant DMR-0520547, and currently maintained by NIST, UMD, ORNL, ISIS, ESS, ILL and last but not least ANSTO.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="wordWrap">

src/sas/qtgui/UnitTesting/AboutBoxTest.py

@@ -75 +75 @@
                 LocalConfig._ess_url,
                 LocalConfig._ill_url,
+                LocalConfig._ansto_url,
                 LocalConfig._inst_url]
 

src/sas/qtgui/images/images.qrc

@@ -1 +1 @@
 <RCC>
   <qresource prefix="about">
+    <file>ansto_logo.png</file>
     <file>danse_logo.png</file>
     <file>ess_logo.png</file>