HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r1482:86da95850650

0

.gitignore +4 0

             build/
             CMakeLists.txt.user
             /.project
             core/src/Version.cpp
             core/include/Version.h
 rdparty/
             subprojects/*
             documentation/*
             **/.idea/*
             **/__pycache__/*
             *.srctrl*
+            *.kdev4
+            .vscode
+            *.pyc
+            *.swp

0

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

             shiboken2 = find_program('shiboken2')
             qmake = find_program('qmake-qt5','qmake')
             pymod = import('python')
             python3 = pymod.find_installation('python3', modules:['PySide2','shiboken2', 'shiboken2_generator'])
             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()+'/../../core/external/TimeSeries/include',
+                '-I'+meson.current_source_dir()+'/../../subprojects/TimeSeries/include',
                 '-I'+python3.get_path('include'),
                 '-I'+qt_headers_path
                 ]
             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')
             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.dependency(), shiboken_dep],
             )
             configure_file(input:'main.py', output:'main.py', copy:true)
             configure_file(input:'TestPlugin.py', output:'TestPlugin.py', copy:true)
             executable('sciqlop', 'main.cpp', dependencies :python3.dependency())

0

core +1 -1

	@@ -1,1 +1,1
	1	Subproject commit 9ff5f48e3d71ce2d3a8b2156f778f3f9be3ea389		1	Subproject commit 63c6ae3895dda76aabbc560a636a1f3d8d4d95bf

0

plugins/meson.build 0 -3

	@@ -1,3 +0,0
	1	#subdir('mockplugin')
	2	#subdir('python_providers')
	3	#subdir('amda')

0

CMakeLists.txt removed 0 -104

1

NO CONTENT: file was removed

0

SciQlopConsoleSh.bat removed 0 -22

1

NO CONTENT: file was removed

0

SciQlopEnv.bat removed 0 -18

1

NO CONTENT: file was removed

0

app/CMakeLists.txt removed 0 -61

1

NO CONTENT: file was removed

0

app/PySide2-bindings/CMakeLists.txt removed 0 -80

1

NO CONTENT: file was removed

0

app/vera-exclusions/exclusions.txt removed 0 -5

1

NO CONTENT: file was removed

0

cmake/FindPySide2.cmake removed 0 -84

1

NO CONTENT: file was removed

0

cmake/FindShiboken2.cmake removed 0 -106

1

NO CONTENT: file was removed

0

cmake/PythonInfo.cmake removed 0 -32

1

NO CONTENT: file was removed

0

cmake/sciqlop_tests.cmake removed 0 -11

1

NO CONTENT: file was removed

0

docs/CMakeLists.txt removed 0 -13

1

NO CONTENT: file was removed

0

external/pybind11 removed 0 -1

1

NO CONTENT: file was removed

0

formatting/.clang-format removed 0 -26

1

NO CONTENT: file was removed

0

formatting/cmake/FindClangFormat.cmake removed 0 -52

1

NO CONTENT: file was removed

0

formatting/cmake/Findvera++.cmake removed 0 -52

1

NO CONTENT: file was removed

0

formatting/cmake/use_clangformat.cmake removed 0 -138

1

NO CONTENT: file was removed

0

formatting/cmake/use_vera++.cmake removed 0 -342

1

NO CONTENT: file was removed

0

formatting/vera-exclusions/exclusions.txt removed 0 -19

1

NO CONTENT: file was removed

0

formatting/vera-root/profiles/default removed 0 -26

1

NO CONTENT: file was removed

0

formatting/vera-root/profiles/sciqlop removed 0 -26

1

NO CONTENT: file was removed

0

formatting/vera-root/scripts/rules/DUMP.tcl removed 0 -13

1

NO CONTENT: file was removed

0

formatting/vera-root/scripts/rules/IPSIS_C01.tcl removed 0 -65

1

NO CONTENT: file was removed

0

formatting/vera-root/scripts/rules/IPSIS_C09.tcl removed 0 -23

1

NO CONTENT: file was removed

0

formatting/vera-root/scripts/rules/IPSIS_C11.tcl removed 0 -103

1

NO CONTENT: file was removed

0

formatting/vera-root/scripts/rules/IPSIS_F11.tcl removed 0 -39

1

NO CONTENT: file was removed

0

formatting/vera-root/scripts/rules/IPSIS_F13.tcl removed 0 -73

1

NO CONTENT: file was removed

0

formatting/vera-root/scripts/rules/IPSIS_S01.tcl removed 0 -60

1

NO CONTENT: file was removed

0

formatting/vera-root/scripts/rules/IPSIS_S02.tcl removed 0 -45

1

NO CONTENT: file was removed

0

formatting/vera-root/scripts/rules/IPSIS_S03.tcl removed 0 -25

1

NO CONTENT: file was removed

0

formatting/vera-root/scripts/rules/IPSIS_S04_CLASS.tcl removed 0 -124

1

NO CONTENT: file was removed

0

formatting/vera-root/scripts/rules/IPSIS_S04_ENUM.tcl removed 0 -41

1

NO CONTENT: file was removed

0

formatting/vera-root/scripts/rules/IPSIS_S04_FILENAME.tcl removed 0 -13

1

NO CONTENT: file was removed

0

formatting/vera-root/scripts/rules/IPSIS_S04_METHOD.tcl removed 0 -152

1

NO CONTENT: file was removed

0

formatting/vera-root/scripts/rules/IPSIS_S04_NAMESPACE.tcl removed 0 -49

1

NO CONTENT: file was removed

0

formatting/vera-root/scripts/rules/IPSIS_S04_TYPEDEF.tcl removed 0 -87

1

NO CONTENT: file was removed

0

formatting/vera-root/scripts/rules/IPSIS_S04_VARIABLE.tcl removed 0 -351

1

NO CONTENT: file was removed

0

formatting/vera-root/scripts/rules/IPSIS_S05.tcl removed 0 -329

1

NO CONTENT: file was removed

0

formatting/vera-root/scripts/rules/IPSIS_S06.tcl removed 0 -166

1

NO CONTENT: file was removed

0

formatting/vera-root/scripts/rules/IPSIS_S09.tcl removed 0 -60

1

NO CONTENT: file was removed

0

gui/CMakeLists.txt removed 0 -168

1

NO CONTENT: file was removed

0

gui/tests/CMakeLists.txt removed 0 -10

1

NO CONTENT: file was removed

0

gui/vera-exclusions/exclusions.txt removed 0 -22

1

NO CONTENT: file was removed

0

plugins/CMakeLists.txt removed 0 -4

1

NO CONTENT: file was removed

0

plugins/amda/CMakeLists.txt removed 0 -93

1

NO CONTENT: file was removed

0

plugins/amda/include/AmdaDefs.h removed 0 -18

1

NO CONTENT: file was removed

0

plugins/amda/include/AmdaGlobal.h removed 0 -12

1

NO CONTENT: file was removed

0

plugins/amda/include/AmdaParser.h removed 0 -23

1

NO CONTENT: file was removed

0

plugins/amda/include/AmdaPlugin.h removed 0 -29

1

NO CONTENT: file was removed

0

plugins/amda/include/AmdaProvider.h removed 0 -30

1

NO CONTENT: file was removed

0

plugins/amda/include/AmdaResultParser.h removed 0 -23

1

NO CONTENT: file was removed

0

plugins/amda/include/AmdaResultParserDefs.h removed 0 -79

1

NO CONTENT: file was removed

0

plugins/amda/include/AmdaResultParserHelper.h removed 0 -107

1

NO CONTENT: file was removed

0

plugins/amda/include/AmdaServer.h removed 0 -35

1

NO CONTENT: file was removed

0

plugins/amda/meson.build removed 0 -78

1

NO CONTENT: file was removed

0

plugins/amda/resources/amda.json removed 0 -3

1

NO CONTENT: file was removed

0

plugins/amda/resources/amdaresources.qrc removed 0 -5

1

NO CONTENT: file was removed

0

plugins/amda/resources/samples/amda_tree.json removed 0 -59419

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (59419 lines changed) Show them Hide them

0

plugins/amda/src/AmdaDefs.cpp removed 0 -8

1

NO CONTENT: file was removed

0

plugins/amda/src/AmdaParser.cpp removed 0 -125

1

NO CONTENT: file was removed

0

plugins/amda/src/AmdaPlugin.cpp removed 0 -79

1

NO CONTENT: file was removed

0

plugins/amda/src/AmdaProvider.cpp removed 0 -85

1

NO CONTENT: file was removed

0

plugins/amda/src/AmdaResultParser.cpp removed 0 -149

1

NO CONTENT: file was removed

0

plugins/amda/src/AmdaResultParserDefs.cpp removed 0 -49

1

NO CONTENT: file was removed

0

plugins/amda/src/AmdaResultParserHelper.cpp removed 0 -438

1

NO CONTENT: file was removed

0

plugins/amda/src/AmdaServer.cpp removed 0 -99

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaAcquisition/AmdaData-2012-01-01-12-00-00_2012-01-03-12-00-00.txt removed 0 -10802

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (10802 lines changed) Show them Hide them

0

plugins/amda/tests-resources/TestAmdaParser/TwoRootsFile.json removed 0 -4

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaParser/ValidFile1.json removed 0 -63

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaParser/WrongRootKey.json removed 0 -5

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaParser/WrongRootType.json removed 0 -3

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/FileNotFound.txt removed 0 -3

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/NaNValue.txt removed 0 -6

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/NaNX.txt removed 0 -6

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/NoUnit.txt removed 0 -2

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/TooManyValues.txt removed 0 -6

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/ValidScalar1.txt removed 0 -13

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/ValidVector1.txt removed 0 -12

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/WrongDate.txt removed 0 -6

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/WrongUnit.txt removed 0 -6

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/WrongValue.txt removed 0 -6

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/amdaV2/FileNotFound.txt removed 0 -3

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/amdaV2/NaNValue.txt removed 0 -64

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/amdaV2/NaNX.txt removed 0 -64

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/amdaV2/NoUnit.txt removed 0 -60

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/amdaV2/TooManyValues.txt removed 0 -64

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/amdaV2/ValidScalar1.txt removed 0 -71

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/amdaV2/ValidVector1.txt removed 0 -71

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/amdaV2/WrongDate.txt removed 0 -64

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/amdaV2/WrongUnit.txt removed 0 -64

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/amdaV2/WrongValue.txt removed 0 -64

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/spectro/InvalidSpectrogramWrongBands.txt removed 0 -59

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/spectro/ValidSpectrogram1.txt removed 0 -59

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/spectro/ValidSpectrogram2.txt removed 0 -59

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/spectro/ValidSpectrogram3.txt removed 0 -59

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/spectro/ValidSpectrogramDataHoles.txt removed 0 -62

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/spectro/ValidSpectrogramDataHoles2.txt removed 0 -62

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/spectro/ValidSpectrogramFillValues.txt removed 0 -59

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/spectro/ValidSpectrogramNaNValues.txt removed 0 -59

1

NO CONTENT: file was removed

0

plugins/amda/tests/FuzzingDefs.cpp removed 0 -118

1

NO CONTENT: file was removed

0

plugins/amda/tests/FuzzingDefs.h removed 0 -131

1

NO CONTENT: file was removed

0

plugins/amda/tests/FuzzingOperations.cpp removed 0 -267

1

NO CONTENT: file was removed

0

plugins/amda/tests/FuzzingOperations.h removed 0 -57

1

NO CONTENT: file was removed

0

plugins/amda/tests/FuzzingUtils.cpp removed 0 -25

1

NO CONTENT: file was removed

0

plugins/amda/tests/FuzzingUtils.h removed 0 -63

1

NO CONTENT: file was removed

0

plugins/amda/tests/FuzzingValidators.cpp removed 0 -228

1

NO CONTENT: file was removed

0

plugins/amda/tests/FuzzingValidators.h removed 0 -40

1

NO CONTENT: file was removed

0

plugins/amda/tests/PyTestAmdaWrapper.cpp removed 0 -126

1

NO CONTENT: file was removed

0

plugins/amda/tests/PyTestAmdaWrapper.h removed 0 -38

1

NO CONTENT: file was removed

0

plugins/amda/tests/PyTestAmdaWrapperExe.cpp removed 0 -33

1

NO CONTENT: file was removed

0

plugins/amda/tests/TestAmdaAcquisition.cpp removed 0 -164

1

NO CONTENT: file was removed

0

plugins/amda/tests/TestAmdaDownload.py removed 0 -41

1

NO CONTENT: file was removed

0

plugins/amda/tests/TestAmdaFileParser.py removed 0 -39

1

NO CONTENT: file was removed

0

plugins/amda/tests/TestAmdaFuzzing.cpp removed 0 -395

1

NO CONTENT: file was removed

0

plugins/amda/tests/TestAmdaMiniFuzz.py removed 0 -284

1

NO CONTENT: file was removed

0

plugins/amda/tests/TestAmdaParser.cpp removed 0 -176

1

NO CONTENT: file was removed

0

plugins/amda/tests/TestAmdaResultParser.cpp removed 0 -579

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (579 lines changed) Show them Hide them

0

plugins/amda/tests/amda.py removed 0 -43

1

NO CONTENT: file was removed

0

plugins/amda/vera-exclusions/exclusions.txt removed 0 -5

1

NO CONTENT: file was removed

0

plugins/generic_ws/CMakeLists.txt removed 0 -25

1

NO CONTENT: file was removed

0

plugins/generic_ws/include/GenericWSEngine.h removed 0 -26

1

NO CONTENT: file was removed

0

plugins/generic_ws/include/GenericWSPlugin.h removed 0 -25

1

NO CONTENT: file was removed

0

plugins/generic_ws/resources/genericWS.json removed 0 -3

1

NO CONTENT: file was removed

0

plugins/generic_ws/src/GenericWSEngine.cpp removed 0 -1

1

NO CONTENT: file was removed

0

plugins/generic_ws/src/GenericWSPlugin.cpp removed 0 -1

1

NO CONTENT: file was removed

0

plugins/mockplugin/CMakeLists.txt removed 0 -37

1

NO CONTENT: file was removed

0

plugins/mockplugin/include/CosinusProvider.h removed 0 -32

1

NO CONTENT: file was removed

0

plugins/mockplugin/include/MockDefs.h removed 0 -23

1

NO CONTENT: file was removed

0

plugins/mockplugin/include/MockPlugin.h removed 0 -29

1

NO CONTENT: file was removed

0

plugins/mockplugin/include/MockPluginGlobal.h removed 0 -12

1

NO CONTENT: file was removed

0

plugins/mockplugin/meson.build removed 0 -38

1

NO CONTENT: file was removed

0

plugins/mockplugin/resources/mockplugin.json removed 0 -3

1

NO CONTENT: file was removed

0

plugins/mockplugin/src/CosinusProvider.cpp removed 0 -87

1

NO CONTENT: file was removed

0

plugins/mockplugin/src/MockDefs.cpp removed 0 -7

1

NO CONTENT: file was removed

0

plugins/mockplugin/src/MockPlugin.cpp removed 0 -119

1

NO CONTENT: file was removed

0

plugins/mockplugin/tests-resources/TestCosinusAcquisition/Cosinus_100Hz_20170101_1200_20170101_1300.txt removed 0 -360000

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (360000 lines changed) Show them Hide them

0

plugins/mockplugin/tests/PyTestMockPluginWrapper.cpp removed 0 -86

1

NO CONTENT: file was removed

0

plugins/python_providers/CMakeLists.txt removed 0 -42

1

NO CONTENT: file was removed

0

plugins/python_providers/include/python_interpreter.h removed 0 -24

1

NO CONTENT: file was removed

0

plugins/python_providers/include/python_providers.h removed 0 -32

1

NO CONTENT: file was removed

0

plugins/python_providers/meson.build removed 0 -51

1

NO CONTENT: file was removed

0

plugins/python_providers/resources/amda.py removed 0 -100

1

NO CONTENT: file was removed

0

plugins/python_providers/resources/cdaweb.py removed 0 -54

1

NO CONTENT: file was removed

0

plugins/python_providers/resources/python_providers.json removed 0 -3

1

NO CONTENT: file was removed

0

plugins/python_providers/resources/python_providers.qrc removed 0 -7

1

NO CONTENT: file was removed

0

plugins/python_providers/resources/test.py removed 0 -96

1

NO CONTENT: file was removed

0

plugins/python_providers/src/python_interpreter.cpp removed 0 -63

1

NO CONTENT: file was removed

0

plugins/python_providers/src/python_providers.cpp removed 0 -168

1

NO CONTENT: file was removed

	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