Merge branch 'master' into getegui

Former-commit-id: 065e247812c321b35f97f7784276c108f7ff8ab3

Author: XiaohaoYang

dpx/srxplanargui/calibration.py

@@ -46,12 +46,11 @@
 from diffpy.srxplanar.selfcalibrate import selfCalibrate
 from diffpy.srxplanar.srxplanarconfig import checkMax
 
-try:
-    import pyFAI
+from dpx.confutils.tools import module_exists_lower
+if module_exists_lower('pyfai'):
     missingpyFAI = False
-except:
+else:
     missingpyFAI = True
-    print "Please download and install pyFAI to do the calibration"
 
 class CalibrationHandler(Handler):
 

dpx/srxplanargui/srxguiapp.py

@@ -35,6 +35,7 @@
     import traitsui.wx.constants
     traitsui.wx.constants.WindowColor = wx.Colour(244, 243, 238)
 else:
+    os.environ['QT_API'] = 'pyside'
     ETSConfig.toolkit = 'qt4'
     from pyface.qt import QtGui, QtCore