GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r632:6ca459f3421e

Merge pull request from SCIQLOP-Initialisation develop...

leroux -

r632:6ca459f3421e

parent child

Context file:

r632:6ca459f3421e

Expand all files

app/meson.build created 644 +39 0

@@ -0,0 +1,39
	1
	2	app_moc_headers = [
	3	'include/MainWindow.h'
	4	]
	5
	6	app_ui_files = [
	7	'ui/MainWindow.ui'
	8	]
	9
	10	app_qresources = ['resources/qlopapp.qrc']
	11
	12	app_moc_files = qt5.preprocess(moc_headers : app_moc_headers,
	13	ui_files : app_ui_files,
	14	qresources : app_qresources)
	15
	16	app_sources = [
	17	'src/Main.cpp',
	18	'src/MainWindow.cpp'
	19	]
	20
	21	app_inc = include_directories(['include'])
	22
	23	if host_machine.system()=='windows' or build_machine.system()=='windows'
	24	winmod = import('windows')
	25	rc = winmod.compile_resources('resources/qlopapp.rc')
	26	else
	27	rc = []
	28	endif
	29
	30	sciqlop_app = executable('sciqlop',
	31	app_sources,
	32	app_moc_files,
	33	rc,
	34	link_with : [sciqlop_core, sciqlop_gui],
	35	include_directories : [gui_inc, core_inc, app_inc],
	36	dependencies : [qt5core, qt5printsupport, qt5gui, qt5widgets, qt5network],
	37	install : true
	38	)
	39

app/resources/qlopapp.rc created 644 +1 0

	@@ -0,0 +1,1
				1	IDI_ICON1 ICON DISCARDABLE "sciqlop.ico"

app/resources/sciqlop.ico created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

build_cfg/mac/Info.plist created 644 +22 0

@@ -0,0 +1,22
	1	<?xml version="1.0" encoding="UTF-8"?>
	2	<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
	3	<plist version="1.0">
	4	<dict>
	5	<key>NSPrincipalClass</key>
	6	<string>NSApplication</string>
	7	<key>CFBundleIconFile</key>
	8	<string>sciqlopLOGO.icns</string>
	9	<key>CFBundlePackageType</key>
	10	<string>APPL</string>
	11	<key>CFBundleGetInfoString</key>
	12	<string>Created by Qt/QMake</string>
	13	<key>CFBundleSignature</key>
	14	<string>????</string>
	15	<key>CFBundleExecutable</key>
	16	<string>SciQLOP</string>
	17	<key>CFBundleIdentifier</key>
	18	<string>com.lpp.SciQLOP</string>
	19	<key>NOTE</key>
	20	<string>This file was generated by Qt/QMake.</string>
	21	</dict>
	22	</plist>

build_cfg/mac/build.sh created 755 +8 0

@@ -0,0 +1,8
	1	#!/bin/bash
	2
	3	mkdir build
	4	meson --prefix=/tmp/SciQLOP.app --bindir=Contents/MacOS build
	5	cd build
	6	ninja
	7	ninja install
	8

build_cfg/mac/install_script.sh created 755 +11 0

@@ -0,0 +1,11
	1	#!/bin/bash
	2
	3	mkdir -p ${MESON_INSTALL_PREFIX}/Contents/Frameworks
	4	mv ${MESON_INSTALL_PREFIX}/lib/plugin ${MESON_INSTALL_PREFIX}/Contents/MacOS
	5	macdeployqt ${MESON_INSTALL_PREFIX} -verbose=3
	6	install_name_tool -change @rpath/QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore /tmp/SciQLOP.app/Contents/MacOS/sciqlop
	7	install_name_tool -change @rpath/QtPrintSupport.framework/Versions/5/QtPrintSupport @executable_path/../Frameworks/QtPrintSupport.framework/Versions/5/QtPrintSupport /tmp/SciQLOP.app/Contents/MacOS/sciqlop
	8	install_name_tool -change @rpath/QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui /tmp/SciQLOP.app/Contents/MacOS/sciqlop
	9	install_name_tool -change @rpath/QtWidgets.framework/Versions/5/QtWidgets @executable_path/../Frameworks/QtWidgets.framework/Versions/5/QtWidgets /tmp/SciQLOP.app/Contents/MacOS/sciqlop
	10	install_name_tool -change @rpath/QtNetwork.framework/Versions/5/QtNetwork @executable_path/../Frameworks/QtNetwork.framework/Versions/5/QtNetwork /tmp/SciQLOP.app/Contents/MacOS/sciqlop
	11

build_cfg/mac/sciqlopLOGO.icns created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

build_cfg/windows/build.sh created 755 +8 0

@@ -0,0 +1,8
	1	#!/bin/bash
	2
	3	mkdir build
	4	meson --prefix=/tmp/SciQLOP --cross-file build_cfg/windows/cross_fedora_win64.txt build
	5	cd build
	6	ninja
	7	ninja install
	8

build_cfg/windows/cross_fedora_win64.txt created 644 +18 0

@@ -0,0 +1,18
	1	[binaries]
	2	c = 'x86_64-w64-mingw32-gcc'
	3	cpp = 'x86_64-w64-mingw32-g++'
	4	ar = 'x86_64-w64-mingw32-ar'
	5	strip = 'x86_64-w64-mingw32-strip'
	6	qmake = 'mingw64-qmake-qt5'
	7	qmake-qt5 = 'mingw64-qmake-qt5'
	8	moc-qt5 = '/usr/x86_64-w64-mingw32/bin/qt5/moc'
	9	windres = 'x86_64-w64-mingw32-windres'
	10	pkgconfig = 'mingw64-pkg-config'
	11	exe_wrapper = 'wine' # A command used to run generated executables.
	12
	13	[host_machine]
	14	system = 'windows'
	15	cpu_family = 'x86'
	16	cpu = 'x86_64'
	17	endian = 'little'
	18

build_cfg/windows/install_script.sh created 755 +26 0

@@ -0,0 +1,26
	1	#!/bin/bash
	2
	3	mkdir -p ${MESON_INSTALL_PREFIX}/plugins
	4	mv ${MESON_INSTALL_PREFIX}/bin/plugin.dll ${MESON_INSTALL_PREFIX}/plugins/
	5	mv ${MESON_INSTALL_PREFIX}/lib64/*.dll ${MESON_INSTALL_PREFIX}/
	6	mv ${MESON_INSTALL_PREFIX}/bin/* ${MESON_INSTALL_PREFIX}/
	7
	8	cp /usr/x86_64-w64-mingw32/sys-root/mingw/lib/qt5/plugins/platforms/qwindows.dll ${MESON_INSTALL_PREFIX}/
	9	cp /usr/x86_64-w64-mingw32/sys-root/mingw/lib/qt5/plugins/imageformats/*.dll ${MESON_INSTALL_PREFIX}/
	10
	11	peldd ${MESON_INSTALL_PREFIX}/sciqlop.exe -a -w libsciqlopcore.dll -w libsciqlopgui.dll -w dwmapi.dll -w UxTheme.dll -w CRYPT32.dll -w DNSAPI.dll -w IPHLPAPI.DLL -w comdlg32.dll -w WINSPOOL.DRV -w IMM32.dll \| xargs cp -t ${MESON_INSTALL_PREFIX}/ \|\| true
	12	peldd ${MESON_INSTALL_PREFIX}/libsciqlopcore.dll -a -w libsciqlopgui.dll -w dwmapi.dll -w UxTheme.dll -w CRYPT32.dll -w DNSAPI.dll -w IPHLPAPI.DLL -w comdlg32.dll -w WINSPOOL.DRV -w IMM32.dll \| xargs cp -t ${MESON_INSTALL_PREFIX}/ \|\| true
	13	peldd ${MESON_INSTALL_PREFIX}/libsciqlopgui.dll -a -w libsciqlopcore.dll -w dwmapi.dll -w UxTheme.dll -w CRYPT32.dll -w DNSAPI.dll -w IPHLPAPI.DLL -w comdlg32.dll -w WINSPOOL.DRV -w IMM32.dll \| xargs cp -t ${MESON_INSTALL_PREFIX}/ \|\| true
	14	peldd ${MESON_INSTALL_PREFIX}/qwindows.dll -a -w libsciqlopcore.dll -w dwmapi.dll -w UxTheme.dll -w CRYPT32.dll -w DNSAPI.dll -w IPHLPAPI.DLL -w comdlg32.dll -w WINSPOOL.DRV -w IMM32.dll \| xargs cp -t ${MESON_INSTALL_PREFIX}/ \|\| true
	15
	16	peldd ${MESON_INSTALL_PREFIX}/qjp2.dll -a -w libsciqlopcore.dll -w dwmapi.dll -w UxTheme.dll -w CRYPT32.dll -w DNSAPI.dll -w IPHLPAPI.DLL -w comdlg32.dll -w WINSPOOL.DRV -w IMM32.dll \| xargs cp -t ${MESON_INSTALL_PREFIX}/ \|\| true
	17	peldd ${MESON_INSTALL_PREFIX}/qjpeg.dll -a -w libsciqlopcore.dll -w dwmapi.dll -w UxTheme.dll -w CRYPT32.dll -w DNSAPI.dll -w IPHLPAPI.DLL -w comdlg32.dll -w WINSPOOL.DRV -w IMM32.dll \| xargs cp -t ${MESON_INSTALL_PREFIX}/ \|\| true
	18	peldd ${MESON_INSTALL_PREFIX}/qsvg.dll -a -w libsciqlopcore.dll -w dwmapi.dll -w UxTheme.dll -w CRYPT32.dll -w DNSAPI.dll -w IPHLPAPI.DLL -w comdlg32.dll -w WINSPOOL.DRV -w IMM32.dll \| xargs cp -t ${MESON_INSTALL_PREFIX}/ \|\| true
	19	peldd ${MESON_INSTALL_PREFIX}/qtiff.dll -a -w libsciqlopcore.dll -w dwmapi.dll -w UxTheme.dll -w CRYPT32.dll -w DNSAPI.dll -w IPHLPAPI.DLL -w comdlg32.dll -w WINSPOOL.DRV -w IMM32.dll \| xargs cp -t ${MESON_INSTALL_PREFIX}/ \|\| true
	20	peldd ${MESON_INSTALL_PREFIX}/qwebp.dll -a -w libsciqlopcore.dll -w dwmapi.dll -w UxTheme.dll -w CRYPT32.dll -w DNSAPI.dll -w IPHLPAPI.DLL -w comdlg32.dll -w WINSPOOL.DRV -w IMM32.dll \| xargs cp -t ${MESON_INSTALL_PREFIX}/ \|\| true
	21	peldd ${MESON_INSTALL_PREFIX}/plugins/libamdaplugin.dll -a -w libsciqlopgui.dll -w libsciqlopcore.dll -w dwmapi.dll -w UxTheme.dll -w CRYPT32.dll -w DNSAPI.dll -w IPHLPAPI.DLL -w comdlg32.dll -w WINSPOOL.DRV -w IMM32.dll \| xargs cp -t ${MESON_INSTALL_PREFIX}/ \|\| true
	22	peldd ${MESON_INSTALL_PREFIX}/plugins/libmockplugin.dll -a -w libsciqlopgui.dll -w libsciqlopcore.dll -w dwmapi.dll -w UxTheme.dll -w CRYPT32.dll -w DNSAPI.dll -w IPHLPAPI.DLL -w comdlg32.dll -w WINSPOOL.DRV -w IMM32.dll \| xargs cp -t ${MESON_INSTALL_PREFIX}/ \|\| true
	23
	24	rm ${MESON_INSTALL_PREFIX}/bin/plugin.dll
	25
	26	rm -r ${MESON_INSTALL_PREFIX}/bin ${MESON_INSTALL_PREFIX}/lib64

core/include/Data/VariableRequest.h created 644 +28 0

@@ -0,0 +1,28
	1	#ifndef SCIQLOP_VARIABLEREQUEST_H
	2	#define SCIQLOP_VARIABLEREQUEST_H
	3
	4	#include <QObject>
	5
	6	#include <QUuid>
	7
	8	#include <Common/MetaTypes.h>
	9	#include <Data/IDataSeries.h>
	10	#include <Data/SqpRange.h>
	11
	12	#include <memory>
	13
	14	/**
	15	* @brief The VariableRequest struct holds the information of an acquisition request
	16	*/
	17	struct VariableRequest {
	18	VariableRequest() { m_CanUpdate = false; }
	19
	20	SqpRange m_RangeRequested;
	21	SqpRange m_CacheRangeRequested;
	22	std::shared_ptr<IDataSeries> m_DataSeries;
	23	bool m_CanUpdate;
	24	};
	25
	26	SCIQLOP_REGISTER_META_TYPE(VARIABLEREQUEST_REGISTRY, VariableRequest)
	27
	28	#endif // SCIQLOP_VARIABLEREQUEST_H

core/meson.build created 644 +55 0

@@ -0,0 +1,55
	1
	2	core_moc_headers = [
	3	'include/Data/IDataProvider.h',
	4	'include/DataSource/DataSourceController.h',
	5	'include/DataSource/DataSourceItemAction.h',
	6	'include/Network/NetworkController.h',
	7	'include/Time/TimeController.h',
	8	'include/Variable/Variable.h',
	9	'include/Variable/VariableCacheController.h',
	10	'include/Variable/VariableController.h',
	11	'include/Variable/VariableAcquisitionWorker.h',
	12	'include/Variable/VariableCacheStrategy.h',
	13	'include/Variable/VariableSynchronizationGroup.h',
	14	'include/Variable/VariableModel.h',
	15	'include/Visualization/VisualizationController.h'
	16	]
	17
	18
	19	core_moc_files = qt5.preprocess(moc_headers : core_moc_headers)
	20
	21	core_sources = [
	22	'src/Common/DateUtils.cpp',
	23	'src/Data/ScalarSeries.cpp',
	24	'src/Data/DataSeriesIterator.cpp',
	25	'src/Data/VectorSeries.cpp',
	26	'src/DataSource/DataSourceController.cpp',
	27	'src/DataSource/DataSourceItem.cpp',
	28	'src/DataSource/DataSourceItemAction.cpp',
	29	'src/Network/NetworkController.cpp',
	30	'src/Plugin/PluginManager.cpp',
	31	'src/Settings/SqpSettingsDefs.cpp',
	32	'src/Time/TimeController.cpp',
	33	'src/Variable/Variable.cpp',
	34	'src/Variable/VariableCacheController.cpp',
	35	'src/Variable/VariableController.cpp',
	36	'src/Variable/VariableAcquisitionWorker.cpp',
	37	'src/Variable/VariableCacheStrategy.cpp',
	38	'src/Variable/VariableSynchronizationGroup.cpp',
	39	'src/Variable/VariableModel.cpp',
	40	'src/Visualization/VisualizationController.cpp'
	41	]
	42
	43	core_inc = include_directories(['include', '../plugin/include'])
	44
	45	sciqlop_core = library('sciqlopcore',
	46	core_sources,
	47	core_moc_files,
	48	cpp_args : '-DCORE_LIB',
	49	include_directories : core_inc,
	50	dependencies : [qt5core, qt5widgets, qt5network],
	51	install : true
	52	)
	53
	54	subdir('tests')
	55

