HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r1505:4bf34af32858

Few fixes to build on CentOS 7 and adds simple example of virtual product...

jeandet -

r1505:4bf34af32858

parent child

Context file:

r1505:4bf34af32858

app/PySide2-bindings/plugins/Demo-virtual-product.py created 644 +38 0

@@ -0,0 +1,38
	1	import traceback
	2	from SciQLopBindings import PyDataProvider, Product, VectorTimeSerie, ScalarTimeSerie, DataSeriesType
	3	import numpy as np
	4	from spwc.cache import _cache
	5	from spwc.common.datetime_range import DateTimeRange
	6	from datetime import datetime, timedelta, timezone
	7	from spwc.common.variable import SpwcVariable
	8	from spwc.amda import AMDA
	9
	10	amda = AMDA()
	11
	12
	13	def vp_make_scalar(var=None):
	14	if var is None:
	15	return (((np.array([]), np.array([])), np.array([])), DataSeriesType.SCALAR)
	16	else:
	17	return (((var.time, np.array([])), var.data), DataSeriesType.SCALAR)
	18
	19	class DemoVP(PyDataProvider):
	20	def __init__(self):
	21	super().__init__()
	22	self.register_products([Product("/VP/thb_fgm_gse_mod",[],{"type":"scalar"})])
	23
	24	def get_data(self,metadata,start,stop):
	25	try:
	26	tstart = datetime.fromtimestamp(start, tz=timezone.utc)
	27	tend = datetime.fromtimestamp(stop, tz=timezone.utc)
	28	thb_bs = amda.get_parameter(start_time=tstart, stop_time=tend, parameter_id='thb_bs', method="REST")
	29	thb_bs.data = np.sqrt((thb_bs.data*thb_bs.data).sum(axis=1))
	30	return vp_make_scalar(thb_bs)
	31	except Exception as e:
	32	print(traceback.format_exc())
	33	print(f"Error in {__file__} ",str(e))
	34	return (((np.array([]), np.array([])), np.array([])), ts_type)
	35
	36
	37	t=DemoVP()
	38

app/PySide2-bindings/meson.build +5 0

             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(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')
+            message('shiboken2_build_flags = @0@'.format(shiboken2_build_flags))
+            message('shiboken2_link_flags = @0@'.format(shiboken2_link_flags))
+            message('shiboken2_typesystem = @0@'.format(shiboken2_typesystem))
             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_dep)

app/PySide2-bindings/plugins/meson.build +1 0

             configure_file(input:'TestPlugin.py', output:'TestPlugin.py', copy:true)
             configure_file(input:'SPWC-Amda.py', output:'SPWC-Amda.py', copy:true)
+            configure_file(input:'Demo-virtual-product.py', output:'Demo-virtual-product.py', copy:true)

app/PySide2-bindings/shiboken-helper.py 755 ➡ 644 +3 -3

             #!/bin/env python3
             import os
             import sys
             import importlib
             import argparse
             from glob import glob
             shiboken2_generator = importlib.import_module('shiboken2_generator')
             shiboken2 = importlib.import_module('shiboken2')
             PySide2 = importlib.import_module('PySide2')
             parser = argparse.ArgumentParser(description='PySide2/shiboken2 ')
             group = parser.add_mutually_exclusive_group()
             group.add_argument('--libs',action='store_true')
             group.add_argument('--includes',action='store_true')
             parser.add_argument('--modules')
             group.add_argument('--typesystem', action='store_true')
             args = parser.parse_args()
             def first_existing_path(path_list):
                 return next((path for path in path_list if os.path.exists(path)), None)
             if shiboken2.__file__ and shiboken2_generator.__file__ and PySide2.__file__:
                 PySide2_inc = first_existing_path([PySide2.__path__[0]+'/include','/usr/include/PySide2'])
                 PySide2_typesys = first_existing_path([PySide2.__path__[0]+'/typesystems','/usr/share/PySide2/typesystems'])
                 PySide2_includes = first_existing_path([PySide2.__path__[0]+'/include','/usr/include/PySide2'])
-                shiboken2_includes = first_existing_path([shiboken2.__path__[0]+'/include','/usr/include/shiboken2'])
+                shiboken2_includes = first_existing_path([shiboken2.__path__[0]+'/include',shiboken2_generator.__path__[0]+'/include','/usr/include/shiboken2'])
                 if args.typesystem:
                     print(PySide2_typesys)
                 modules = args.modules.split(',')
                 if args.libs:
-                    main_lib = (glob(shiboken2.__path__[0]+'/libshiboken2'+importlib.machinery.EXTENSION_SUFFIXES[0])+glob("/usr/lib64/"+'/libshiboken2'+importlib.machinery.EXTENSION_SUFFIXES[0]))[0]
+                    main_lib = (glob(shiboken2.__path__[0]+'/libshiboken2'+importlib.machinery.EXTENSION_SUFFIXES[0]+'*')+glob("/usr/lib64/"+'/libshiboken2'+importlib.machinery.EXTENSION_SUFFIXES[0]+'*'))[0]
-                    main_lib += " "+(glob(PySide2.__path__[0]+'/libpyside2'+importlib.machinery.EXTENSION_SUFFIXES[0])+glob("/usr/lib64/"+'/libpyside2'+importlib.machinery.EXTENSION_SUFFIXES[0]))[0]
+                    main_lib += " "+(glob(PySide2.__path__[0]+'/libpyside2'+importlib.machinery.EXTENSION_SUFFIXES[0]+'*')+glob("/usr/lib64/"+'/libpyside2'+importlib.machinery.EXTENSION_SUFFIXES[0]+'*'))[0]
                     modules_libs = [importlib.import_module(f'PySide2.{module}').__file__ for module in modules]
                     print(" ".join([main_lib]+ modules_libs))
                 if args.includes:
                     modules_incs = [f"-I{PySide2_includes}/{module}" for module in modules]
                     print(" ".join([f"-I{PySide2_includes} -I{shiboken2_includes}"]+ modules_incs))

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