GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1153:07d7d7f01c19

Adds "local server" mode...

Alexandre Leroux -

r1153:07d7d7f01c19

parent child

Context file:

r1153:07d7d7f01c19

Collapse all files

cmake/sciqlop_applications.cmake +1 0

             if(BUILD_TESTS)
                 INCLUDE ("cmake/sciqlop_code_coverage.cmake")
                 APPEND_COVERAGE_COMPILER_FLAGS()
             endif(BUILD_TESTS)
             #
             # Compile the diffents modules
             #
             set(sciqlop-plugin_DIR "${CMAKE_SOURCE_DIR}/plugin/cmake")
             set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${sciqlop-plugin_DIR}")
             ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/plugin")
             set(sciqlop-core_DIR "${CMAKE_SOURCE_DIR}/core/cmake")
             set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${sciqlop-core_DIR}")
             ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/core")
             set(sciqlop-gui_DIR "${CMAKE_SOURCE_DIR}/gui/cmake")
             set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${sciqlop-gui_DIR}")
             ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/gui")
             ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/app")
             OPTION (BUILD_PLUGINS "Build the plugins" OFF)
             IF(BUILD_PLUGINS)
                 set(sciqlop-mockplugin_DIR "${CMAKE_SOURCE_DIR}/plugins/mockplugin/cmake")
                 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${sciqlop-mockplugin_DIR}")
                 ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/plugins/mockplugin")
                 # Sets AMDA server that will be used during execution.
                 # Available values are:
                 # - "default": default AMDA server
                 # - "amdatest": AMDA test server
                 # - "hybrid": use both the default server and the test server (the server used is relative to each product, according to its "server" property in the JSON file)
+            	# - "localhost": use local AMDA server
                 # Any other value will lead to the use of the default server
                 ADD_DEFINITIONS(-DSCIQLOP_AMDA_SERVER="hybrid")
                 set(sciqlop-amda_DIR "${CMAKE_SOURCE_DIR}/plugins/amda/cmake")
                 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${sciqlop-amda_DIR}")
                 ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/plugins/amda")
                 # Temporary target to copy to plugins dir
                 find_package(sciqlop-mockplugin)
                 find_package(sciqlop-amda)
                 ADD_CUSTOM_TARGET(plugins
                     COMMAND ${CMAKE_COMMAND} -E copy ${SCIQLOP-MOCKPLUGIN_LIBRARIES} "${LIBRARY_OUTPUT_PATH}/plugins/${SCIQLOP-MOCKPLUGIN_LIBRARIES_NAME}"
                     COMMAND ${CMAKE_COMMAND} -E copy ${SCIQLOP-AMDA_LIBRARIES} "${LIBRARY_OUTPUT_PATH}/plugins/${SCIQLOP-AMDA_LIBRARIES_NAME}"
                 )
             ENDIF(BUILD_PLUGINS)
             # LOGGER
             set(QTLOGGING_INI_FILE "${CMAKE_SOURCE_DIR}/config/QtProject/qtlogging.ini")
             FILE(COPY ${QTLOGGING_INI_FILE} DESTINATION ${CONFIG_OUTPUT_PATH})
             #
             # Code formatting
             #
             # Vera++ exclusion files
             LIST(APPEND CHECKSTYLE_EXCLUSION_FILES ${CMAKE_CURRENT_SOURCE_DIR}/formatting/vera-exclusions/exclusions.txt)
             #SCIQLOP_SET_TO_PARENT_SCOPE(CHECKSTYLE_EXCLUSION_FILES)
             INCLUDE ("cmake/sciqlop_formatting.cmake")
             #
             # Documentation generation
             #
             INCLUDE ("cmake/sciqlop_doxygen.cmake")
             #
             # Source code analysis
             #
             INCLUDE ("cmake/sciqlop_code_analysis.cmake")
             INCLUDE ("cmake/sciqlop_code_cppcheck.cmake")

meson.build +1 0

             project('SciQLOP', 'cpp',default_options : ['cpp_std=c++14'])
             qt5 = import('qt5')
             qt5core = dependency('qt5', modules : 'Core')
             qt5widgets = dependency('qt5', modules : 'Widgets')
             qt5gui = dependency('qt5', modules : 'Gui')
             qt5svg = dependency('qt5', modules : 'Svg')
             qt5xml = dependency('qt5', modules : 'Xml')
             qt5network = dependency('qt5', modules : 'Network')
             qt5printsupport = dependency('qt5', modules : 'PrintSupport')
             qt5test = dependency('qt5', modules : 'Test')
             moc = find_program('moc-qt5','moc')
             rcc = find_program('rcc-qt5','rcc')
             if build_machine.system()=='darwin'
               add_global_link_arguments('-headerpad_max_install_names', language : 'cpp')
               install_data('build_cfg/mac/sciqlopLOGO.icns', install_dir : 'Contents/Resources')
               install_data('build_cfg/mac/Info.plist', install_dir : 'Contents')
               meson.add_install_script('build_cfg/mac/install_script.sh')
             elif host_machine.system()=='windows'
               meson.add_install_script('build_cfg/windows/install_script.sh')
             endif
             # Sets AMDA server that will be used during execution.
             # Available values are:
             # - "default": default AMDA server
             # - "amdatest": AMDA test server
             # - "hybrid": use both the default server and the test server (the server used is relative to each product, according to its "server" property in the JSON file)
