| @@ -0,0 +1,5 | |||
|
|
1 | AmdaResultParser\.h:\d+:.*IPSIS_S01.* | |
|
|
2 | AmdaResultParserHelper\.h:\d+:.*IPSIS_S01.* | |
|
|
3 | ||
|
|
4 | AmdaProvider\.cpp:\d+:.*IPSIS_S04_VARIABLE.*found: QStringLiteral | |
|
|
5 | AmdaResultParserHelper\.cpp:\d+:.*IPSIS_S04_VARIABLE.*found: QT_VERSION_CHECK No newline at end of file | |
| @@ -92,7 +92,7 SCIQLOP_COPY_TO_TARGET(LIBRARY ${SQPAMDA_LIBRARY_NAME} ${EXTERN_SHARED_LIBRARIES | |||
|
|
92 | 92 | LIST(APPEND CHECKSTYLE_INPUT_FILES ${MODULE_SOURCES}) |
|
|
93 | 93 | SCIQLOP_SET_TO_PARENT_SCOPE(CHECKSTYLE_INPUT_FILES) |
|
|
94 | 94 | # Vera++ exclusion files |
|
|
95 |
|
|
|
|
95 | LIST(APPEND CHECKSTYLE_EXCLUSION_FILES ${CMAKE_CURRENT_SOURCE_DIR}/vera-exclusions/exclusions.txt) | |
|
|
96 | 96 | SCIQLOP_SET_TO_PARENT_SCOPE(CHECKSTYLE_EXCLUSION_FILES) |
|
|
97 | 97 | |
|
|
98 | 98 | # |
| @@ -11,8 +11,8 | |||
|
|
11 | 11 | |
|
|
12 | 12 | Q_DECLARE_LOGGING_CATEGORY(LOG_AmdaPlugin) |
|
|
13 | 13 | |
|
|
14 | #ifndef PLUGIN_JSON_FILE_PATH | |
|
|
15 | #define PLUGIN_JSON_FILE_PATH "amda.json" | |
|
|
14 | #ifndef SCIQLOP_PLUGIN_JSON_FILE_PATH | |
|
|
15 | #define SCIQLOP_PLUGIN_JSON_FILE_PATH "amda.json" | |
|
|
16 | 16 | #endif |
|
|
17 | 17 | |
|
|
18 | 18 | class DataSourceItem; |
| @@ -20,7 +20,7 class DataSourceItem; | |||
|
|
20 | 20 | class SCIQLOP_AMDA_EXPORT AmdaPlugin : public QObject, public IPlugin { |
|
|
21 | 21 | Q_OBJECT |
|
|
22 | 22 | Q_INTERFACES(IPlugin) |
|
|
23 | Q_PLUGIN_METADATA(IID "sciqlop.plugin.IPlugin" FILE PLUGIN_JSON_FILE_PATH) | |
|
|
23 | Q_PLUGIN_METADATA(IID "sciqlop.plugin.IPlugin" FILE SCIQLOP_PLUGIN_JSON_FILE_PATH) | |
|
|
24 | 24 | public: |
|
|
25 | 25 | /// @sa IPlugin::initialize() |
|
|
26 | 26 | void initialize() override; |
| @@ -27,10 +27,6 public: | |||
|
|
27 | 27 | |
|
|
28 | 28 | void requestDataAborting(QUuid acqIdentifier) override; |
|
|
29 | 29 | |
|
|
30 | private slots: | |
|
|
31 | void onReplyDownloadProgress(QUuid acqIdentifier, | |
|
|
32 | std::shared_ptr<QNetworkRequest> networkRequest, double progress); | |
|
|
33 | ||
|
|
34 | 30 | private: |
|
|
35 | 31 | void retrieveData(QUuid token, const SqpRange &dateTime, const QVariantHash &data); |
|
|
36 | 32 | |
| @@ -39,6 +35,10 private: | |||
|
|
39 | 35 | |
|
|
40 | 36 | std::map<QUuid, std::map<std::shared_ptr<QNetworkRequest>, double> > |
|
|
41 | 37 | m_AcqIdToRequestProgressMap; |
|
|
38 | ||
|
|
39 | private slots: | |
|
|
40 | void onReplyDownloadProgress(QUuid acqIdentifier, | |
|
|
41 | std::shared_ptr<QNetworkRequest> networkRequest, double progress); | |
|
|
42 | 42 | }; |
|
|
43 | 43 | |
|
|
44 | 44 | #endif // SCIQLOP_AMDAPROVIDER_H |
| @@ -25,7 +25,7 amdaplugin_inc = include_directories(['include', '../../plugin/include']) | |||
|
|
25 | 25 | moc_gen = generator(moc, |
|
|
26 | 26 | output : 'moc_@BASENAME@.cpp', |
|
|
27 | 27 | arguments : ['@INPUT@', |
|
|
28 | '-DPLUGIN_JSON_FILE_PATH="'+meson.source_root()+'/plugins/amda/resources/amda.json"', | |
|
|
28 | '-DSCIQLOP_PLUGIN_JSON_FILE_PATH="'+meson.source_root()+'/plugins/amda/resources/amda.json"', | |
|
|
29 | 29 | '-I', meson.current_source_dir()+'/include', |
|
|
30 | 30 | '-I', meson.current_source_dir()+'/../../plugin/include', |
|
|
31 | 31 | '-o', '@OUTPUT@']) |
General Comments 0
You need to be logged in to leave comments.
Login now