Changeset ca6659f in sasview for sasview

Timestamp:

Aug 10, 2016 7:05:32 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:

9d17c1d

Parents:

ebc1407 (diff), c3e4e213 (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 file-converter

Location:

sasview

Files:

• setup_exe.py (modified) (2 diffs)
• sasview.py (modified) (5 diffs)

sasview/setup_exe.py

@@ -242 +242 @@
 if os.path.isfile(f):
     data_files.append(('.', [f]))
+
+# atlas DLL required by matplotlib 11.1
+# ** REVISIT WHEN MOVING TO ANACONDA **
+f = "c:\\python27\\lib\\site-packages\\numpy\\core\\numpy-atlas.dll"
+if os.path.isfile(f):
+    data_files.append(('.', [f]))
     
 if os.path.isfile("BUILD_NUMBER"):
@@ -332 +338 @@
     # numpy 1.8 openmp bindings (still seems to use all the cores without them)
     #'libiomp5md.dll', 'libifcoremd.dll', 'libmmd.dll', 'svml_dispmd.dll','libifportMD.dll',
+    'numpy-atlas.dll',
     # microsoft C runtime (not allowed to ship with the app; need to ship vcredist
     'msvcp90.dll',

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   
+        #Calculator perspective
         try:
             import sas.sasgui.perspectives.calculator as module
@@ -152 +152 @@
         except:
             logging.error("%s: could not find Calculator plug-in module"% \
+                                                        APP_NAME)
+            logging.error(traceback.format_exc())
+
+        # File converter tool
+        try:
+            import sas.sasgui.perspectives.file_converter as module
+            converter_plug = module.Plugin()
+            self.gui.add_perspective(converter_plug)
+        except:
+            logging.error("%s: could not find File Converter plug-in module"% \
                                                         APP_NAME)
             logging.error(traceback.format_exc())
@@ -191 +201 @@
 if __name__ == "__main__":
     run()
-