HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r1503:3d021c06fb3c

Force PySide2 usage for QtConsole...

jeandet -

r1503:3d021c06fb3c

parent child

Context file:

r1503:3d021c06fb3c

app/PySide2-bindings/main.py +2 -1

             # This Python file uses the following encoding: utf-8
             import os
+            import os
+            os.environ['QT_API'] = 'pyside2'
             print(os.getcwd())
             import sys
             from PySide2.QtWidgets import QApplication, QMainWindow, QDockWidget
             from PySide2.QtCore import QSize, Qt
             from PySide2 import QtGui
-            import os
             sys.path.append(os.getcwd())
             from SciQLopBindings import SqpApplication, MainWindow, init_resources, load_plugins, SqpApplication_ctor
             from qtconsole.rich_ipython_widget import RichJupyterWidget
             from qtconsole.inprocess import QtInProcessKernelManager
             class IPythonWidget(RichJupyterWidget):
                 """Live IPython console widget.
                 .. image:: img/IPythonWidget.png
                 :param custom_banner: Custom welcome message to be printed at the top of
                    the console.
                 """
                 def __init__(self, parent=None, custom_banner=None, *args, **kwargs):
                     if parent is not None:
                         kwargs["parent"] = parent
                     super(IPythonWidget, self).__init__(*args, **kwargs)
                     if custom_banner is not None:
                         self.banner = custom_banner
                     self.setWindowTitle(self.banner)
                     self.kernel_manager = kernel_manager = QtInProcessKernelManager()
                     kernel_manager.start_kernel()
                     self.kernel_client = kernel_client = self._kernel_manager.client()
                     kernel_client.start_channels()
                     def stop():
                         kernel_client.stop_channels()
                         kernel_manager.shutdown_kernel()
                     self.exit_requested.connect(stop)
                 def sizeHint(self):
                     """Return a reasonable default size for usage in :class:`PlotWindow`"""
                     return QSize(500, 300)
                 def pushVariables(self, variable_dict):
                     """ Given a dictionary containing name / value pairs, push those
                     variables to the IPython console widget.
                     :param variable_dict: Dictionary of variables to be pushed to the
                         console's interactive namespace (```{variable_name: object, …}```)
                     """
                     self.kernel_manager.kernel.shell.push(variable_dict)
             class IPythonDockWidget(QDockWidget):
                 """Dock Widget including a :class:`IPythonWidget` inside
                 a vertical layout.
                 .. image:: img/IPythonDockWidget.png
                 :param available_vars: Dictionary of variables to be pushed to the
                     console's interactive namespace: ``{"variable_name": object, …}``
                 :param custom_banner: Custom welcome message to be printed at the top of
                     the console
                 :param title: Dock widget title
                 :param parent: Parent :class:`qt.QMainWindow` containing this
                     :class:`qt.QDockWidget`
                 """
                 def __init__(self, parent=None, available_vars=None, custom_banner=None,
                              title="Console"):
                     super(IPythonDockWidget, self).__init__(title, parent)
                     self.ipyconsole = IPythonWidget(custom_banner=custom_banner)
                     self.layout().setContentsMargins(0, 0, 0, 0)
                     self.setWidget(self.ipyconsole)
                     if available_vars is not None:
                         self.ipyconsole.pushVariables(available_vars)
                     self.ipyconsole.pushVariables({"blah":self})
                 def showEvent(self, event):
                     """Make sure this widget is raised when it is shown
                     (when it is first created as a tab in PlotWindow or when it is shown
                     again after hiding).
                     """
                     self.raise_()
             def print_process_id():
                 print ('Process ID is:', os.getpid())
             if __name__ == "__main__":
                 init_resources()
                 app = SqpApplication_ctor(sys.argv)
                 QtGui.qApp = app
                 load_plugins(app)
                 main_window = MainWindow()
                 term = IPythonDockWidget(available_vars={"app":app, "main_window":main_window}, custom_banner="SciQLop IPython Console ")
                 main_window.addDockWidget(Qt.BottomDockWidgetArea, term)
                 main_window.show()
                 for file in os.listdir('plugins'):
                     if os.path.isfile(f"plugins/{file}"):
                         exec(open(f"plugins/{file}").read())
                 sys.exit(app.exec_())

app/PySide2-bindings/meson.build +2 -2

             shiboken2 = find_program('shiboken2')
             qmake = find_program('qmake-qt5','qmake')
             pymod = import('python')
             python3 = pymod.find_installation('python3', modules:['PySide2','shiboken2', 'shiboken2_generator', 'numpy'])
-            python3_dep = python3.dependency()
+            python3_dep = python3.dependency(embed:true)
             numpy_inc = run_command(python3, '-c', 'import numpy;print(numpy.get_include())').stdout().strip('\n')
             qt5_modules = ['QtCore','QtGui','QtWidgets']
             qt_headers_path = run_command(qmake, '-query', 'QT_INSTALL_HEADERS').stdout().strip('\n')
             generated_srcs  = run_command(python3, 'src_list.py', 'meson').stdout().split(';')
             modules_arg = '--modules=@0@'.format(','.join(qt5_modules))
             shiboken2_build_flags = run_command(python3, 'shiboken-helper.py', '--includes', modules_arg).stdout().strip('\n').split(' ')
             shiboken2_link_flags  = run_command(python3, 'shiboken-helper.py', '--libs', modules_arg).stdout().strip('\n').split(' ')
             shiboken2_typesystem  = run_command(python3, 'shiboken-helper.py', '--typesystem').stdout().strip('\n')
             sciqlop_bindings_incs = shiboken2_build_flags + [
                 '-I'+meson.current_source_dir()+'/../../gui/include',
                 '-I'+meson.current_source_dir()+'/../../core/include',
                 '-I'+meson.current_source_dir()+'/../../subprojects/TimeSeries/include',
                 '-I'+meson.current_source_dir()+'/../../subprojects/cpp_utils/include',
                 '-I'+python3.get_path('include'),
                 '-I'+qt_headers_path,
                 '-I'+numpy_inc
                 ]
             foreach mod:qt5_modules
                 sciqlop_bindings_incs += ['-I'+qt_headers_path+'/'+mod]
             endforeach
             sciqlop_bindings_src = files('bindings.h', 'PyDataProvider.h', 'numpy_wrappers.h', 'numpy_wrappers.cpp')
             subdir('SciQLopBindings')
             subdir('plugins')
             shiboken_dep = declare_dependency(compile_args: shiboken2_build_flags, link_args: shiboken2_link_flags)
             sciqlop_bindings = python3.extension_module('SciQLopBindings',sciqlop_bindings_src,shiboken2_generator_out,
                     dependencies : [sciqlop_app_dep, python3_dep, shiboken_dep, cpp_utils_dep],
                     include_directories : numpy_inc
             )
             configure_file(input:'main.py', output:'main.py', copy:true)
-            executable('sciqlop', 'main.cpp', dependencies :python3.dependency())
+            executable('sciqlop', 'main.cpp', dependencies :python3_dep)

core +1 -1

	@@ -1,1 +1,1
	1	Subproject commit 3bce297cb13e8337d71adceae6737c104c66ad52		1	Subproject commit 5d9a96289564d5cba1a9ba21c901645d39fbcbad

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages