GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1144:ccbc4ffe2a72

Creates AMDAServer class...

Alexandre Leroux -

r1144:ccbc4ffe2a72

parent child

Context file:

r1144:ccbc4ffe2a72

Collapse all files

plugins/amda/include/AmdaServer.h created 644 +28 0

@@ -0,0 +1,28
	1	#ifndef SCIQLOP_AMDASERVER_H
	2	#define SCIQLOP_AMDASERVER_H
	3
	4	#include <QLoggingCategory>
	5
	6	#include <memory>
	7
	8	Q_DECLARE_LOGGING_CATEGORY(LOG_AmdaServer)
	9
	10	/**
	11	* @brief The AmdaServer class represents the server used to retrieve AMDA data (singleton).
	12	*
	13	* The server instance is initialized at compile time, as defined by the AMDA_SERVER value.
	14	*/
	15	class AmdaServer {
	16	public:
	17	/// @return the unique instance of the AMDA server
	18	static AmdaServer &instance();
	19
	20	virtual ~AmdaServer() noexcept = default;
	21
	22	/// @return the name of the server
	23	virtual QString name() const = 0;
	24	/// @return the url of the server (used to retrieve data)
	25	virtual QString url() const = 0;
	26	};
	27
	28	#endif // SCIQLOP_AMDASERVER_H

plugins/amda/src/AmdaServer.cpp created 644 +8 0

@@ -0,0 +1,8
	1	#include "AmdaServer.h"
	2
	3	Q_LOGGING_CATEGORY(LOG_AmdaServer, "AmdaServer")
	4
	5	AmdaServer &AmdaServer::instance()
	6	{
	7	/// @todo ALX
	8	}

plugins/amda/meson.build +2 -1

             amdaplugin_moc_headers = [
               'include/AmdaPlugin.h',
               'include/AmdaProvider.h'
             ]
             amdaplugin_sources = [
               'src/AmdaDefs.cpp',
               'src/AmdaParser.cpp',
               'src/AmdaPlugin.cpp',
               'src/AmdaProvider.cpp',
               'src/AmdaResultParser.cpp',
               'src/AmdaResultParserDefs.cpp',
-              'src/AmdaResultParserHelper.cpp'
+              'src/AmdaResultParserHelper.cpp',
+              'src/AmdaServer.cpp'
             ]
             amdaplugin_ui_files = []
             amdaplugin_resources_files = [
               'resources/amdaresources.qrc'
             ]
             amdaplugin_inc = include_directories(['include', '../../plugin/include'])
             moc_gen = generator(moc,
                             output  : 'moc_@BASENAME@.cpp',
                             arguments : ['@INPUT@',
                              '-DPLUGIN_JSON_FILE_PATH="'+meson.source_root()+'/plugins/amda/resources/amda.json"',
                              '-I', meson.current_source_dir()+'/include',
                              '-I', meson.current_source_dir()+'/../../plugin/include',
                              '-o', '@OUTPUT@'])
             rcc_gen = generator(rcc,
                             output  : 'qrc_@BASENAME@.cpp',
                             arguments : ['--name=@BASENAME@"',
                              '--output',
                              '@OUTPUT@',
                              '@INPUT@'])
             amdaplugin_moc_plugin_files = moc_gen.process(amdaplugin_moc_headers)
             amdaplugin_rcc_plugin_files = rcc_gen.process(amdaplugin_resources_files)
             #amdaplugin_rcc_plugin_files = qt5.preprocess(
             #                               qresources : amdaplugin_resources_files)
             amdaplugin_moc_files = qt5.preprocess(
                                            ui_files : amdaplugin_ui_files)
             sciqlop_amdaplugin = library('amdaplugin',
                                    amdaplugin_sources,
                                    amdaplugin_moc_files,
                                    amdaplugin_rcc_plugin_files,
                                    amdaplugin_moc_plugin_files,
                                    cpp_args : ['-DAMDA_LIB','-DQT_PLUGIN'],
                                    include_directories : [amdaplugin_inc],
                                    dependencies : [sciqlop_core, sciqlop_gui],
                                    install : true
                                    )
             tests = [
               [['tests/TestAmdaParser.cpp'],'test_amda_parser','AMDA parser test'],
               [['tests/TestAmdaResultParser.cpp'],'test_amda_result_parser','AMDA result parser test'],
               [['tests/TestAmdaAcquisition.cpp'],'test_amda_acquisition','AMDA Acquisition test']
             ]
             foreach unit_test : tests
               test_moc_files = qt5.preprocess(moc_sources : unit_test[0])
               test_exe = executable(unit_test[1],unit_test[0] , test_moc_files,
                                       link_with : [sciqlop_amdaplugin],
                                       include_directories : [amdaplugin_inc],
                                       cpp_args : ['-DAMDA_TESTS_RESOURCES_DIR="'+meson.current_source_dir()+'/tests-resources"'],
                                       dependencies : [sciqlop_core, sciqlop_gui, qt5test])
               test(unit_test[2], test_exe, args: ['-teamcity', '-o', '@0@.teamcity.txt'.format(unit_test[1])], timeout: 3 * 60)
             endforeach

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