core/tests/meson.build created 644 +20 0

@@ -0,0 +1,20
	1
	2
	3	tests = [
	4	[['Data/TestDataSeries.cpp'],['test_data'],['DataSeries test']],
	5	[['Data/TestOneDimArrayData.cpp'],['test_1d'],['One Dim Array test']],
	6	[['Data/TestTwoDimArrayData.cpp'],['test_2d'],['Two Dim Array test']],
	7	[['DataSource/TestDataSourceController.cpp'],['test_data_source'],['DataSourceController test']],
	8	[['Variable/TestVariableCacheController.cpp'],['test_variable_cache'],['VariableCacheController test']],
	9	[['Variable/TestVariable.cpp'],['test_variable'],['Variable test']]
	10	]
	11
	12	foreach unit_test : tests
	13	test_moc_files = qt5.preprocess(moc_sources : unit_test[0])
	14	test_exe = executable(unit_test[1],unit_test[0] , test_moc_files,
	15	link_with : sciqlop_core,
	16	include_directories : core_inc,
	17	dependencies : [qt5core, qt5widgets, qt5network,qt5test])
	18	test(unit_test[2], test_exe)
	19	endforeach
	20

gui/meson.build created 644 +72 0

@@ -0,0 +1,72
	1
	2	gui_moc_headers = [
	3	'include/DataSource/DataSourceWidget.h',
	4	'include/Settings/SqpSettingsDialog.h',
	5	'include/Settings/SqpSettingsGeneralWidget.h',
	6	'include/SidePane/SqpSidePane.h',
	7	'include/SqpApplication.h',
	8	'include/TimeWidget/TimeWidget.h',
	9	'include/Variable/VariableInspectorWidget.h',
	10	'include/Visualization/qcustomplot.h',
	11	'include/Visualization/VisualizationGraphWidget.h',
	12	'include/Visualization/VisualizationTabWidget.h',
	13	'include/Visualization/VisualizationWidget.h',
	14	'include/Visualization/VisualizationZoneWidget.h'
	15	]
	16
	17	gui_ui_files = [
	18	'ui/DataSource/DataSourceWidget.ui',
	19	'ui/Settings/SqpSettingsDialog.ui',
	20	'ui/Settings/SqpSettingsGeneralWidget.ui',
	21	'ui/SidePane/SqpSidePane.ui',
	22	'ui/TimeWidget/TimeWidget.ui',
	23	'ui/Variable/VariableInspectorWidget.ui',
	24	'ui/Variable/VariableMenuHeaderWidget.ui',
	25	'ui/Visualization/VisualizationGraphWidget.ui',
	26	'ui/Visualization/VisualizationTabWidget.ui',
	27	'ui/Visualization/VisualizationWidget.ui',
	28	'ui/Visualization/VisualizationZoneWidget.ui'
	29	]
	30
	31	gui_qresources = ['resources/sqpguiresources.qrc']
	32
	33	gui_moc_files = qt5.preprocess(moc_headers : gui_moc_headers,
	34	ui_files : gui_ui_files,
	35	qresources : gui_qresources)
	36
	37	gui_sources = [
	38	'src/SqpApplication.cpp',
	39	'src/Common/ColorUtils.cpp',
	40	'src/DataSource/DataSourceTreeWidgetItem.cpp',
	41	'src/DataSource/DataSourceTreeWidgetHelper.cpp',
	42	'src/DataSource/DataSourceWidget.cpp',
	43	'src/Settings/SqpSettingsDialog.cpp',
	44	'src/Settings/SqpSettingsGeneralWidget.cpp',
	45	'src/SidePane/SqpSidePane.cpp',
	46	'src/TimeWidget/TimeWidget.cpp',
	47	'src/Variable/VariableInspectorWidget.cpp',
	48	'src/Variable/VariableMenuHeaderWidget.cpp',
	49	'src/Visualization/VisualizationGraphHelper.cpp',
	50	'src/Visualization/VisualizationGraphRenderingDelegate.cpp',
	51	'src/Visualization/VisualizationGraphWidget.cpp',
	52	'src/Visualization/VisualizationTabWidget.cpp',
	53	'src/Visualization/VisualizationWidget.cpp',
	54	'src/Visualization/VisualizationZoneWidget.cpp',
	55	'src/Visualization/qcustomplot.cpp',
	56	'src/Visualization/operations/GenerateVariableMenuOperation.cpp',
	57	'src/Visualization/operations/MenuBuilder.cpp',
	58	'src/Visualization/operations/RemoveVariableOperation.cpp',
	59	'src/Visualization/operations/RescaleAxeOperation.cpp'
	60	]
	61
	62	gui_inc = include_directories(['include'])
	63
	64	sciqlop_gui = library('sciqlopgui',
	65	gui_sources,
	66	gui_moc_files,
	67	link_with : sciqlop_core,
	68	include_directories : [gui_inc, core_inc],
	69	dependencies : [qt5core, qt5printsupport, qt5gui, qt5widgets, qt5network],
	70	install : true
	71	)
	72

meson.build created 644 +36 0

@@ -0,0 +1,36
	1	project('SciQLOP', 'cpp',default_options : ['cpp_std=c++14'])
	2
	3	qt5 = import('qt5')
	4	qt5core = dependency('qt5', modules : 'Core')
	5	qt5widgets = dependency('qt5', modules : 'Widgets')
	6	qt5gui = dependency('qt5', modules : 'Gui')
	7	qt5svg = dependency('qt5', modules : 'Svg')
	8	qt5xml = dependency('qt5', modules : 'Xml')
	9	qt5network = dependency('qt5', modules : 'Network')
	10	qt5printsupport = dependency('qt5', modules : 'PrintSupport')
	11	qt5test = dependency('qt5', modules : 'Test')
	12
	13	moc = find_program('moc','moc-qt5')
	14
	15	subdir('core')
	16	subdir('gui')
	17	subdir('app')
	18	subdir('plugins')
	19
	20	if build_machine.system()=='darwin'
	21	install_data('build_cfg/mac/sciqlopLOGO.icns', install_dir : 'Contents/Resources')
	22	install_data('build_cfg/mac/Info.plist', install_dir : 'Contents')
	23	meson.add_install_script('build_cfg/mac/install_script.sh')
	24	elif host_machine.system()=='windows'
	25	meson.add_install_script('build_cfg/windows/install_script.sh')
	26	endif
	27
	28	cppcheck = find_program('cppcheck', required : false)
	29
	30	if cppcheck.found()
	31	run_target('cppcheck',
	32	command : [cppcheck, '--enable=all',
	33	'--project=' + join_paths(meson.build_root(), 'compile_commands.json')],
	34	build_by_default : true
	35	)
	36	endif

plugins/amda/meson.build created 644 +61 0

@@ -0,0 +1,61
	1
	2	amdaplugin_moc_headers = [
	3	'include/AmdaPlugin.h'
	4	]
	5
	6	amdaplugin_sources = [
	7	'src/AmdaDefs.cpp',
	8	'src/AmdaParser.cpp',
	9	'src/AmdaPlugin.cpp',
	10	'src/AmdaProvider.cpp',
	11	'src/AmdaResultParser.cpp'
	12	]
	13
	14	amdaplugin_ui_files = []
	15	amdaplugin_resources_files = [
	16	'resources/amdaresources.qrc'
	17	]
	18
	19	amdaplugin_inc = include_directories(['include', '../../plugin/include'])
	20
	21	gen = generator(moc,
	22	output : 'moc_@BASENAME@.cpp',
	23	arguments : ['@INPUT@',
	24	'-DPLUGIN_JSON_FILE_PATH="'+meson.source_root()+'/plugins/amda/resources/amda.json"',
	25	'-I', meson.current_source_dir()+'/include',
	26	'-I', meson.current_source_dir()+'/../../plugin/include',
	27	'-o', '@OUTPUT@'])
	28
	29	amdaplugin_moc_plugin_files = gen.process(amdaplugin_moc_headers)
	30
	31	amdaplugin_moc_files = qt5.preprocess(
	32	ui_files : amdaplugin_ui_files,
	33	qresources : amdaplugin_resources_files)
	34
	35	sciqlop_amdaplugin = library('amdaplugin',
	36	amdaplugin_sources,
	37	amdaplugin_moc_files,
	38	amdaplugin_moc_plugin_files,
	39	cpp_args : '-DAMDA_LIB',
	40	link_with : [sciqlop_core, sciqlop_gui],
	41	include_directories : [amdaplugin_inc, core_inc, gui_inc],
	42	dependencies : [qt5core, qt5gui, qt5widgets, qt5network],
	43	install : true
	44	)
	45
	46
	47	tests = [
	48	[['tests/TestAmdaParser.cpp'],['test_amda_parser'],['AMDA parser test']],
	49	[['tests/TestAmdaResultParser.cpp'],['test_amda_result_parser'],['AMDA result parser test']],
	50	[['tests/TestAmdaAcquisition.cpp'],['test_amda_acquisition'],['AMDA Acquisition test']]
	51	]
	52
	53	foreach unit_test : tests
	54	test_moc_files = qt5.preprocess(moc_sources : unit_test[0])
	55	test_exe = executable(unit_test[1],unit_test[0] , test_moc_files,
	56	link_with : [sciqlop_core, sciqlop_amdaplugin, sciqlop_gui],
	57	include_directories : [core_inc, amdaplugin_inc, gui_inc],
	58	cpp_args : ['-DAMDA_TESTS_RESOURCES_DIR="'+meson.current_source_dir()+'/tests-resources"'],
	59	dependencies : [qt5core, qt5widgets, qt5network,qt5test])
	60	test(unit_test[2], test_exe,timeout: 3 * 60)
	61	endforeach

plugins/meson.build created 644 +2 0

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

plugins/mockplugin/meson.build created 644 +33 0

@@ -0,0 +1,33
	1
	2	mockplugin_moc_headers = [
	3	'include/MockPlugin.h'
	4	]
	5
	6	mockplugin_sources = [
	7	'src/CosinusProvider.cpp',
	8	'src/MockPlugin.cpp'
	9	]
	10
	11	mockplugin_inc = include_directories(['include', '../../plugin/include'])
	12
	13
	14	gen = generator(moc,
	15	output : 'moc_@BASENAME@.cpp',
	16	arguments : ['@INPUT@',
	17	'-DPLUGIN_JSON_FILE_PATH="'+meson.source_root()+'/plugins/mockplugin/resources/mockplugin.json"',
	18	'-I', meson.current_source_dir()+'/include',
	19	'-I', meson.current_source_dir()+'/../../plugin/include',
	20	'-o', '@OUTPUT@'])
	21
	22	mockplugin_moc_files = gen.process(mockplugin_moc_headers)
	23
	24	sciqlop_mockplugin = library('mockplugin',
	25	mockplugin_sources,
	26	mockplugin_moc_files,
	27	cpp_args : '-DMOCKPLUGIN_LIB',
	28	link_with : [sciqlop_core, sciqlop_gui],
	29	include_directories : [mockplugin_inc, core_inc, gui_inc],
	30	dependencies : [qt5core, qt5gui, qt5widgets, qt5network],
	31	install : true
	32	)
	33

core/include/Data/AcquisitionRequest.h +2 -2

             #ifndef SCIQLOP_ACQUISITIONREQUEST_H
             #define SCIQLOP_ACQUISITIONREQUEST_H
             #include <QObject>
             #include <QUuid>
             #include <Common/DateUtils.h>
             #include <Common/MetaTypes.h>
             #include <Data/DataProviderParameters.h>
             #include <Data/IDataProvider.h>
             #include <Data/SqpRange.h>
             #include <memory>
             /**
-             * @brief The AcquisitionRequest struct holds the information of an acquisition request
+             * @brief The AcquisitionRequest struct holds the information of an variable request
              */
             struct AcquisitionRequest {
                 AcquisitionRequest()
                 {
                     m_AcqIdentifier = QUuid::createUuid();
                     m_Size = 0;
                 }
+                QUuid m_VarRequestId;
                 QUuid m_AcqIdentifier;
                 QUuid m_vIdentifier;
                 DataProviderParameters m_DataProviderParameters;
                 SqpRange m_RangeRequested;
                 SqpRange m_CacheRangeRequested;
                 int m_Size;
                 std::shared_ptr<IDataProvider> m_Provider;
             };
             SCIQLOP_REGISTER_META_TYPE(ACQUISITIONREQUEST_REGISTRY, AcquisitionRequest)
             #endif // SCIQLOP_ACQUISITIONREQUEST_H

