Changeset 985ad94 in sasview for src

Timestamp:

Aug 4, 2017 5:17:06 AM (7 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:

ee18d33

Parents:

7adc2a8

Message:

Fixed pyinstaller build

Location:

src/sas/qtgui/Utilities

Files:

• GuiUtils.py (modified) (1 diff)
• IPythonWidget.py (modified) (1 diff, 1 prop)

src/sas/qtgui/Utilities/GuiUtils.py

@@ -96 +96 @@
 
 ## TODO: CHANGE FOR SHIPPED PATH IN RELEASE
-HELP_DIRECTORY_LOCATION = "docs/sphinx-docs/build/html"
+if os.path.splitext(sys.argv[0])[1].lower() != ".py":
+     HELP_DIRECTORY_LOCATION = "doc"
+else:
+     HELP_DIRECTORY_LOCATION = "docs/sphinx-docs/build/html"
 IMAGES_DIRECTORY_LOCATION = HELP_DIRECTORY_LOCATION + "/_images"
 

src/sas/qtgui/Utilities/IPythonWidget.py

@@ +1 @@
+def new_load_qt(api_options):
+    from PyQt4 import QtCore, QtGui, QtSvg
+    return QtCore, QtGui, QtSvg, 'pyqt'
+
+def qtconsole_new_load_qt(api_options):
+    from PyQt4 import QtCore, QtGui, QtSvg
+
+    # Alias PyQt-specific functions for PySide compatibility.
+    QtCore.Signal = QtCore.pyqtSignal
+    QtCore.Slot = QtCore.pyqtSlot
+    return QtCore, QtGui, QtSvg, 'pyqt'
+
+# Do some monkey patching to satisfy pyinstaller complaining
+# about pyside/pyqt confusion
+from IPython.external import  qt_loaders
+qt_loaders.load_qt = new_load_qt
+
+from qtconsole import qt_loaders as qtconsole_qt_loaders
+qtconsole_qt_loaders.load_qt = qtconsole_new_load_qt
+
+
 from qtconsole.rich_jupyter_widget import RichJupyterWidget
 from qtconsole.inprocess import QtInProcessKernelManager