+            # - "localhost": use local AMDA server
             # Any other value will lead to the use of the default server
             add_project_arguments('-DSCIQLOP_AMDA_SERVER="hybrid"', language : 'cpp')
             subdir('core')
             subdir('gui')
             subdir('app')
             subdir('plugins')
             cppcheck = find_program('cppcheck', required : false)
             if cppcheck.found()
               run_target('cppcheck',
                           command : [cppcheck, '--enable=all',
                           '--project=' + join_paths(meson.build_root(), 'compile_commands.json')]
                           )
             endif

plugins/amda/src/AmdaServer.cpp +21 0

             #include "AmdaServer.h"
             #include "AmdaDefs.h"
             Q_LOGGING_CATEGORY(LOG_AmdaServer, "AmdaServer")
             namespace {
             /// URL of the default AMDA server
             const auto AMDA_DEFAULT_SERVER_URL = QStringLiteral("amda.irap.omp.eu");
             /// URL of the AMDA test server
             const auto AMDA_TEST_SERVER_URL = QStringLiteral("amdatest.irap.omp.eu");
+            /// Port used for local server
+            const auto AMDA_LOCAL_SERVER_PORT = 6543;
+            /// URL of the local server
+            const auto AMDA_LOCAL_SERVER_URL
+                = QString{"localhost:%1"}.arg(QString::number(AMDA_LOCAL_SERVER_PORT));
             /// Default AMDA server
             struct AmdaDefaultServer : public AmdaServer {
             public:
                 QString name() const override { return QStringLiteral("AMDA (default)"); }
                 QString url(const QVariantHash &properties) const override
                 {
                     Q_UNUSED(properties);
                     return AMDA_DEFAULT_SERVER_URL;
                 }
             };
             /// Alternative AMDA server (tests)
             struct AmdaTestServer : public AmdaServer {
             public:
                 QString name() const override { return QStringLiteral("AMDA (test)"); }
                 QString url(const QVariantHash &properties) const override
                 {
                     Q_UNUSED(properties);
                     return AMDA_TEST_SERVER_URL;
                 }
             };
             /// Hybrid AMDA server: use both of default and test server.
             /// The server used is relative to each product for which to retrieve url, according to its "server"
             /// property
             struct AmdaHybridServer : public AmdaServer {
             public:
                 QString name() const override { return QStringLiteral("AMDA (hybrid)"); }
                 QString url(const QVariantHash &properties) const override
                 {
                     // Reads "server" property to determine which server url to use
                     auto server = properties.value(AMDA_SERVER_KEY).toString();
                     return server == QString{"amdatest"} ? AMDA_TEST_SERVER_URL : AMDA_DEFAULT_SERVER_URL;
                 }
             };
+            /// Local AMDA server: use local python server to simulate AMDA requests
+            struct AmdaLocalServer : public AmdaServer {
+            public:
+                QString name() const override { return AMDA_LOCAL_SERVER_URL; }
+                QString url(const QVariantHash &properties) const override
+                {
+                    Q_UNUSED(properties);
+                    return AMDA_LOCAL_SERVER_URL;
+                }
+            };
             /// @return an AMDA server instance created from the name of the server passed in parameter. If the
             /// name does not match any known server, a default server instance is created
             std::unique_ptr<AmdaServer> createInstance(const QString &server)
             {
                 if (server == QString{"amdatest"}) {
                     return std::make_unique<AmdaTestServer>();
                 }
                 else if (server == QString{"hybrid"}) {
                     return std::make_unique<AmdaHybridServer>();
                 }
+                else if (server == QString{"localhost"}) {
+                    return std::make_unique<AmdaLocalServer>();
+                }
                 else {
                     if (server != QString{"default"}) {
                         qCWarning(LOG_AmdaServer())
                             << QObject::tr("Unknown server '%1': default AMDA server will be used").arg(server);
                     }
                     return std::make_unique<AmdaDefaultServer>();
                 }
             }
             } // namespace
             AmdaServer &AmdaServer::instance()
             {
                 // Creates instance depending on the SCIQLOP_AMDA_SERVER value at compile time
                 static auto instance = createInstance(SCIQLOP_AMDA_SERVER);
                 return *instance;
             }

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