core/include/Variable/VariableAcquisitionWorker.h +1 -1

             #ifndef SCIQLOP_VARIABLEACQUISITIONWORKER_H
             #define SCIQLOP_VARIABLEACQUISITIONWORKER_H
             #include "CoreGlobal.h"
             #include <Data/DataProviderParameters.h>
             #include <QLoggingCategory>
             #include <QObject>
             #include <QUuid>
             #include <Data/AcquisitionDataPacket.h>
             #include <Data/IDataSeries.h>
             #include <Data/SqpRange.h>
             #include <QLoggingCategory>
             #include <Common/spimpl.h>
             Q_DECLARE_LOGGING_CATEGORY(LOG_VariableAcquisitionWorker)
             class Variable;
             class IDataProvider;
             /// This class aims to handle all acquisition request
             class SCIQLOP_CORE_EXPORT VariableAcquisitionWorker : public QObject {
                 Q_OBJECT
             public:
                 explicit VariableAcquisitionWorker(QObject *parent = 0);
                 virtual ~VariableAcquisitionWorker();
-                void pushVariableRequest(QUuid vIdentifier, SqpRange rangeRequested,
+                QUuid pushVariableRequest(QUuid varRequestId, QUuid vIdentifier, SqpRange rangeRequested,
                                           SqpRange cacheRangeRequested, DataProviderParameters parameters,
                                           std::shared_ptr<IDataProvider> provider);
                 void abortProgressRequested(QUuid vIdentifier);
                 void initialize();
                 void finalize();
             signals:
                 void dataProvided(QUuid vIdentifier, const SqpRange &rangeRequested,
                                   const SqpRange &cacheRangeRequested,
                                   QVector<AcquisitionDataPacket> dataAcquired);
                 void variableRequestInProgress(QUuid vIdentifier, double progress);
             public slots:
                 void onVariableDataAcquired(QUuid acqIdentifier, std::shared_ptr<IDataSeries> dataSeries,
                                             SqpRange dataRangeAcquired);
                 void onVariableRetrieveDataInProgress(QUuid acqIdentifier, double progress);
             private slots:
                 void onExecuteRequest(QUuid acqIdentifier);
             private:
                 void waitForFinish();
                 class VariableAcquisitionWorkerPrivate;
                 spimpl::unique_impl_ptr<VariableAcquisitionWorkerPrivate> impl;
             };
             #endif // SCIQLOP_VARIABLEACQUISITIONWORKER_H

core/include/Variable/VariableCacheStrategy.h +1 -1

             #ifndef SCIQLOP_VARIABLECACHESTRATEGY_H
             #define SCIQLOP_VARIABLECACHESTRATEGY_H
             #include "CoreGlobal.h"
             #include <QLoggingCategory>
             #include <QObject>
             #include <Data/SqpRange.h>
             #include <QLoggingCategory>
             #include <Common/spimpl.h>
             #include <utility>
             Q_DECLARE_LOGGING_CATEGORY(LOG_VariableCacheStrategy)
             class Variable;
             /**
              * Possible types of zoom operation
              */
             enum class CacheStrategy { FixedTolerance, TwoThreashold };
             /// This class aims to hande the cache strategy.
             class SCIQLOP_CORE_EXPORT VariableCacheStrategy : public QObject {
                 Q_OBJECT
             public:
                 explicit VariableCacheStrategy(QObject *parent = 0);
-                std::pair<SqpRange, SqpRange> computeCacheRange(const SqpRange &vRange,
+                std::pair<SqpRange, SqpRange> computeStrategyRanges(const SqpRange &vRange,
                                                                     const SqpRange &rangeRequested);
             private:
                 class VariableCacheStrategyPrivate;
                 spimpl::unique_impl_ptr<VariableCacheStrategyPrivate> impl;
             };
             #endif // SCIQLOP_VARIABLECACHESTRATEGY_H

core/include/Variable/VariableController.h +1 0

             #ifndef SCIQLOP_VARIABLECONTROLLER_H
             #define SCIQLOP_VARIABLECONTROLLER_H
             #include "CoreGlobal.h"
             #include <Data/AcquisitionDataPacket.h>
             #include <Data/SqpRange.h>
             #include <QLoggingCategory>
             #include <QObject>
+            #include <QUuid>
             #include <Common/spimpl.h>
             class IDataProvider;
             class QItemSelectionModel;
             class TimeController;
             class Variable;
             class VariableModel;
             Q_DECLARE_LOGGING_CATEGORY(LOG_VariableController)
             /**
              * Possible types of zoom operation
              */
             enum class AcquisitionZoomType { ZoomOut, ZoomIn, PanRight, PanLeft, Unknown };
             /**
              * @brief The VariableController class aims to handle the variables in SciQlop.
              */
             class SCIQLOP_CORE_EXPORT VariableController : public QObject {
                 Q_OBJECT
             public:
                 explicit VariableController(QObject *parent = 0);
                 virtual ~VariableController();
                 VariableModel *variableModel() noexcept;
                 QItemSelectionModel *variableSelectionModel() noexcept;
                 void setTimeController(TimeController *timeController) noexcept;
                 /**
                  * Deletes from the controller the variable passed in parameter.
                  *
                  * Delete a variable includes:
                  * - the deletion of the various references to the variable in SciQlop
                  * - the deletion of the model variable
                  * - the deletion of the provider associated with the variable
                  * - removing the cache associated with the variable
                  *
                  * @param variable the variable to delete from the controller.
                  */
                 void deleteVariable(std::shared_ptr<Variable> variable) noexcept;
                 /**
                  * Deletes from the controller the variables passed in parameter.
                  * @param variables the variables to delete from the controller.
                  * @sa deleteVariable()
                  */
                 void deleteVariables(const QVector<std::shared_ptr<Variable> > &variables) noexcept;
                 /**
                  * @brief abort the variable retrieve data progression
                  */
                 void abortProgress(std::shared_ptr<Variable> variable);
                 static AcquisitionZoomType getZoomType(const SqpRange &range, const SqpRange &oldRange);
             signals:
                 /// Signal emitted when a variable is about to be deleted from the controller
                 void variableAboutToBeDeleted(std::shared_ptr<Variable> variable);
                 /// Signal emitted when a data acquisition is requested on a range for a variable
                 void rangeChanged(std::shared_ptr<Variable> variable, const SqpRange &range);
                 /// Signal emitted when a sub range of the cacheRange of the variable can be displayed
                 void updateVarDisplaying(std::shared_ptr<Variable> variable, const SqpRange &range);
             public slots:
                 /// Request the data loading of the variable whithin range
                 void onRequestDataLoading(QVector<std::shared_ptr<Variable> > variables, const SqpRange &range,
                                           const SqpRange &oldRange, bool synchronise);
                 /**
                  * Creates a new variable and adds it to the model
                  * @param name the name of the new variable
                  * @param metadata the metadata of the new variable
                  * @param provider the data provider for the new variable
                  * @return the pointer to the new variable or nullptr if the creation failed
                  */
                 std::shared_ptr<Variable> createVariable(const QString &name, const QVariantHash &metadata,
                                                          std::shared_ptr<IDataProvider> provider) noexcept;
                 /// Update the temporal parameters of every selected variable to dateTime
                 void onDateTimeOnSelection(const SqpRange &dateTime);
                 void onDataProvided(QUuid vIdentifier, const SqpRange &rangeRequested,
                                     const SqpRange &cacheRangeRequested,
                                     QVector<AcquisitionDataPacket> dataAcquired);
                 void onVariableRetrieveDataInProgress(QUuid identifier, double progress);
                 /// Cancel the current request for the variable
                 void onAbortProgressRequested(std::shared_ptr<Variable> variable);
                 /// synchronization group methods
                 void onAddSynchronizationGroupId(QUuid synchronizationGroupId);
                 void onRemoveSynchronizationGroupId(QUuid synchronizationGroupId);
                 void onAddSynchronized(std::shared_ptr<Variable> variable, QUuid synchronizationGroupId);
                 void initialize();
                 void finalize();
             private:
                 void waitForFinish();
                 class VariableControllerPrivate;
                 spimpl::unique_impl_ptr<VariableControllerPrivate> impl;
             };
             #endif // SCIQLOP_VARIABLECONTROLLER_H

core/src/Variable/VariableAcquisitionWorker.cpp +16 -3

             #include "Variable/VariableAcquisitionWorker.h"
             #include "Variable/Variable.h"
             #include <Data/AcquisitionRequest.h>
             #include <Data/SqpRange.h>
             #include <unordered_map>
             #include <utility>
             #include <QMutex>
             #include <QReadWriteLock>
             #include <QThread>
             Q_LOGGING_CATEGORY(LOG_VariableAcquisitionWorker, "VariableAcquisitionWorker")
             struct VariableAcquisitionWorker::VariableAcquisitionWorkerPrivate {
                 explicit VariableAcquisitionWorkerPrivate() : m_Lock{QReadWriteLock::Recursive} {}
                 void lockRead() { m_Lock.lockForRead(); }
                 void lockWrite() { m_Lock.lockForWrite(); }
                 void unlock() { m_Lock.unlock(); }
                 void removeVariableRequest(QUuid vIdentifier);
                 QMutex m_WorkingMutex;
                 QReadWriteLock m_Lock;
                 std::map<QUuid, QVector<AcquisitionDataPacket> > m_AcqIdentifierToAcqDataPacketVectorMap;
                 std::map<QUuid, AcquisitionRequest> m_AcqIdentifierToAcqRequestMap;
                 std::map<QUuid, std::pair<QUuid, QUuid> > m_VIdentifierToCurrrentAcqIdNextIdPairMap;
             };
             VariableAcquisitionWorker::VariableAcquisitionWorker(QObject *parent)
                     : QObject{parent}, impl{spimpl::make_unique_impl<VariableAcquisitionWorkerPrivate>()}
             {
             }
             VariableAcquisitionWorker::~VariableAcquisitionWorker()
             {
                 qCInfo(LOG_VariableAcquisitionWorker()) << tr("VariableAcquisitionWorker destruction")
                                                         << QThread::currentThread();
                 this->waitForFinish();
             }
-            void VariableAcquisitionWorker::pushVariableRequest(QUuid vIdentifier, SqpRange rangeRequested,
+            QUuid VariableAcquisitionWorker::pushVariableRequest(QUuid varRequestId, QUuid vIdentifier,
+                                                                 SqpRange rangeRequested,
                                                                  SqpRange cacheRangeRequested,
                                                                  DataProviderParameters parameters,
                                                                  std::shared_ptr<IDataProvider> provider)
             {
-                qCInfo(LOG_VariableAcquisitionWorker())
+                qCDebug(LOG_VariableAcquisitionWorker())
                     << tr("TORM VariableAcquisitionWorker::pushVariableRequest ") << cacheRangeRequested;
+                auto varRequestIdCanceled = QUuid();
                 // Request creation
                 auto acqRequest = AcquisitionRequest{};
+                acqRequest.m_VarRequestId = varRequestId;
                 acqRequest.m_vIdentifier = vIdentifier;
                 acqRequest.m_DataProviderParameters = parameters;
                 acqRequest.m_RangeRequested = rangeRequested;
                 acqRequest.m_CacheRangeRequested = cacheRangeRequested;
                 acqRequest.m_Size = parameters.m_Times.size();
                 acqRequest.m_Provider = provider;
                 // Register request
                 impl->lockWrite();
                 impl->m_AcqIdentifierToAcqRequestMap.insert(
                     std::make_pair(acqRequest.m_AcqIdentifier, acqRequest));
                 auto it = impl->m_VIdentifierToCurrrentAcqIdNextIdPairMap.find(vIdentifier);
                 if (it != impl->m_VIdentifierToCurrrentAcqIdNextIdPairMap.cend()) {
                     // A current request already exists, we can replace the next one
+                    auto nextAcqId = it->second.second;
+                    auto acqIdentifierToAcqRequestMapIt = impl->m_AcqIdentifierToAcqRequestMap.find(nextAcqId);
+                    if (acqIdentifierToAcqRequestMapIt != impl->m_AcqIdentifierToAcqRequestMap.cend()) {
+                        auto request = acqIdentifierToAcqRequestMapIt->second;
+                        varRequestIdCanceled = request.m_VarRequestId;
+                    }
                     it->second.second = acqRequest.m_AcqIdentifier;
                     impl->unlock();
                 }
                 else {
                     // First request for the variable, it must be stored and executed
                     impl->m_VIdentifierToCurrrentAcqIdNextIdPairMap.insert(
                         std::make_pair(vIdentifier, std::make_pair(acqRequest.m_AcqIdentifier, QUuid())));
                     impl->unlock();
                     QMetaObject::invokeMethod(this, "onExecuteRequest", Qt::QueuedConnection,
                                               Q_ARG(QUuid, acqRequest.m_AcqIdentifier));
                 }
+                return varRequestIdCanceled;
             }
             void VariableAcquisitionWorker::abortProgressRequested(QUuid vIdentifier)
             {
                 // TODO
             }
             void VariableAcquisitionWorker::onVariableRetrieveDataInProgress(QUuid acqIdentifier,
                                                                              double progress)
             {
                 // TODO
             }
             void VariableAcquisitionWorker::onVariableDataAcquired(QUuid acqIdentifier,
                                                                    std::shared_ptr<IDataSeries> dataSeries,
                                                                    SqpRange dataRangeAcquired)
             {
                 qCDebug(LOG_VariableAcquisitionWorker()) << tr("onVariableDataAcquired on range ")
                                                          << acqIdentifier << dataRangeAcquired;
                 impl->lockWrite();
                 auto aIdToARit = impl->m_AcqIdentifierToAcqRequestMap.find(acqIdentifier);
                 if (aIdToARit != impl->m_AcqIdentifierToAcqRequestMap.cend()) {
                     // Store the result
                     auto dataPacket = AcquisitionDataPacket{};
                     dataPacket.m_Range = dataRangeAcquired;
                     dataPacket.m_DateSeries = dataSeries;
                     auto aIdToADPVit = impl->m_AcqIdentifierToAcqDataPacketVectorMap.find(acqIdentifier);
                     if (aIdToADPVit != impl->m_AcqIdentifierToAcqDataPacketVectorMap.cend()) {
                         // A current request result already exists, we can update it
                         aIdToADPVit->second.push_back(dataPacket);
                     }
                     else {
                         // First request result for the variable, it must be stored
                         impl->m_AcqIdentifierToAcqDataPacketVectorMap.insert(
                             std::make_pair(acqIdentifier, QVector<AcquisitionDataPacket>() << dataPacket));
                     }
                     // Decrement the counter of the request
                     auto &acqRequest = aIdToARit->second;
                     acqRequest.m_Size = acqRequest.m_Size - 1;
                     // if the counter is 0, we can return data then run the next request if it exists and
                     // removed the finished request
                     if (acqRequest.m_Size == 0) {
                         // Return the data
                         aIdToADPVit = impl->m_AcqIdentifierToAcqDataPacketVectorMap.find(acqIdentifier);
                         if (aIdToADPVit != impl->m_AcqIdentifierToAcqDataPacketVectorMap.cend()) {
                             emit dataProvided(acqRequest.m_vIdentifier, acqRequest.m_RangeRequested,
                                               acqRequest.m_CacheRangeRequested, aIdToADPVit->second);
                         }
                         // Execute the next one
                         auto it
                             = impl->m_VIdentifierToCurrrentAcqIdNextIdPairMap.find(acqRequest.m_vIdentifier);
                         if (it != impl->m_VIdentifierToCurrrentAcqIdNextIdPairMap.cend()) {
                             if (it->second.second.isNull()) {
                                 // There is no next request, we can remove the variable request
                                 impl->removeVariableRequest(acqRequest.m_vIdentifier);
                             }
                             else {
                                 auto acqIdentifierToRemove = it->second.first;
                                 // Move the next request to the current request
                                 it->second.first = it->second.second;
                                 it->second.second = QUuid();
                                 // Remove AcquisitionRequest and results;
                                 impl->m_AcqIdentifierToAcqRequestMap.erase(acqIdentifierToRemove);
                                 impl->m_AcqIdentifierToAcqDataPacketVectorMap.erase(acqIdentifierToRemove);
                                 // Execute the current request
                                 QMetaObject::invokeMethod(this, "onExecuteRequest", Qt::QueuedConnection,
                                                           Q_ARG(QUuid, it->second.first));
                             }
                         }
                         else {
                             qCCritical(LOG_VariableAcquisitionWorker())
                                 << tr("Impossible to execute the acquisition on an unfound variable ");
                         }
                     }
                 }
                 else {
                     qCCritical(LOG_VariableAcquisitionWorker())
                         << tr("Impossible to retrieve AcquisitionRequest for the incoming data");
                 }
                 impl->unlock();
             }
             void VariableAcquisitionWorker::onExecuteRequest(QUuid acqIdentifier)
             {
-                qCInfo(LOG_VariableAcquisitionWorker()) << tr("onExecuteRequest") << QThread::currentThread();
+                qCDebug(LOG_VariableAcquisitionWorker()) << tr("onExecuteRequest") << QThread::currentThread();
                 impl->lockRead();
                 auto it = impl->m_AcqIdentifierToAcqRequestMap.find(acqIdentifier);
                 if (it != impl->m_AcqIdentifierToAcqRequestMap.cend()) {
                     auto request = it->second;
                     impl->unlock();
                     request.m_Provider->requestDataLoading(acqIdentifier, request.m_DataProviderParameters);
                 }
                 else {
                     impl->unlock();
                     // TODO log no acqIdentifier recognized
                 }
             }
             void VariableAcquisitionWorker::initialize()
             {
                 qCDebug(LOG_VariableAcquisitionWorker()) << tr("VariableAcquisitionWorker init")
                                                          << QThread::currentThread();
                 impl->m_WorkingMutex.lock();
                 qCDebug(LOG_VariableAcquisitionWorker()) << tr("VariableAcquisitionWorker init END");
             }
             void VariableAcquisitionWorker::finalize()
             {
                 impl->m_WorkingMutex.unlock();
             }
             void VariableAcquisitionWorker::waitForFinish()
             {
                 QMutexLocker locker{&impl->m_WorkingMutex};
             }
             void VariableAcquisitionWorker::VariableAcquisitionWorkerPrivate::removeVariableRequest(
                 QUuid vIdentifier)
             {
                 lockWrite();
                 auto it = m_VIdentifierToCurrrentAcqIdNextIdPairMap.find(vIdentifier);
                 if (it != m_VIdentifierToCurrrentAcqIdNextIdPairMap.cend()) {
                     // A current request already exists, we can replace the next one
                     m_AcqIdentifierToAcqRequestMap.erase(it->second.first);
                     m_AcqIdentifierToAcqDataPacketVectorMap.erase(it->second.first);
                     m_AcqIdentifierToAcqRequestMap.erase(it->second.second);
                     m_AcqIdentifierToAcqDataPacketVectorMap.erase(it->second.second);
                 }
                 m_VIdentifierToCurrrentAcqIdNextIdPairMap.erase(vIdentifier);
                 unlock();
             }

core/src/Variable/VariableCacheStrategy.cpp +1 -1

             #include "Variable/VariableCacheStrategy.h"
             #include "Settings/SqpSettingsDefs.h"
             #include "Variable/Variable.h"
             #include "Variable/VariableController.h"
             Q_LOGGING_CATEGORY(LOG_VariableCacheStrategy, "VariableCacheStrategy")
             struct VariableCacheStrategy::VariableCacheStrategyPrivate {
                 VariableCacheStrategyPrivate() : m_CacheStrategy{CacheStrategy::FixedTolerance} {}
                 CacheStrategy m_CacheStrategy;
             };
             VariableCacheStrategy::VariableCacheStrategy(QObject *parent)
                     : QObject{parent}, impl{spimpl::make_unique_impl<VariableCacheStrategyPrivate>()}
             {
             }
             std::pair<SqpRange, SqpRange>
-            VariableCacheStrategy::computeCacheRange(const SqpRange &vRange, const SqpRange &rangeRequested)
+            VariableCacheStrategy::computeStrategyRanges(const SqpRange &vRange, const SqpRange &rangeRequested)
             {
                 auto varRanges = std::pair<SqpRange, SqpRange>{};
                 auto toleranceFactor = SqpSettings::toleranceValue(GENERAL_TOLERANCE_AT_UPDATE_KEY,
                                                                    GENERAL_TOLERANCE_AT_UPDATE_DEFAULT_VALUE);
                 auto tolerance = toleranceFactor * (rangeRequested.m_TEnd - rangeRequested.m_TStart);
                 switch (impl->m_CacheStrategy) {
                     case CacheStrategy::FixedTolerance: {
                         varRanges.first = rangeRequested;
                         varRanges.second
                             = SqpRange{rangeRequested.m_TStart - tolerance, rangeRequested.m_TEnd + tolerance};
                         break;
                     }
                     case CacheStrategy::TwoThreashold: {
                         // TODO Implement
                         break;
                     }
                     default:
                         qCCritical(LOG_VariableCacheStrategy())
                             << tr("Impossible to use compute the cache range with an unknow cache strategy");
                         // No action
                         break;
                 }
                 return varRanges;
             }

core/src/Variable/VariableController.cpp +229 -43

             #include <Variable/Variable.h>
             #include <Variable/VariableAcquisitionWorker.h>
-            #include <Variable/VariableCacheController.h>
             #include <Variable/VariableCacheStrategy.h>
             #include <Variable/VariableController.h>
             #include <Variable/VariableModel.h>
             #include <Variable/VariableSynchronizationGroup.h>
             #include <Data/DataProviderParameters.h>
             #include <Data/IDataProvider.h>
             #include <Data/IDataSeries.h>
+            #include <Data/VariableRequest.h>
             #include <Time/TimeController.h>
             #include <QMutex>
             #include <QThread>
             #include <QUuid>
             #include <QtCore/QItemSelectionModel>
+            #include <deque>
             #include <set>
             #include <unordered_map>
             Q_LOGGING_CATEGORY(LOG_VariableController, "VariableController")
             namespace {
             SqpRange computeSynchroRangeRequested(const SqpRange &varRange, const SqpRange &graphRange,
                                                   const SqpRange &oldGraphRange)
             {
                 auto zoomType = VariableController::getZoomType(graphRange, oldGraphRange);
                 auto varRangeRequested = varRange;
                 switch (zoomType) {
                     case AcquisitionZoomType::ZoomIn: {
                         auto deltaLeft = graphRange.m_TStart - oldGraphRange.m_TStart;
                         auto deltaRight = oldGraphRange.m_TEnd - graphRange.m_TEnd;
                         varRangeRequested.m_TStart += deltaLeft;
                         varRangeRequested.m_TEnd -= deltaRight;
                         break;
                     }
                     case AcquisitionZoomType::ZoomOut: {
                         auto deltaLeft = oldGraphRange.m_TStart - graphRange.m_TStart;
                         auto deltaRight = graphRange.m_TEnd - oldGraphRange.m_TEnd;
                         varRangeRequested.m_TStart -= deltaLeft;
                         varRangeRequested.m_TEnd += deltaRight;
                         break;
                     }
                     case AcquisitionZoomType::PanRight: {
                         auto deltaRight = graphRange.m_TEnd - oldGraphRange.m_TEnd;
                         varRangeRequested.m_TStart += deltaRight;
                         varRangeRequested.m_TEnd += deltaRight;
                         break;
                     }
                     case AcquisitionZoomType::PanLeft: {
                         auto deltaLeft = oldGraphRange.m_TStart - graphRange.m_TStart;
                         varRangeRequested.m_TStart -= deltaLeft;
                         varRangeRequested.m_TEnd -= deltaLeft;
                         break;
                     }
                     case AcquisitionZoomType::Unknown: {
                         qCCritical(LOG_VariableController())
                             << VariableController::tr("Impossible to synchronize: zoom type unknown");
                         break;
                     }
                     default:
                         qCCritical(LOG_VariableController()) << VariableController::tr(
                             "Impossible to synchronize: zoom type not take into account");
                         // No action
                         break;
                 }
                 return varRangeRequested;
             }
             }
             struct VariableController::VariableControllerPrivate {
                 explicit VariableControllerPrivate(VariableController *parent)
                         : m_WorkingMutex{},
                           m_VariableModel{new VariableModel{parent}},
                           m_VariableSelectionModel{new QItemSelectionModel{m_VariableModel, parent}},
-                          m_VariableCacheController{std::make_unique<VariableCacheController>()},
                           m_VariableCacheStrategy{std::make_unique<VariableCacheStrategy>()},
                           m_VariableAcquisitionWorker{std::make_unique<VariableAcquisitionWorker>()},
                           q{parent}
                 {
                     m_VariableAcquisitionWorker->moveToThread(&m_VariableAcquisitionWorkerThread);
                     m_VariableAcquisitionWorkerThread.setObjectName("VariableAcquisitionWorkerThread");
                 }
                 virtual ~VariableControllerPrivate()
                 {
                     qCDebug(LOG_VariableController()) << tr("VariableControllerPrivate destruction");
                     m_VariableAcquisitionWorkerThread.quit();
                     m_VariableAcquisitionWorkerThread.wait();
                 }
-                void processRequest(std::shared_ptr<Variable> var, const SqpRange &rangeRequested);
+                void processRequest(std::shared_ptr<Variable> var, const SqpRange &rangeRequested,
+                                    QUuid varRequestId);
                 QVector<SqpRange> provideNotInCacheDateTimeList(std::shared_ptr<Variable> variable,
                                                                 const SqpRange &dateTime);
                 std::shared_ptr<Variable> findVariable(QUuid vIdentifier);
                 std::shared_ptr<IDataSeries>
                 retrieveDataSeries(const QVector<AcquisitionDataPacket> acqDataPacketVector);
                 void registerProvider(std::shared_ptr<IDataProvider> provider);
+                void storeVariableRequest(QUuid varId, QUuid varRequestId, const VariableRequest &varRequest);
+                QUuid acceptVariableRequest(QUuid varId, std::shared_ptr<IDataSeries> dataSeries);
+                void updateVariableRequest(QUuid varRequestId);
+                void cancelVariableRequest(QUuid varRequestId);
                 QMutex m_WorkingMutex;
                 /// Variable model. The VariableController has the ownership
                 VariableModel *m_VariableModel;
                 QItemSelectionModel *m_VariableSelectionModel;
                 TimeController *m_TimeController{nullptr};
-                std::unique_ptr<VariableCacheController> m_VariableCacheController;
                 std::unique_ptr<VariableCacheStrategy> m_VariableCacheStrategy;
                 std::unique_ptr<VariableAcquisitionWorker> m_VariableAcquisitionWorker;
                 QThread m_VariableAcquisitionWorkerThread;
                 std::unordered_map<std::shared_ptr<Variable>, std::shared_ptr<IDataProvider> >
                     m_VariableToProviderMap;
                 std::unordered_map<std::shared_ptr<Variable>, QUuid> m_VariableToIdentifierMap;
                 std::map<QUuid, std::shared_ptr<VariableSynchronizationGroup> >
                     m_GroupIdToVariableSynchronizationGroupMap;
                 std::map<QUuid, QUuid> m_VariableIdGroupIdMap;
                 std::set<std::shared_ptr<IDataProvider> > m_ProviderSet;
+                std::map<QUuid, std::map<QUuid, VariableRequest> > m_VarRequestIdToVarIdVarRequestMap;
+                std::map<QUuid, std::deque<QUuid> > m_VarIdToVarRequestIdQueueMap;
                 VariableController *q;
             };
             VariableController::VariableController(QObject *parent)
                     : QObject{parent}, impl{spimpl::make_unique_impl<VariableControllerPrivate>(this)}
             {
                 qCDebug(LOG_VariableController()) << tr("VariableController construction")
                                                   << QThread::currentThread();
                 connect(impl->m_VariableModel, &VariableModel::abortProgessRequested, this,
                         &VariableController::onAbortProgressRequested);
                 connect(impl->m_VariableAcquisitionWorker.get(), &VariableAcquisitionWorker::dataProvided, this,
                         &VariableController::onDataProvided);
                 connect(impl->m_VariableAcquisitionWorker.get(),
                         &VariableAcquisitionWorker::variableRequestInProgress, this,
                         &VariableController::onVariableRetrieveDataInProgress);
                 connect(&impl->m_VariableAcquisitionWorkerThread, &QThread::started,
                         impl->m_VariableAcquisitionWorker.get(), &VariableAcquisitionWorker::initialize);
                 connect(&impl->m_VariableAcquisitionWorkerThread, &QThread::finished,
                         impl->m_VariableAcquisitionWorker.get(), &VariableAcquisitionWorker::finalize);
                 impl->m_VariableAcquisitionWorkerThread.start();
             }
             VariableController::~VariableController()
             {
                 qCDebug(LOG_VariableController()) << tr("VariableController destruction")
                                                   << QThread::currentThread();
                 this->waitForFinish();
             }
             VariableModel *VariableController::variableModel() noexcept
             {
                 return impl->m_VariableModel;
             }
             QItemSelectionModel *VariableController::variableSelectionModel() noexcept
             {
                 return impl->m_VariableSelectionModel;
             }
             void VariableController::setTimeController(TimeController *timeController) noexcept
             {
                 impl->m_TimeController = timeController;
             }
             void VariableController::deleteVariable(std::shared_ptr<Variable> variable) noexcept
             {
                 if (!variable) {
                     qCCritical(LOG_VariableController()) << "Can't delete variable: variable is null";
                     return;
                 }
                 // Spreads in SciQlop that the variable will be deleted, so that potential receivers can
                 // make some treatments before the deletion
                 emit variableAboutToBeDeleted(variable);
                 // Deletes identifier
                 impl->m_VariableToIdentifierMap.erase(variable);
                 // Deletes provider
                 auto nbProvidersDeleted = impl->m_VariableToProviderMap.erase(variable);
                 qCDebug(LOG_VariableController())
                     << tr("Number of providers deleted for variable %1: %2")
                            .arg(variable->name(), QString::number(nbProvidersDeleted));
-                // Clears cache
-                impl->m_VariableCacheController->clear(variable);
                 // Deletes from model
                 impl->m_VariableModel->deleteVariable(variable);
             }
             void VariableController::deleteVariables(
                 const QVector<std::shared_ptr<Variable> > &variables) noexcept
             {
                 for (auto variable : qAsConst(variables)) {
                     deleteVariable(variable);
                 }
             }
             void VariableController::abortProgress(std::shared_ptr<Variable> variable)
             {
             }
             std::shared_ptr<Variable>
             VariableController::createVariable(const QString &name, const QVariantHash &metadata,
                                                std::shared_ptr<IDataProvider> provider) noexcept
             {
                 if (!impl->m_TimeController) {
                     qCCritical(LOG_VariableController())
                         << tr("Impossible to create variable: The time controller is null");
                     return nullptr;
                 }
                 auto range = impl->m_TimeController->dateTime();
                 if (auto newVariable = impl->m_VariableModel->createVariable(name, range, metadata)) {
                     auto identifier = QUuid::createUuid();
                     // store the provider
                     impl->registerProvider(provider);
                     // Associate the provider
                     impl->m_VariableToProviderMap[newVariable] = provider;
                     impl->m_VariableToIdentifierMap[newVariable] = identifier;
-                    impl->processRequest(newVariable, range);
+                    auto varRequestId = QUuid::createUuid();
+                    qCInfo(LOG_VariableController()) << "processRequest for" << name << varRequestId;
+                    impl->processRequest(newVariable, range, varRequestId);
+                    impl->updateVariableRequest(varRequestId);
                     return newVariable;
                 }
             }
             void VariableController::onDateTimeOnSelection(const SqpRange &dateTime)
             {
-                // TODO check synchronisation
+                // TODO check synchronisation and Rescale
                 qCDebug(LOG_VariableController()) << "VariableController::onDateTimeOnSelection"
                                                   << QThread::currentThread()->objectName();
                 auto selectedRows = impl->m_VariableSelectionModel->selectedRows();
+                auto varRequestId = QUuid::createUuid();
                 for (const auto &selectedRow : qAsConst(selectedRows)) {
                     if (auto selectedVariable = impl->m_VariableModel->variable(selectedRow.row())) {
                         selectedVariable->setRange(dateTime);
-                        impl->processRequest(selectedVariable, dateTime);
+                        impl->processRequest(selectedVariable, dateTime, varRequestId);
                         // notify that rescale operation has to be done
                         emit rangeChanged(selectedVariable, dateTime);
                     }
                 }
+                impl->updateVariableRequest(varRequestId);
             }
             void VariableController::onDataProvided(QUuid vIdentifier, const SqpRange &rangeRequested,
                                                     const SqpRange &cacheRangeRequested,
                                                     QVector<AcquisitionDataPacket> dataAcquired)
             {
-                if (auto var = impl->findVariable(vIdentifier)) {
-                    var->setRange(rangeRequested);
-                    var->setCacheRange(cacheRangeRequested);
-                    qCDebug(LOG_VariableController()) << tr("1: onDataProvided") << rangeRequested;
-                    qCDebug(LOG_VariableController()) << tr("2: onDataProvided") << cacheRangeRequested;
                 auto retrievedDataSeries = impl->retrieveDataSeries(dataAcquired);
-                    qCDebug(LOG_VariableController()) << tr("3: onDataProvided")
+                auto varRequestId = impl->acceptVariableRequest(vIdentifier, retrievedDataSeries);
-                                                      << retrievedDataSeries->range();
+                if (!varRequestId.isNull()) {
-                    var->mergeDataSeries(retrievedDataSeries);
+                    impl->updateVariableRequest(varRequestId);
-                    qCDebug(LOG_VariableController()) << tr("4: onDataProvided");
-                    emit var->updated();
-                else {
-                    qCCritical(LOG_VariableController()) << tr("Impossible to provide data to a null variable");
                 }
             }
             void VariableController::onVariableRetrieveDataInProgress(QUuid identifier, double progress)
             {
                 if (auto var = impl->findVariable(identifier)) {
                     impl->m_VariableModel->setDataProgress(var, progress);
                 }
                 else {
                     qCCritical(LOG_VariableController())
                         << tr("Impossible to notify progression of a null variable");
                 }
             }
             void VariableController::onAbortProgressRequested(std::shared_ptr<Variable> variable)
             {
                 qCDebug(LOG_VariableController()) << "TORM: VariableController::onAbortProgressRequested"
                                                   << QThread::currentThread()->objectName();
                 auto it = impl->m_VariableToIdentifierMap.find(variable);
                 if (it != impl->m_VariableToIdentifierMap.cend()) {
                     impl->m_VariableToProviderMap.at(variable)->requestDataAborting(it->second);
                 }
                 else {
                     qCWarning(LOG_VariableController())
                         << tr("Aborting progression of inexistant variable detected !!!")
                         << QThread::currentThread()->objectName();
                 }
             }
             void VariableController::onAddSynchronizationGroupId(QUuid synchronizationGroupId)
             {
                 qCDebug(LOG_VariableController()) << "TORM: VariableController::onAddSynchronizationGroupId"
                                                   << QThread::currentThread()->objectName()
                                                   << synchronizationGroupId;
                 auto vSynchroGroup = std::make_shared<VariableSynchronizationGroup>();
                 impl->m_GroupIdToVariableSynchronizationGroupMap.insert(
                     std::make_pair(synchronizationGroupId, vSynchroGroup));
             }
             void VariableController::onRemoveSynchronizationGroupId(QUuid synchronizationGroupId)
             {
                 impl->m_GroupIdToVariableSynchronizationGroupMap.erase(synchronizationGroupId);
             }
             void VariableController::onAddSynchronized(std::shared_ptr<Variable> variable,
                                                        QUuid synchronizationGroupId)
             {
                 qCDebug(LOG_VariableController()) << "TORM: VariableController::onAddSynchronized"
                                                   << synchronizationGroupId;
                 auto varToVarIdIt = impl->m_VariableToIdentifierMap.find(variable);
                 if (varToVarIdIt != impl->m_VariableToIdentifierMap.cend()) {
                     auto groupIdToVSGIt
                         = impl->m_GroupIdToVariableSynchronizationGroupMap.find(synchronizationGroupId);
                     if (groupIdToVSGIt != impl->m_GroupIdToVariableSynchronizationGroupMap.cend()) {
                         impl->m_VariableIdGroupIdMap.insert(
                             std::make_pair(varToVarIdIt->second, synchronizationGroupId));
                         groupIdToVSGIt->second->addVariableId(varToVarIdIt->second);
                     }
                     else {
                         qCCritical(LOG_VariableController())
                             << tr("Impossible to synchronize a variable with an unknown sycnhronization group")
                             << variable->name();
                     }
                 }
                 else {
                     qCCritical(LOG_VariableController())
                         << tr("Impossible to synchronize a variable with no identifier") << variable->name();
                 }
             }
             void VariableController::onRequestDataLoading(QVector<std::shared_ptr<Variable> > variables,
                                                           const SqpRange &range, const SqpRange &oldRange,
                                                           bool synchronise)
             {
                 // NOTE: oldRange isn't really necessary since oldRange == variable->range().
-                qCDebug(LOG_VariableController()) << "VariableController::onRequestDataLoading"
-                                                  << QThread::currentThread()->objectName();
                 // we want to load data of the variable for the dateTime.
                 // First we check if the cache contains some of them.
                 // For the other, we ask the provider to give them.
+                auto varRequestId = QUuid::createUuid();
+                qCInfo(LOG_VariableController()) << "VariableController::onRequestDataLoading"
+                                                 << QThread::currentThread()->objectName() << varRequestId;
                 for (const auto &var : variables) {
-                    qCDebug(LOG_VariableController()) << "processRequest for" << var->name();
+                    qCDebug(LOG_VariableController()) << "processRequest for" << var->name() << varRequestId;
-                    impl->processRequest(var, range);
+                    impl->processRequest(var, range, varRequestId);
                 }
                 if (synchronise) {
                     // Get the group ids
                     qCDebug(LOG_VariableController())
                         << "TORM VariableController::onRequestDataLoading for synchro var ENABLE";
-                    auto groupIds = std::set<QUuid>();
+                    auto groupIds = std::set<QUuid>{};
+                    auto groupIdToOldRangeMap = std::map<QUuid, SqpRange>{};
                     for (const auto &var : variables) {
                         auto varToVarIdIt = impl->m_VariableToIdentifierMap.find(var);
                         if (varToVarIdIt != impl->m_VariableToIdentifierMap.cend()) {
                             auto vId = varToVarIdIt->second;
                             auto varIdToGroupIdIt = impl->m_VariableIdGroupIdMap.find(vId);
                             if (varIdToGroupIdIt != impl->m_VariableIdGroupIdMap.cend()) {
                                 auto gId = varIdToGroupIdIt->second;
+                                groupIdToOldRangeMap.insert(std::make_pair(gId, var->range()));
                                 if (groupIds.find(gId) == groupIds.cend()) {
                                     qCDebug(LOG_VariableController()) << "Synchro detect group " << gId;
                                     groupIds.insert(gId);
                                 }
                             }
                         }
                     }
                     // We assume here all group ids exist
                     for (const auto &gId : groupIds) {
                         auto vSynchronizationGroup = impl->m_GroupIdToVariableSynchronizationGroupMap.at(gId);
                         auto vSyncIds = vSynchronizationGroup->getIds();
                         qCDebug(LOG_VariableController()) << "Var in synchro group ";
                         for (auto vId : vSyncIds) {
                             auto var = impl->findVariable(vId);
                             // Don't process already processed var
                             if (!variables.contains(var)) {
                                 if (var != nullptr) {
                                     qCDebug(LOG_VariableController()) << "processRequest synchro for"
                                                                       << var->name();
-                                    auto vSyncRangeRequested
+                                    auto vSyncRangeRequested = computeSynchroRangeRequested(
-                                        = computeSynchroRangeRequested(var->range(), range, oldRange);
+                                        var->range(), range, groupIdToOldRangeMap.at(gId));
-                                    impl->processRequest(var, vSyncRangeRequested);
+                                    qCDebug(LOG_VariableController()) << "synchro RR" << vSyncRangeRequested;
+                                    impl->processRequest(var, vSyncRangeRequested, varRequestId);
                                 }
                                 else {
                                     qCCritical(LOG_VariableController())
                                         << tr("Impossible to synchronize a null variable");
                                 }
                             }
                         }
                     }
                 }
+                impl->updateVariableRequest(varRequestId);
             }
             void VariableController::initialize()
             {
                 qCDebug(LOG_VariableController()) << tr("VariableController init") << QThread::currentThread();
                 impl->m_WorkingMutex.lock();
                 qCDebug(LOG_VariableController()) << tr("VariableController init END");
             }
             void VariableController::finalize()
             {
                 impl->m_WorkingMutex.unlock();
             }
             void VariableController::waitForFinish()
             {
                 QMutexLocker locker{&impl->m_WorkingMutex};
             }
             AcquisitionZoomType VariableController::getZoomType(const SqpRange &range, const SqpRange &oldRange)
             {
                 // t1.m_TStart <= t2.m_TStart && t2.m_TEnd <= t1.m_TEnd
                 auto zoomType = AcquisitionZoomType::Unknown;
                 if (range.m_TStart <= oldRange.m_TStart && oldRange.m_TEnd <= range.m_TEnd) {
                     zoomType = AcquisitionZoomType::ZoomOut;
                 }
                 else if (range.m_TStart > oldRange.m_TStart && range.m_TEnd > oldRange.m_TEnd) {
                     zoomType = AcquisitionZoomType::PanRight;
                 }
                 else if (range.m_TStart < oldRange.m_TStart && range.m_TEnd < oldRange.m_TEnd) {
                     zoomType = AcquisitionZoomType::PanLeft;
                 }
                 else if (range.m_TStart > oldRange.m_TStart && oldRange.m_TEnd > range.m_TEnd) {
                     zoomType = AcquisitionZoomType::ZoomIn;
                 }
                 else {
                     qCCritical(LOG_VariableController()) << "getZoomType: Unknown type detected";
                 }
                 return zoomType;
             }
             void VariableController::VariableControllerPrivate::processRequest(std::shared_ptr<Variable> var,
-                                                                               const SqpRange &rangeRequested)
+                                                                               const SqpRange &rangeRequested,
+                                                                               QUuid varRequestId)
             {
-                auto varRangesRequested
+                // TODO: protect at
-                    = m_VariableCacheStrategy->computeCacheRange(var->range(), rangeRequested);
+                auto varRequest = VariableRequest{};
-                auto notInCacheRangeList = var->provideNotInCacheRangeList(varRangesRequested.second);
+                auto varId = m_VariableToIdentifierMap.at(var);
-                auto inCacheRangeList = var->provideInCacheRangeList(varRangesRequested.second);
+                auto varStrategyRangesRequested
+                    = m_VariableCacheStrategy->computeStrategyRanges(var->range(), rangeRequested);
+                auto notInCacheRangeList = var->provideNotInCacheRangeList(varStrategyRangesRequested.second);
+                auto inCacheRangeList = var->provideInCacheRangeList(varStrategyRangesRequested.second);
                 if (!notInCacheRangeList.empty()) {
-                    auto identifier = m_VariableToIdentifierMap.at(var);
+                    varRequest.m_RangeRequested = varStrategyRangesRequested.first;
+                    varRequest.m_CacheRangeRequested = varStrategyRangesRequested.second;
+                    qCDebug(LOG_VariableAcquisitionWorker()) << tr("TORM processRequest RR ") << rangeRequested;
+                    qCDebug(LOG_VariableAcquisitionWorker()) << tr("TORM processRequest R  ")
+                                                             << varStrategyRangesRequested.first;
+                    qCDebug(LOG_VariableAcquisitionWorker()) << tr("TORM processRequest CR ")
+                                                             << varStrategyRangesRequested.second;
+                    // store VarRequest
+                    storeVariableRequest(varId, varRequestId, varRequest);
                     auto varProvider = m_VariableToProviderMap.at(var);
                     if (varProvider != nullptr) {
-                        m_VariableAcquisitionWorker->pushVariableRequest(
+                        auto varRequestIdCanceled = m_VariableAcquisitionWorker->pushVariableRequest(
-                            identifier, varRangesRequested.first, varRangesRequested.second,
+                            varRequestId, varId, varStrategyRangesRequested.first,
+                            varStrategyRangesRequested.second,
                             DataProviderParameters{std::move(notInCacheRangeList), var->metadata()},
                             varProvider);
+                        if (!varRequestIdCanceled.isNull()) {
+                            qCInfo(LOG_VariableAcquisitionWorker()) << tr("varRequestIdCanceled: ")
+                                                                    << varRequestIdCanceled;
+                            cancelVariableRequest(varRequestIdCanceled);
+                        }
                     }
                     else {
                         qCCritical(LOG_VariableController())
                             << "Impossible to provide data with a null provider";
                     }
                     if (!inCacheRangeList.empty()) {
                         emit q->updateVarDisplaying(var, inCacheRangeList.first());
                     }
                 }
                 else {
-                    var->setRange(rangeRequested);
-                    var->setCacheRange(varRangesRequested.second);
+                    varRequest.m_RangeRequested = varStrategyRangesRequested.first;
-                    var->setDataSeries(var->dataSeries()->subDataSeries(varRangesRequested.second));
+                    varRequest.m_CacheRangeRequested = varStrategyRangesRequested.second;
-                    emit var->updated();
+                    // store VarRequest
+                    storeVariableRequest(varId, varRequestId, varRequest);
+                    acceptVariableRequest(varId,
+                                          var->dataSeries()->subDataSeries(varStrategyRangesRequested.second));
                 }
             }
             std::shared_ptr<Variable>
             VariableController::VariableControllerPrivate::findVariable(QUuid vIdentifier)
             {
                 std::shared_ptr<Variable> var;
                 auto findReply = [vIdentifier](const auto &entry) { return vIdentifier == entry.second; };
                 auto end = m_VariableToIdentifierMap.cend();
                 auto it = std::find_if(m_VariableToIdentifierMap.cbegin(), end, findReply);
                 if (it != end) {
                     var = it->first;
                 }
                 else {
                     qCCritical(LOG_VariableController())
                         << tr("Impossible to find the variable with the identifier: ") << vIdentifier;
                 }
                 return var;
             }
             std::shared_ptr<IDataSeries> VariableController::VariableControllerPrivate::retrieveDataSeries(
                 const QVector<AcquisitionDataPacket> acqDataPacketVector)
             {
                 qCDebug(LOG_VariableController()) << tr("TORM: retrieveDataSeries acqDataPacketVector size")
                                                   << acqDataPacketVector.size();
                 std::shared_ptr<IDataSeries> dataSeries;
                 if (!acqDataPacketVector.isEmpty()) {
                     dataSeries = acqDataPacketVector[0].m_DateSeries;
                     for (int i = 1; i < acqDataPacketVector.size(); ++i) {
                         dataSeries->merge(acqDataPacketVector[i].m_DateSeries.get());
                     }
                 }
                 qCDebug(LOG_VariableController()) << tr("TORM: retrieveDataSeries acqDataPacketVector size END")
                                                   << acqDataPacketVector.size();
                 return dataSeries;
             }
             void VariableController::VariableControllerPrivate::registerProvider(
                 std::shared_ptr<IDataProvider> provider)
             {
                 if (m_ProviderSet.find(provider) == m_ProviderSet.end()) {
                     qCDebug(LOG_VariableController()) << tr("Registering of a new provider")
                                                       << provider->objectName();
                     m_ProviderSet.insert(provider);
                     connect(provider.get(), &IDataProvider::dataProvided, m_VariableAcquisitionWorker.get(),
                             &VariableAcquisitionWorker::onVariableDataAcquired);
                     connect(provider.get(), &IDataProvider::dataProvidedProgress,
                             m_VariableAcquisitionWorker.get(),
                             &VariableAcquisitionWorker::onVariableRetrieveDataInProgress);
                 }
                 else {
                     qCDebug(LOG_VariableController()) << tr("Cannot register provider, it already exists ");
                 }
             }
+            void VariableController::VariableControllerPrivate::storeVariableRequest(
+                QUuid varId, QUuid varRequestId, const VariableRequest &varRequest)
+            {
+                // First request for the variable. we can create an entry for it
+                auto varIdToVarRequestIdQueueMapIt = m_VarIdToVarRequestIdQueueMap.find(varId);
+                if (varIdToVarRequestIdQueueMapIt == m_VarIdToVarRequestIdQueueMap.cend()) {
+                    auto varRequestIdQueue = std::deque<QUuid>{};
+                    qCDebug(LOG_VariableController()) << tr("Store REQUEST in  QUEUE");
+                    varRequestIdQueue.push_back(varRequestId);
+                    m_VarIdToVarRequestIdQueueMap.insert(std::make_pair(varId, std::move(varRequestIdQueue)));
+                }
+                else {
+                    qCDebug(LOG_VariableController()) << tr("Store REQUEST in EXISTING QUEUE");
+                    auto &varRequestIdQueue = varIdToVarRequestIdQueueMapIt->second;
+                    varRequestIdQueue.push_back(varRequestId);
+                }
+                auto varRequestIdToVarIdVarRequestMapIt = m_VarRequestIdToVarIdVarRequestMap.find(varRequestId);
+                if (varRequestIdToVarIdVarRequestMapIt == m_VarRequestIdToVarIdVarRequestMap.cend()) {
+                    auto varIdToVarRequestMap = std::map<QUuid, VariableRequest>{};
+                    varIdToVarRequestMap.insert(std::make_pair(varId, varRequest));
+                    qCDebug(LOG_VariableController()) << tr("Store REQUESTID in MAP");
+                    m_VarRequestIdToVarIdVarRequestMap.insert(
+                        std::make_pair(varRequestId, std::move(varIdToVarRequestMap)));
+                }
+                else {
+                    auto &varIdToVarRequestMap = varRequestIdToVarIdVarRequestMapIt->second;
+                    qCDebug(LOG_VariableController()) << tr("Store REQUESTID in EXISTING MAP");
+                    varIdToVarRequestMap.insert(std::make_pair(varId, varRequest));
+                }
+            }
+            QUuid VariableController::VariableControllerPrivate::acceptVariableRequest(
+                QUuid varId, std::shared_ptr<IDataSeries> dataSeries)
+            {
+                QUuid varRequestId;
+                auto varIdToVarRequestIdQueueMapIt = m_VarIdToVarRequestIdQueueMap.find(varId);
+                if (varIdToVarRequestIdQueueMapIt != m_VarIdToVarRequestIdQueueMap.cend()) {
+                    auto &varRequestIdQueue = varIdToVarRequestIdQueueMapIt->second;
+                    varRequestId = varRequestIdQueue.front();
+                    auto varRequestIdToVarIdVarRequestMapIt
+                        = m_VarRequestIdToVarIdVarRequestMap.find(varRequestId);
+                    if (varRequestIdToVarIdVarRequestMapIt != m_VarRequestIdToVarIdVarRequestMap.cend()) {
+                        auto &varIdToVarRequestMap = varRequestIdToVarIdVarRequestMapIt->second;
+                        auto varIdToVarRequestMapIt = varIdToVarRequestMap.find(varId);
+                        if (varIdToVarRequestMapIt != varIdToVarRequestMap.cend()) {
+                            qCDebug(LOG_VariableController()) << tr("acceptVariableRequest");
+                            auto &varRequest = varIdToVarRequestMapIt->second;
+                            varRequest.m_DataSeries = dataSeries;
+                            varRequest.m_CanUpdate = true;
+                        }
+                        else {
+                            qCDebug(LOG_VariableController())
+                                << tr("Impossible to acceptVariableRequest of a unknown variable id attached "
+                                      "to a variableRequestId")
+                                << varRequestId << varId;
+                        }
+                    }
+                    else {
+                        qCCritical(LOG_VariableController())
+                            << tr("Impossible to acceptVariableRequest of a unknown variableRequestId")
+                            << varRequestId;
+                    }
+                    qCDebug(LOG_VariableController()) << tr("1: erase REQUEST in  QUEUE ?")
+                                                      << varRequestIdQueue.size();
+                    varRequestIdQueue.pop_front();
+                    qCDebug(LOG_VariableController()) << tr("2: erase REQUEST in  QUEUE ?")
+                                                      << varRequestIdQueue.size();
+                    if (varRequestIdQueue.empty()) {
+                        m_VarIdToVarRequestIdQueueMap.erase(varId);
+                    }
+                }
+                else {
+                    qCCritical(LOG_VariableController())
+                        << tr("Impossible to acceptVariableRequest of a unknown variable id") << varId;
+                }
+                return varRequestId;
+            }
+            void VariableController::VariableControllerPrivate::updateVariableRequest(QUuid varRequestId)
+            {
+                auto varRequestIdToVarIdVarRequestMapIt = m_VarRequestIdToVarIdVarRequestMap.find(varRequestId);
+                if (varRequestIdToVarIdVarRequestMapIt != m_VarRequestIdToVarIdVarRequestMap.cend()) {
+                    bool processVariableUpdate = true;
+                    auto &varIdToVarRequestMap = varRequestIdToVarIdVarRequestMapIt->second;
+                    for (auto varIdToVarRequestMapIt = varIdToVarRequestMap.cbegin();
+                         (varIdToVarRequestMapIt != varIdToVarRequestMap.cend()) && processVariableUpdate;
+                         ++varIdToVarRequestMapIt) {
+                        processVariableUpdate &= varIdToVarRequestMapIt->second.m_CanUpdate;
+                        qCDebug(LOG_VariableController()) << tr("updateVariableRequest")
+                                                          << processVariableUpdate;
+                    }
+                    if (processVariableUpdate) {
+                        for (auto varIdToVarRequestMapIt = varIdToVarRequestMap.cbegin();
+                             varIdToVarRequestMapIt != varIdToVarRequestMap.cend(); ++varIdToVarRequestMapIt) {
+                            if (auto var = findVariable(varIdToVarRequestMapIt->first)) {
+                                auto &varRequest = varIdToVarRequestMapIt->second;
+                                var->setRange(varRequest.m_RangeRequested);
+                                var->setCacheRange(varRequest.m_CacheRangeRequested);
+                                qCDebug(LOG_VariableController()) << tr("1: onDataProvided")
+                                                                  << varRequest.m_RangeRequested;
+                                qCDebug(LOG_VariableController()) << tr("2: onDataProvided")
+                                                                  << varRequest.m_CacheRangeRequested;
+                                var->mergeDataSeries(varRequest.m_DataSeries);
+                                qCDebug(LOG_VariableController()) << tr("3: onDataProvided")
+                                                                  << varRequest.m_DataSeries->range();
+                                qCDebug(LOG_VariableController()) << tr("4: onDataProvided");
+                                emit var->updated();
+                            }
+                            else {
+                                qCCritical(LOG_VariableController())
+                                    << tr("Impossible to update data to a null variable");
+                            }
+                        }
+                        // cleaning varRequestId
+                        qCDebug(LOG_VariableController()) << tr("0: erase REQUEST in  MAP ?")
+                                                          << m_VarRequestIdToVarIdVarRequestMap.size();
+                        m_VarRequestIdToVarIdVarRequestMap.erase(varRequestId);
+                        qCDebug(LOG_VariableController()) << tr("1: erase REQUEST in  MAP ?")
+                                                          << m_VarRequestIdToVarIdVarRequestMap.size();
+                    }
+                }
+                else {
+                    qCCritical(LOG_VariableController())
+                        << tr("Cannot updateVariableRequest for a unknow varRequestId") << varRequestId;
+                }
+            }
+            void VariableController::VariableControllerPrivate::cancelVariableRequest(QUuid varRequestId)
+            {
+                // cleaning varRequestId
+                m_VarRequestIdToVarIdVarRequestMap.erase(varRequestId);
+                for (auto varIdToVarRequestIdQueueMapIt = m_VarIdToVarRequestIdQueueMap.begin();
+                     varIdToVarRequestIdQueueMapIt != m_VarIdToVarRequestIdQueueMap.end();) {
+                    auto &varRequestIdQueue = varIdToVarRequestIdQueueMapIt->second;
+                    varRequestIdQueue.erase(
+                        std::remove(varRequestIdQueue.begin(), varRequestIdQueue.end(), varRequestId),
+                        varRequestIdQueue.end());
+                    if (varRequestIdQueue.empty()) {
+                        varIdToVarRequestIdQueueMapIt
+                            = m_VarIdToVarRequestIdQueueMap.erase(varIdToVarRequestIdQueueMapIt);
+                    }
+                    else {
+                        ++varIdToVarRequestIdQueueMapIt;
+                    }
+                }
+            }

gui/src/Visualization/VisualizationZoneWidget.cpp +16 -16

             #include "Visualization/VisualizationZoneWidget.h"
             #include "Visualization/IVisualizationWidgetVisitor.h"
             #include "Visualization/VisualizationGraphWidget.h"
             #include "ui_VisualizationZoneWidget.h"
             #include <Data/SqpRange.h>
             #include <Variable/Variable.h>
             #include <Variable/VariableController.h>
-            #include <cmath>
             #include <QUuid>
             #include <SqpApplication.h>
+            #include <cmath>
             Q_LOGGING_CATEGORY(LOG_VisualizationZoneWidget, "VisualizationZoneWidget")
             namespace {
             /// Minimum height for graph added in zones (in pixels)
             const auto GRAPH_MINIMUM_HEIGHT = 300;
             /// Generates a default name for a new graph, according to the number of graphs already displayed in
             /// the zone
             QString defaultGraphName(const QLayout &layout)
             {
                 auto count = 0;
                 for (auto i = 0; i < layout.count(); ++i) {
                     if (dynamic_cast<VisualizationGraphWidget *>(layout.itemAt(i)->widget())) {
                         count++;
                     }
                 }
                 return QObject::tr("Graph %1").arg(count + 1);
             }
             } // namespace
             struct VisualizationZoneWidget::VisualizationZoneWidgetPrivate {
                 explicit VisualizationZoneWidgetPrivate() : m_SynchronisationGroupId{QUuid::createUuid()} {}
                 QUuid m_SynchronisationGroupId;
             };
             VisualizationZoneWidget::VisualizationZoneWidget(const QString &name, QWidget *parent)
                     : QWidget{parent},
                       ui{new Ui::VisualizationZoneWidget},
                       impl{spimpl::make_unique_impl<VisualizationZoneWidgetPrivate>()}
             {
                 ui->setupUi(this);
                 ui->zoneNameLabel->setText(name);
                 // 'Close' options : widget is deleted when closed
                 setAttribute(Qt::WA_DeleteOnClose);
                 connect(ui->closeButton, &QToolButton::clicked, this, &VisualizationZoneWidget::close);
                 ui->closeButton->setIcon(sqpApp->style()->standardIcon(QStyle::SP_TitleBarCloseButton));
                 // Synchronisation id
                 QMetaObject::invokeMethod(&sqpApp->variableController(), "onAddSynchronizationGroupId",
                                           Qt::QueuedConnection, Q_ARG(QUuid, impl->m_SynchronisationGroupId));
             }
             VisualizationZoneWidget::~VisualizationZoneWidget()
             {
                 delete ui;
             }
             void VisualizationZoneWidget::addGraph(VisualizationGraphWidget *graphWidget)
             {
                 ui->visualizationZoneFrame->layout()->addWidget(graphWidget);
             }
             VisualizationGraphWidget *VisualizationZoneWidget::createGraph(std::shared_ptr<Variable> variable)
             {
                 auto graphWidget = new VisualizationGraphWidget{
                     defaultGraphName(*ui->visualizationZoneFrame->layout()), this};
                 // Set graph properties
                 graphWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding);
                 graphWidget->setMinimumHeight(GRAPH_MINIMUM_HEIGHT);
                 // Lambda to synchronize zone widget
                 auto synchronizeZoneWidget = [this, graphWidget](const SqpRange &graphRange,
                                                                  const SqpRange &oldGraphRange) {
                     auto zoomType = VariableController::getZoomType(graphRange, oldGraphRange);
                     auto frameLayout = ui->visualizationZoneFrame->layout();
                     for (auto i = 0; i < frameLayout->count(); ++i) {
                         auto graphChild
                             = dynamic_cast<VisualizationGraphWidget *>(frameLayout->itemAt(i)->widget());
                         if (graphChild && (graphChild != graphWidget)) {
                             auto graphChildRange = graphChild->graphRange();
                             switch (zoomType) {
                                 case AcquisitionZoomType::ZoomIn: {
                                     auto deltaLeft = graphRange.m_TStart - oldGraphRange.m_TStart;
                                     auto deltaRight = oldGraphRange.m_TEnd - graphRange.m_TEnd;
                                     graphChildRange.m_TStart += deltaLeft;
                                     graphChildRange.m_TEnd -= deltaRight;
-                                    qCCritical(LOG_VisualizationZoneWidget()) << tr("TORM: ZoomIn");
+                                    qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: ZoomIn");
-                                    qCCritical(LOG_VisualizationZoneWidget()) << tr("TORM: deltaLeft")
+                                    qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: deltaLeft")
                                                                            << deltaLeft;
-                                    qCCritical(LOG_VisualizationZoneWidget()) << tr("TORM: deltaRight")
+                                    qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: deltaRight")
                                                                            << deltaRight;
-                                    qCCritical(LOG_VisualizationZoneWidget())
+                                    qCDebug(LOG_VisualizationZoneWidget())
                                         << tr("TORM: dt") << graphRange.m_TEnd - graphRange.m_TStart;
                                     break;
                                 }
                                 case AcquisitionZoomType::ZoomOut: {
-                                    qCCritical(LOG_VisualizationZoneWidget()) << tr("TORM: ZoomOut");
+                                    qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: ZoomOut");
                                     auto deltaLeft = oldGraphRange.m_TStart - graphRange.m_TStart;
                                     auto deltaRight = graphRange.m_TEnd - oldGraphRange.m_TEnd;
-                                    qCCritical(LOG_VisualizationZoneWidget()) << tr("TORM: deltaLeft")
+                                    qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: deltaLeft")
                                                                            << deltaLeft;
-                                    qCCritical(LOG_VisualizationZoneWidget()) << tr("TORM: deltaRight")
+                                    qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: deltaRight")
                                                                            << deltaRight;
-                                    qCCritical(LOG_VisualizationZoneWidget())
+                                    qCDebug(LOG_VisualizationZoneWidget())
                                         << tr("TORM: dt") << graphRange.m_TEnd - graphRange.m_TStart;
                                     graphChildRange.m_TStart -= deltaLeft;
                                     graphChildRange.m_TEnd += deltaRight;
                                     break;
                                 }
                                 case AcquisitionZoomType::PanRight: {
-                                    qCCritical(LOG_VisualizationZoneWidget()) << tr("TORM: PanRight");
+                                    qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: PanRight");
                                     auto deltaRight = graphRange.m_TEnd - oldGraphRange.m_TEnd;
                                     graphChildRange.m_TStart += deltaRight;
                                     graphChildRange.m_TEnd += deltaRight;
-                                    qCCritical(LOG_VisualizationZoneWidget())
+                                    qCDebug(LOG_VisualizationZoneWidget())
                                         << tr("TORM: dt") << graphRange.m_TEnd - graphRange.m_TStart;
                                     break;
                                 }
                                 case AcquisitionZoomType::PanLeft: {
-                                    qCCritical(LOG_VisualizationZoneWidget()) << tr("TORM: PanLeft");
+                                    qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: PanLeft");
                                     auto deltaLeft = oldGraphRange.m_TStart - graphRange.m_TStart;
                                     graphChildRange.m_TStart -= deltaLeft;
                                     graphChildRange.m_TEnd -= deltaLeft;
                                     break;
                                 }
                                 case AcquisitionZoomType::Unknown: {
-                                    qCCritical(LOG_VisualizationZoneWidget())
+                                    qCDebug(LOG_VisualizationZoneWidget())
                                         << tr("Impossible to synchronize: zoom type unknown");
                                     break;
                                 }
                                 default:
                                     qCCritical(LOG_VisualizationZoneWidget())
                                         << tr("Impossible to synchronize: zoom type not take into account");
                                     // No action
                                     break;
                             }
                             graphChild->enableAcquisition(false);
-                            qCCritical(LOG_VisualizationZoneWidget()) << tr("TORM: Range before: ")
+                            qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: Range before: ")
                                                                    << graphChild->graphRange();
-                            qCCritical(LOG_VisualizationZoneWidget()) << tr("TORM: Range after : ")
+                            qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: Range after : ")
                                                                    << graphChildRange;
-                            qCCritical(LOG_VisualizationZoneWidget())
+                            qCDebug(LOG_VisualizationZoneWidget())
                                 << tr("TORM: child dt") << graphChildRange.m_TEnd - graphChildRange.m_TStart;
                             graphChild->setGraphRange(graphChildRange);
                             graphChild->enableAcquisition(true);
                         }
                     }
                 };
                 // connection for synchronization
                 connect(graphWidget, &VisualizationGraphWidget::synchronize, synchronizeZoneWidget);
                 connect(graphWidget, &VisualizationGraphWidget::variableAdded, this,
                         &VisualizationZoneWidget::onVariableAdded);
                 auto range = SqpRange{};
                 // Apply visitor to graph children
                 auto layout = ui->visualizationZoneFrame->layout();
                 if (layout->count() > 0) {
                     // Case of a new graph in a existant zone
                     if (auto visualizationGraphWidget
                         = dynamic_cast<VisualizationGraphWidget *>(layout->itemAt(0)->widget())) {
                         range = visualizationGraphWidget->graphRange();
                     }
                 }
                 else {
                     // Case of a new graph as the first of the zone
                     range = variable->range();
                 }
                 this->addGraph(graphWidget);
                 graphWidget->addVariable(variable, range);
                 // get y using variable range
                 if (auto dataSeries = variable->dataSeries()) {
                     auto valuesBounds = dataSeries->valuesBounds(range.m_TStart, range.m_TEnd);
                     auto end = dataSeries->cend();
                     if (valuesBounds.first != end && valuesBounds.second != end) {
                         auto rangeValue = [](const auto &value) { return std::isnan(value) ? 0. : value; };
                         auto minValue = rangeValue(valuesBounds.first->minValue());
                         auto maxValue = rangeValue(valuesBounds.second->maxValue());
                         graphWidget->setYRange(SqpRange{minValue, maxValue});
                     }
                 }
                 return graphWidget;
             }
             void VisualizationZoneWidget::accept(IVisualizationWidgetVisitor *visitor)
             {
                 if (visitor) {
                     visitor->visitEnter(this);
                     // Apply visitor to graph children
                     auto layout = ui->visualizationZoneFrame->layout();
                     for (auto i = 0; i < layout->count(); ++i) {
                         if (auto item = layout->itemAt(i)) {
                             // Widgets different from graphs are not visited (no action)
                             if (auto visualizationGraphWidget
                                 = dynamic_cast<VisualizationGraphWidget *>(item->widget())) {
                                 visualizationGraphWidget->accept(visitor);
                             }
                         }
                     }
                     visitor->visitLeave(this);
                 }
                 else {
                     qCCritical(LOG_VisualizationZoneWidget()) << tr("Can't visit widget : the visitor is null");
                 }
             }
             bool VisualizationZoneWidget::canDrop(const Variable &variable) const
             {
                 // A tab can always accomodate a variable
                 Q_UNUSED(variable);
                 return true;
             }
             bool VisualizationZoneWidget::contains(const Variable &variable) const
             {
                 Q_UNUSED(variable);
                 return false;
             }
             QString VisualizationZoneWidget::name() const
             {
                 return ui->zoneNameLabel->text();
             }
             void VisualizationZoneWidget::onVariableAdded(std::shared_ptr<Variable> variable)
             {
                 QMetaObject::invokeMethod(&sqpApp->variableController(), "onAddSynchronized",
                                           Qt::QueuedConnection, Q_ARG(std::shared_ptr<Variable>, variable),
                                           Q_ARG(QUuid, impl->m_SynchronisationGroupId));
             }

plugins/amda/include/AmdaPlugin.h +5 -1

             #ifndef SCIQLOP_AMDAPLUGIN_H
             #define SCIQLOP_AMDAPLUGIN_H
             #include "AmdaGlobal.h"
             #include <Plugin/IPlugin.h>
             #include <QLoggingCategory>
             #include <memory>
             Q_DECLARE_LOGGING_CATEGORY(LOG_AmdaPlugin)
+            #ifndef PLUGIN_JSON_FILE_PATH
+            #define PLUGIN_JSON_FILE_PATH "amda.json"
+            #endif
             class DataSourceItem;
             class SCIQLOP_AMDA_EXPORT AmdaPlugin : public QObject, public IPlugin {
                 Q_OBJECT
                 Q_INTERFACES(IPlugin)
-                Q_PLUGIN_METADATA(IID "sciqlop.plugin.IPlugin" FILE "amda.json")
+                Q_PLUGIN_METADATA(IID "sciqlop.plugin.IPlugin" FILE PLUGIN_JSON_FILE_PATH)
             public:
                 /// @sa IPlugin::initialize()
                 void initialize() override;
             };
             #endif // SCIQLOP_AMDAPLUGIN_H

plugins/amda/src/AmdaProvider.cpp +2 -2

             #include "AmdaProvider.h"
             #include "AmdaDefs.h"
             #include "AmdaResultParser.h"
             #include <Common/DateUtils.h>
             #include <Data/DataProviderParameters.h>
             #include <Network/NetworkController.h>
             #include <SqpApplication.h>
             #include <Variable/Variable.h>
             #include <QNetworkAccessManager>
             #include <QNetworkReply>
             #include <QTemporaryFile>
             #include <QThread>
             Q_LOGGING_CATEGORY(LOG_AmdaProvider, "AmdaProvider")
             namespace {
             /// URL format for a request on AMDA server. The parameters are as follows:
             /// - %1: start date
             /// - %2: end date
             /// - %3: parameter id
             const auto AMDA_URL_FORMAT = QStringLiteral(
                 "http://amda.irap.omp.eu/php/rest/"
                 "getParameter.php?startTime=%1&stopTime=%2&parameterID=%3&outputFormat=ASCII&"
                 "timeFormat=ISO8601&gzip=0");
             /// Dates format passed in the URL (e.g 2013-09-23T09:00)
             const auto AMDA_TIME_FORMAT = QStringLiteral("yyyy-MM-ddThh:mm:ss");
             /// Formats a time to a date that can be passed in URL
             QString dateFormat(double sqpRange) noexcept
             {
                 auto dateTime = DateUtils::dateTime(sqpRange);
                 return dateTime.toString(AMDA_TIME_FORMAT);
             }
             AmdaResultParser::ValueType valueType(const QString &valueType)
             {
                 if (valueType == QStringLiteral("scalar")) {
                     return AmdaResultParser::ValueType::SCALAR;
                 }
                 else if (valueType == QStringLiteral("vector")) {
                     return AmdaResultParser::ValueType::VECTOR;
                 }
                 else {
                     return AmdaResultParser::ValueType::UNKNOWN;
                 }
             }
             } // namespace
             AmdaProvider::AmdaProvider()
             {
                 qCDebug(LOG_AmdaProvider()) << tr("AmdaProvider::AmdaProvider") << QThread::currentThread();
                 if (auto app = sqpApp) {
                     auto &networkController = app->networkController();
                     connect(this, SIGNAL(requestConstructed(QNetworkRequest, QUuid,
                                                             std::function<void(QNetworkReply *, QUuid)>)),
                             &networkController,
                             SLOT(onProcessRequested(QNetworkRequest, QUuid,
                                                     std::function<void(QNetworkReply *, QUuid)>)));
                     connect(&sqpApp->networkController(), SIGNAL(replyDownloadProgress(QUuid, double)), this,
                             SIGNAL(dataProvidedProgress(QUuid, double)));
                 }
             }
             void AmdaProvider::requestDataLoading(QUuid acqIdentifier, const DataProviderParameters &parameters)
             {
                 // NOTE: Try to use multithread if possible
                 const auto times = parameters.m_Times;
                 const auto data = parameters.m_Data;
                 for (const auto &dateTime : qAsConst(times)) {
                     this->retrieveData(acqIdentifier, dateTime, data);
-                    // TORM
+                    // TORM when AMDA will support quick asynchrone request
-                    // QThread::msleep(200);
+                    QThread::msleep(1000);
                 }
             }
             void AmdaProvider::requestDataAborting(QUuid acqIdentifier)
             {
                 if (auto app = sqpApp) {
                     auto &networkController = app->networkController();
                     networkController.onReplyCanceled(acqIdentifier);
                 }
             }
             void AmdaProvider::retrieveData(QUuid token, const SqpRange &dateTime, const QVariantHash &data)
             {
                 // Retrieves product ID from data: if the value is invalid, no request is made
                 auto productId = data.value(AMDA_XML_ID_KEY).toString();
                 if (productId.isNull()) {
                     qCCritical(LOG_AmdaProvider()) << tr("Can't retrieve data: unknown product id");
                     return;
                 }
                 qCDebug(LOG_AmdaProvider()) << tr("AmdaProvider::retrieveData") << dateTime;
                 // Retrieves the data type that determines whether the expected format for the result file is
                 // scalar, vector...
                 auto productValueType = valueType(data.value(AMDA_DATA_TYPE_KEY).toString());
                 // /////////// //
                 // Creates URL //
                 // /////////// //
                 auto startDate = dateFormat(dateTime.m_TStart);
                 auto endDate = dateFormat(dateTime.m_TEnd);
                 auto url = QUrl{QString{AMDA_URL_FORMAT}.arg(startDate, endDate, productId)};
                 qCInfo(LOG_AmdaProvider()) << tr("TORM AmdaProvider::retrieveData url:") << url;
                 auto tempFile = std::make_shared<QTemporaryFile>();
                 // LAMBDA
                 auto httpDownloadFinished = [this, dateTime, tempFile,
                                              productValueType](QNetworkReply *reply, QUuid dataId) noexcept {
                     // Don't do anything if the reply was abort
                     if (reply->error() != QNetworkReply::OperationCanceledError) {
                         if (tempFile) {
                             auto replyReadAll = reply->readAll();
                             if (!replyReadAll.isEmpty()) {
                                 tempFile->write(replyReadAll);
                             }
                             tempFile->close();
                             // Parse results file
                             if (auto dataSeries
                                 = AmdaResultParser::readTxt(tempFile->fileName(), productValueType)) {
                                 emit dataProvided(dataId, dataSeries, dateTime);
                             }
                             else {
                                 /// @todo ALX : debug
                             }
                         }
                     }
                 };
                 auto httpFinishedLambda
                     = [this, httpDownloadFinished, tempFile](QNetworkReply *reply, QUuid dataId) noexcept {
                           // Don't do anything if the reply was abort
                           if (reply->error() != QNetworkReply::OperationCanceledError) {
                               auto downloadFileUrl = QUrl{QString{reply->readAll()}};
                               qCInfo(LOG_AmdaProvider())
                                   << tr("TORM AmdaProvider::retrieveData downloadFileUrl:") << downloadFileUrl;
                               // Executes request for downloading file //
                               // Creates destination file
                               if (tempFile->open()) {
                                   // Executes request
                                   emit requestConstructed(QNetworkRequest{downloadFileUrl}, dataId,
                                                           httpDownloadFinished);
                               }
                           }
                       };
                 // //////////////// //
                 // Executes request //
                 // //////////////// //
                 emit requestConstructed(QNetworkRequest{url}, token, httpFinishedLambda);
             }

plugins/amda/tests/TestAmdaAcquisition.cpp +3 -3

             #include "AmdaProvider.h"
             #include "AmdaResultParser.h"
             #include "SqpApplication.h"
             #include <Data/DataSeries.h>
             #include <Data/IDataSeries.h>
             #include <Data/ScalarSeries.h>
             #include <Time/TimeController.h>
             #include <Variable/Variable.h>
             #include <Variable/VariableController.h>
             #include <QObject>
             #include <QtTest>
             #include <memory>
             // TEST with REF:
             // AmdaData-2012-01-01-12-00-00_2012-01-03-12-00-00
             // imf(0) - Type : Local Parameter @ CDPP/AMDA -
             // Name : bx_gse - Units : nT - Size : 1 -
             // Frame : GSE - Mission : ACE -
             // Instrument : MFI - Dataset : mfi_final-prelim
             // REFERENCE DOWNLOAD FILE =
             // http://amda.irap.omp.eu/php/rest/getParameter.php?startTime=2012-01-01T12:00:00&stopTime=2012-01-03T12:00:00&parameterID=imf(0)&outputFormat=ASCII&timeFormat=ISO8601&gzip=0
             namespace {
             /// Path for the tests
             const auto TESTS_RESOURCES_PATH
                 = QFileInfo{QString{AMDA_TESTS_RESOURCES_DIR}, "TestAmdaAcquisition"}.absoluteFilePath();
             const auto TESTS_AMDA_REF_FILE = QString{"AmdaData-2012-01-01-12-00-00_2012-01-03-12-00-00.txt"};
             template <typename T>
             bool compareDataSeries(std::shared_ptr<IDataSeries> candidate, SqpRange candidateCacheRange,
                                    std::shared_ptr<IDataSeries> reference)
             {
                 auto compareLambda = [](const auto &it1, const auto &it2) {
                     return (it1.x() == it2.x()) && (it1.value() == it2.value());
                 };
                 auto candidateDS = std::dynamic_pointer_cast<T>(candidate);
                 auto referenceDS = std::dynamic_pointer_cast<T>(reference);
                 if (candidateDS && referenceDS) {
                     auto itRefs
                         = referenceDS->xAxisRange(candidateCacheRange.m_TStart, candidateCacheRange.m_TEnd);
                     qDebug() << " DISTANCE" << std::distance(candidateDS->cbegin(), candidateDS->cend())
                              << std::distance(itRefs.first, itRefs.second);
                     //        auto xcValue = candidateDS->valuesData()->data();
                     //        auto dist = std::distance(itRefs.first, itRefs.second);
                     //        auto it = itRefs.first;
                     //        for (auto i = 0; i < dist - 1; ++i) {
                     //            ++it;
                     //            qInfo() << "END:" << it->value();
                     //        }
                     //        qDebug() << "END:" << it->value() << xcValue.last();
                     return std::equal(candidateDS->cbegin(), candidateDS->cend(), itRefs.first, itRefs.second,
                                       compareLambda);
                 }
                 else {
                     return false;
                 }
             }
             }
             class TestAmdaAcquisition : public QObject {
                 Q_OBJECT
             private slots:
                 void testAcquisition();
             };
             void TestAmdaAcquisition::testAcquisition()
             {
                 // READ the ref file:
                 auto filePath = QFileInfo{TESTS_RESOURCES_PATH, TESTS_AMDA_REF_FILE}.absoluteFilePath();
                 auto results = AmdaResultParser::readTxt(filePath, AmdaResultParser::ValueType::SCALAR);
                 auto provider = std::make_shared<AmdaProvider>();
                 auto timeController = std::make_unique<TimeController>();
                 auto varRS = QDateTime{QDate{2012, 01, 02}, QTime{2, 3, 0, 0}};
                 auto varRE = QDateTime{QDate{2012, 01, 02}, QTime{2, 4, 0, 0}};
                 auto sqpR = SqpRange{DateUtils::secondsSinceEpoch(varRS), DateUtils::secondsSinceEpoch(varRE)};
                 timeController->onTimeToUpdate(sqpR);
                 QVariantHash metaData;
                 metaData.insert("dataType", "scalar");
                 metaData.insert("xml:id", "imf(0)");
                 VariableController vc;
                 vc.setTimeController(timeController.get());
                 auto var = vc.createVariable("bx_gse", metaData, provider);
                 // 1 : Variable creation
                 QCOMPARE(var->range().m_TStart, sqpR.m_TStart);
                 QCOMPARE(var->range().m_TEnd, sqpR.m_TEnd);
                 qDebug() << " 1: TIMECONTROLLER" << timeController->dateTime();
                 qDebug() << " 1: RANGE     " << var->range();
                 qDebug() << " 1: CACHERANGE" << var->cacheRange();
                 // wait for 10 sec before asking next request toi permit asynchrone process to finish.
                 auto timeToWaitMs = 10000;
                 QEventLoop loop;
                 QTimer::singleShot(timeToWaitMs, &loop, &QEventLoop::quit);
                 loop.exec();
                 // Tests on acquisition operation
                 int count = 1;
                 auto requestDataLoading = [&vc, var, timeToWaitMs, results, &count](auto tStart, auto tEnd) {
                     ++count;
                     auto nextSqpR
                         = SqpRange{DateUtils::secondsSinceEpoch(tStart), DateUtils::secondsSinceEpoch(tEnd)};
                     vc.onRequestDataLoading(QVector<std::shared_ptr<Variable> >{} << var, nextSqpR,
                                             var->range(), true);
                     QEventLoop loop;
                     QTimer::singleShot(timeToWaitMs, &loop, &QEventLoop::quit);
                     loop.exec();
-                    qDebug() << count << "RANGE     " << var->range();
+                    qInfo() << count << "RANGE     " << var->range();
-                    qDebug() << count << "CACHERANGE" << var->cacheRange();
+                    qInfo() << count << "CACHERANGE" << var->cacheRange();
                     QCOMPARE(var->range().m_TStart, nextSqpR.m_TStart);
                     QCOMPARE(var->range().m_TEnd, nextSqpR.m_TEnd);
                     // Verify dataserie
                     QVERIFY(compareDataSeries<ScalarSeries>(var->dataSeries(), var->cacheRange(), results));
                 };
                 // 2 : pan (jump) left for one hour
                 auto nextVarRS = QDateTime{QDate{2012, 01, 02}, QTime{2, 1, 0, 0}};
                 auto nextVarRE = QDateTime{QDate{2012, 01, 02}, QTime{2, 2, 0, 0}};
-                // requestDataLoading(nextVarRS, nextVarRE);
+                requestDataLoading(nextVarRS, nextVarRE);
                 // 3 : pan (jump) right for one hour
                 nextVarRS = QDateTime{QDate{2012, 01, 02}, QTime{2, 5, 0, 0}};
                 nextVarRE = QDateTime{QDate{2012, 01, 02}, QTime{2, 6, 0, 0}};
                 requestDataLoading(nextVarRS, nextVarRE);
                 // 4 : pan (overlay) right for 30 min
                 nextVarRS = QDateTime{QDate{2012, 01, 02}, QTime{2, 5, 30, 0}};
                 nextVarRE = QDateTime{QDate{2012, 01, 02}, QTime{2, 6, 30, 0}};
                 // requestDataLoading(nextVarRS, nextVarRE);
                 // 5 : pan (overlay) left for 30 min
                 nextVarRS = QDateTime{QDate{2012, 01, 02}, QTime{2, 5, 0, 0}};
                 nextVarRE = QDateTime{QDate{2012, 01, 02}, QTime{2, 6, 0, 0}};
                 // requestDataLoading(nextVarRS, nextVarRE);
                 // 6 : pan (overlay) left for 30 min - BIS
                 nextVarRS = QDateTime{QDate{2012, 01, 02}, QTime{2, 4, 30, 0}};
                 nextVarRE = QDateTime{QDate{2012, 01, 02}, QTime{2, 5, 30, 0}};
                 // requestDataLoading(nextVarRS, nextVarRE);
                 // 7 : Zoom in Inside 20 min range
                 nextVarRS = QDateTime{QDate{2012, 01, 02}, QTime{2, 4, 50, 0}};
                 nextVarRE = QDateTime{QDate{2012, 01, 02}, QTime{2, 5, 10, 0}};
                 // requestDataLoading(nextVarRS, nextVarRE);
                 // 8 : Zoom out Inside 2 hours range
                 nextVarRS = QDateTime{QDate{2012, 01, 02}, QTime{2, 4, 0, 0}};
                 nextVarRE = QDateTime{QDate{2012, 01, 02}, QTime{2, 6, 0, 0}};
                 // requestDataLoading(nextVarRS, nextVarRE);
                 // Close the app after 10 sec
                 QTimer::singleShot(timeToWaitMs, &loop, &QEventLoop::quit);
                 loop.exec();
             }
             int main(int argc, char *argv[])
             {
                 SqpApplication app(argc, argv);
                 app.setAttribute(Qt::AA_Use96Dpi, true);
                 TestAmdaAcquisition tc;
                 QTEST_SET_MAIN_SOURCE_PATH
                 return QTest::qExec(&tc, argc, argv);
             }
             // QTEST_MAIN(TestAmdaAcquisition)
             #include "TestAmdaAcquisition.moc"

plugins/mockplugin/include/MockPlugin.h +5 -1

             #ifndef SCIQLOP_MOCKPLUGIN_H
             #define SCIQLOP_MOCKPLUGIN_H
             #include "MockPluginGlobal.h"
             #include <Plugin/IPlugin.h>
             #include <QLoggingCategory>
             #include <memory>
+            #ifndef PLUGIN_JSON_FILE_PATH
+            #define PLUGIN_JSON_FILE_PATH "mockplugin.json"
+            #endif
             Q_DECLARE_LOGGING_CATEGORY(LOG_MockPlugin)
             class DataSourceItem;
             class SCIQLOP_MOCKPLUGIN_EXPORT MockPlugin : public QObject, public IPlugin {
                 Q_OBJECT
                 Q_INTERFACES(IPlugin)
-                Q_PLUGIN_METADATA(IID "sciqlop.plugin.IPlugin" FILE "mockplugin.json")
+                Q_PLUGIN_METADATA(IID "sciqlop.plugin.IPlugin" FILE PLUGIN_JSON_FILE_PATH)
             public:
                 /// @sa IPlugin::initialize()
                 void initialize() override;
             };
             #endif // SCIQLOP_MOCKPLUGIN_H

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