Changeset 2c627ad in sasview for sasview

Timestamp:

Aug 11, 2016 6:19:11 AM (8 years ago)

Author:

lewis

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

Children:

a47d0c8

Parents:

5a3c1f0 (diff), 713cc1c (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 'master' into corfunc

Location:

sasview

Files:

• __init__.py (modified) (1 diff)
• sasview.py (modified) (4 diffs)

sasview/__init__.py

@@ -3 +3 @@
 try:
     import subprocess
-    git_revision = subprocess.check_output(['git', 'rev-parse', 'HEAD'])
+    import os
+    FNULL = open(os.devnull, 'w')
+    git_revision = subprocess.check_output(['git', 'rev-parse', 'HEAD'],
+                    stderr=FNULL,
+                    shell=True)
     __build__ = str(git_revision).strip()
 except:

sasview/sasview.py

@@ -81 +81 @@
 #Always use private .matplotlib setup to avoid conflicts with other
 #uses of matplotlib
-#Have to check if .sasview exists first 
+#Have to check if .sasview exists first
 sasdir = os.path.join(os.path.expanduser("~"),'.sasview')
 if not os.path.exists(sasdir):
@@ -119 +119 @@
         # Fitting perspective
         try:
-            import sas.sasgui.perspectives.fitting as module    
+            import sas.sasgui.perspectives.fitting as module
             fitting_plug = module.Plugin()
             self.gui.add_perspective(fitting_plug)
@@ -145 +145 @@
             logging.error(traceback.format_exc())
 
-        #Calculator perspective   
+        # Corfunc perspective
+        try:
+            import sas.sasgui.perspectives.corfunc as module
+            corfunc_plug = module.Plugin()
+            self.gui.add_perspective(corfunc_plug)
+        except:
+            logging.error("Unable to load corfunc module")
+
+        #Calculator perspective
         try:
             import sas.sasgui.perspectives.calculator as module
@@ -191 +199 @@
 if __name__ == "__main__":
     run()
-