Auto status change to "Under Review"
@@ -40,9 +40,13 public: | |||
|
40 | 40 | |
|
41 | 41 | |
|
42 | 42 | m_DataSourceController->moveToThread(&m_DataSourceControllerThread); |
|
43 | m_DataSourceControllerThread.setObjectName("DataSourceControllerThread"); | |
|
43 | 44 | m_NetworkController->moveToThread(&m_NetworkControllerThread); |
|
45 | m_NetworkControllerThread.setObjectName("NetworkControllerThread"); | |
|
44 | 46 | m_VariableController->moveToThread(&m_VariableControllerThread); |
|
47 | m_VariableControllerThread.setObjectName("VariableControllerThread"); | |
|
45 | 48 | m_VisualizationController->moveToThread(&m_VisualizationControllerThread); |
|
49 | m_VisualizationControllerThread.setObjectName("VsualizationControllerThread"); | |
|
46 | 50 | |
|
47 | 51 | |
|
48 | 52 | // Additionnal init |
@@ -6,7 +6,9 | |||
|
6 | 6 | #include <Data/IDataProvider.h> |
|
7 | 7 | |
|
8 | 8 | #include <QLoggingCategory> |
|
9 | #include <QUuid> | |
|
9 | 10 | |
|
11 | #include <QHash> | |
|
10 | 12 | Q_DECLARE_LOGGING_CATEGORY(LOG_CosinusProvider) |
|
11 | 13 | |
|
12 | 14 | /** |
@@ -14,15 +16,18 Q_DECLARE_LOGGING_CATEGORY(LOG_CosinusProvider) | |||
|
14 | 16 | */ |
|
15 | 17 | class SCIQLOP_MOCKPLUGIN_EXPORT CosinusProvider : public IDataProvider { |
|
16 | 18 | public: |
|
19 | /// @sa IDataProvider::requestDataLoading(). The current impl isn't thread safe. | |
|
17 | 20 | void requestDataLoading(QUuid token, const DataProviderParameters ¶meters) override; |
|
18 | 21 | |
|
19 | 22 | |
|
23 | /// @sa IDataProvider::requestDataAborting(). The current impl isn't thread safe. | |
|
20 | 24 | void requestDataAborting(QUuid identifier) override; |
|
21 | 25 | |
|
22 | 26 | |
|
23 | 27 | private: |
|
24 | /// @sa IDataProvider::retrieveData() | |
|
25 | std::shared_ptr<IDataSeries> retrieveData(const SqpDateTime &dateTime) const; | |
|
28 | std::shared_ptr<IDataSeries> retrieveData(QUuid token, const SqpDateTime &dateTime); | |
|
29 | ||
|
30 | QHash<QUuid, bool> m_VariableToEnableProvider; | |
|
26 | 31 | }; |
|
27 | 32 | |
|
28 | 33 | #endif // SCIQLOP_COSINUSPROVIDER_H |
@@ -6,12 +6,15 | |||
|
6 | 6 | #include <cmath> |
|
7 | 7 | |
|
8 | 8 | #include <QDateTime> |
|
9 | #include <QFuture> | |
|
9 | 10 | #include <QThread> |
|
11 | #include <QtConcurrent/QtConcurrent> | |
|
10 | 12 | |
|
11 | 13 | Q_LOGGING_CATEGORY(LOG_CosinusProvider, "CosinusProvider") |
|
12 | 14 | |
|
13 |
std::shared_ptr<IDataSeries> CosinusProvider::retrieveData(const SqpDateTime &dateTime) |
|
|
15 | std::shared_ptr<IDataSeries> CosinusProvider::retrieveData(QUuid token, const SqpDateTime &dateTime) | |
|
14 | 16 | { |
|
17 | // TODO: Add Mutex | |
|
15 | 18 | auto dataIndex = 0; |
|
16 | 19 | |
|
17 | 20 | // Gets the timerange from the parameters |
@@ -28,26 +31,65 std::shared_ptr<IDataSeries> CosinusProvider::retrieveData(const SqpDateTime &da | |||
|
28 | 31 | auto scalarSeries |
|
29 | 32 | = std::make_shared<ScalarSeries>(end - start, Unit{QStringLiteral("t"), true}, Unit{}); |
|
30 | 33 | |
|
34 | ||
|
35 | int progress = 0; | |
|
36 | auto progressEnd = end - start; | |
|
31 | 37 | for (auto time = start; time < end; ++time, ++dataIndex) { |
|
38 | auto it = m_VariableToEnableProvider.find(token); | |
|
39 | if (it != m_VariableToEnableProvider.end() && it.value()) { | |
|
32 | 40 | const auto timeOnFreq = time / freq; |
|
33 | 41 | scalarSeries->setData(dataIndex, timeOnFreq, std::cos(timeOnFreq)); |
|
42 | ||
|
43 | // progression | |
|
44 | int currentProgress = (time - start) * 100.0 / progressEnd; | |
|
45 | if (currentProgress != progress) { | |
|
46 | progress = currentProgress; | |
|
47 | ||
|
48 | emit dataProvidedProgress(token, progress); | |
|
49 | } | |
|
50 | } | |
|
51 | else { | |
|
52 | if (!it.value()) { | |
|
53 | qCDebug(LOG_CosinusProvider()) | |
|
54 | << "CosinusProvider::retrieveData: ARRET De l'acquisition detectΓ©" | |
|
55 | << end - time; | |
|
56 | } | |
|
57 | } | |
|
34 | 58 | } |
|
59 | emit dataProvidedProgress(token, 0.0); | |
|
60 | ||
|
61 | ||
|
35 | 62 | return scalarSeries; |
|
36 | 63 | } |
|
37 | 64 | |
|
38 | 65 | void CosinusProvider::requestDataLoading(QUuid token, const DataProviderParameters ¶meters) |
|
39 | 66 | { |
|
67 | // TODO: Add Mutex | |
|
68 | m_VariableToEnableProvider[token] = true; | |
|
40 | 69 | qCDebug(LOG_CosinusProvider()) << "CosinusProvider::requestDataLoading" |
|
41 | 70 | << QThread::currentThread()->objectName(); |
|
42 | 71 | // NOTE: Try to use multithread if possible |
|
43 | 72 | const auto times = parameters.m_Times; |
|
73 | ||
|
44 | 74 | for (const auto &dateTime : qAsConst(times)) { |
|
45 | auto scalarSeries = this->retrieveData(dateTime); | |
|
75 | if (m_VariableToEnableProvider[token]) { | |
|
76 | auto scalarSeries = this->retrieveData(token, dateTime); | |
|
46 | 77 | emit dataProvided(token, scalarSeries, dateTime); |
|
47 | 78 | } |
|
48 | 79 | } |
|
80 | } | |
|
49 | 81 | |
|
50 | 82 | void CosinusProvider::requestDataAborting(QUuid identifier) |
|
51 | 83 | { |
|
52 | // TODO | |
|
84 | // TODO: Add Mutex | |
|
85 | qCDebug(LOG_CosinusProvider()) << "CosinusProvider::requestDataAborting" << identifier | |
|
86 | << QThread::currentThread()->objectName(); | |
|
87 | auto it = m_VariableToEnableProvider.find(identifier); | |
|
88 | if (it != m_VariableToEnableProvider.end()) { | |
|
89 | it.value() = false; | |
|
90 | } | |
|
91 | else { | |
|
92 | qCWarning(LOG_CosinusProvider()) | |
|
93 | << tr("Aborting progression of inexistant identifier detected !!!"); | |
|
94 | } | |
|
53 | 95 | } |
General Comments 3
Pull request updated. Auto status change to "Under Review"
Changed commits: * 3 added * 0 removed Changed files: * A plugins/amda/tests-resources/TestAmdaResultParser/FileNotFound.txt * M gui/src/Visualization/operations/RescaleAxeOperation.cpp * M app/src/MainWindow.cpp * M core/include/Data/IDataProvider.h * M core/include/DataSource/DataSourceItemAction.h * M core/include/Variable/VariableController.h * M core/include/Variable/VariableModel.h * M core/include/Visualization/VisualizationController.h * M core/src/Network/NetworkController.cpp * M core/src/Variable/Variable.cpp * M core/src/Variable/VariableController.cpp * M core/src/Variable/VariableModel.cpp * M gui/include/Visualization/VisualizationGraphWidget.h * M gui/include/Visualization/VisualizationWidget.h * M gui/src/SqpApplication.cpp * M gui/src/Variable/VariableInspectorWidget.cpp * M gui/src/Visualization/VisualizationGraphHelper.cpp * M gui/src/Visualization/VisualizationGraphWidget.cpp * M gui/src/Visualization/VisualizationWidget.cpp * M gui/src/Visualization/VisualizationZoneWidget.cpp * M plugins/amda/include/AmdaProvider.h * M plugins/amda/src/AmdaProvider.cpp * M plugins/amda/src/AmdaResultParser.cpp * M plugins/amda/tests/TestAmdaResultParser.cpp * M plugins/mockplugin/include/CosinusProvider.h * M plugins/mockplugin/src/CosinusProvider.cpp * R COPYING * R app/ui/MainWindow.ui * R cmake/sciqlop_package_qt.cmake * R core/include/Common/MetaTypes.h * R core/include/Data/ArrayData.h * R core/include/Data/DataProviderParameters.h * R core/include/Data/DataSeries.h * R core/include/Data/IDataSeries.h * R core/include/Data/ScalarSeries.h * R core/include/Data/SqpDateTime.h * R core/include/Network/NetworkController.h * R core/include/Plugin/PluginManager.h * R core/include/Time/TimeController.h * R core/include/Variable/Variable.h * R core/include/Variable/VariableCacheController.h * R core/src/Data/ScalarSeries.cpp * R core/src/DataSource/DataSourceItemAction.cpp * R core/src/Plugin/PluginManager.cpp * R core/src/Time/TimeController.cpp * R core/src/Variable/VariableCacheController.cpp * R core/src/Visualization/VisualizationController.cpp * R core/tests/Variable/TestVariableCacheController.cpp * R gui/include/DataSource/DataSourceTreeWidgetItem.h * R gui/include/DataSource/DataSourceWidget.h * R gui/include/SidePane/SqpSidePane.h * R gui/include/TimeWidget/TimeWidget.h * R gui/include/Variable/VariableInspectorWidget.h * R gui/include/Variable/VariableMenuHeaderWidget.h * R gui/include/Visualization/IVariableContainer.h * R gui/include/Visualization/IVisualizationWidget.h * R gui/include/Visualization/IVisualizationWidgetVisitor.h * R gui/include/Visualization/VisualizationGraphHelper.h * R gui/include/Visualization/VisualizationTabWidget.h * R gui/include/Visualization/VisualizationZoneWidget.h * R gui/include/Visualization/operations/GenerateVariableMenuOperation.h * R gui/include/Visualization/operations/MenuBuilder.h * R gui/include/Visualization/operations/RemoveVariableOperation.h * R gui/include/Visualization/qcustomplot.h * R gui/resources/icones/dataSourceComponent.png * R gui/resources/icones/dataSourceNode.png * R gui/resources/icones/dataSourceProduct.png * R gui/resources/icones/dataSourceRoot.png * R gui/resources/icones/delete.png * R gui/resources/icones/next.png * R gui/resources/icones/openInspector.png * R gui/resources/icones/plot.png * R gui/resources/icones/previous.png * R gui/resources/icones/sciqlop2PNG_1024.png * R gui/resources/icones/unplot.png * R gui/resources/sqpguiresources.qrc * R gui/src/DataSource/DataSourceTreeWidgetItem.cpp * R gui/src/DataSource/DataSourceWidget.cpp * R gui/src/SidePane/SqpSidePane.cpp * R gui/src/TimeWidget/TimeWidget.cpp * R gui/src/Variable/VariableMenuHeaderWidget.cpp * R gui/src/Visualization/VisualizationTabWidget.cpp * R gui/src/Visualization/operations/GenerateVariableMenuOperation.cpp * R gui/src/Visualization/operations/MenuBuilder.cpp * R gui/src/Visualization/operations/RemoveVariableOperation.cpp * R gui/src/Visualization/qcustomplot.cpp * R gui/ui/DataSource/DataSourceWidget.ui * R gui/ui/SidePane/SqpSidePane.ui * R gui/ui/TimeWidget/TimeWidget.ui * R gui/ui/Variable/VariableInspectorWidget.ui * R gui/ui/Variable/VariableMenuHeaderWidget.ui * R gui/ui/Visualization/VisualizationGraphWidget.ui * R gui/ui/Visualization/VisualizationTabWidget.ui * R gui/ui/Visualization/VisualizationWidget.ui * R gui/ui/Visualization/VisualizationZoneWidget.ui * R gui/vera-exclusions/exclusions.txt * R plugin/CMakeLists.txt * R plugin/cmake/Findsciqlop-plugin.cmake * R plugin/include/Plugin/IPlugin.h * R plugins/amda/CMakeLists.txt * R plugins/amda/cmake/Findsciqlop-amda.cmake * R plugins/amda/include/AmdaDefs.h * R plugins/amda/include/AmdaGlobal.h * R plugins/amda/include/AmdaParser.h * R plugins/amda/include/AmdaPlugin.h * R plugins/amda/include/AmdaResultParser.h * R plugins/amda/resources/amda.json * R plugins/amda/resources/amdaresources.qrc * R plugins/amda/resources/samples/AmdaSample.json * R plugins/amda/src/AmdaDefs.cpp * R plugins/amda/src/AmdaParser.cpp * R plugins/amda/src/AmdaPlugin.cpp * R plugins/amda/tests-resources/TestAmdaParser/TwoRootsFile.json * R plugins/amda/tests-resources/TestAmdaParser/ValidFile1.json * R plugins/amda/tests-resources/TestAmdaParser/WrongRootKey.json * R plugins/amda/tests-resources/TestAmdaParser/WrongRootType.json * R plugins/amda/tests-resources/TestAmdaResultParser/NaNValue.txt * R plugins/amda/tests-resources/TestAmdaResultParser/NoUnit.txt * R plugins/amda/tests-resources/TestAmdaResultParser/TooManyValues.txt * R plugins/amda/tests-resources/TestAmdaResultParser/ValidScalar1.txt * R plugins/amda/tests-resources/TestAmdaResultParser/WrongDate.txt * R plugins/amda/tests-resources/TestAmdaResultParser/WrongUnit.txt * R plugins/amda/tests-resources/TestAmdaResultParser/WrongValue.txt * R plugins/amda/tests/TestAmdaParser.cpp * R plugins/mockplugin/CMakeLists.txt * R plugins/mockplugin/cmake/Findsciqlop-mockplugin.cmake * R plugins/mockplugin/include/MockPlugin.h * R plugins/mockplugin/include/MockPluginGlobal.h * R plugins/mockplugin/resources/mockplugin.json * R plugins/mockplugin/src/MockPlugin.cpp * R README.md * R app/CMakeLists.txt * R app/include/MainWindow.h * R app/src/Main.cpp * R app/vera-exclusions/exclusions.txt * R cmake/sciqlop.cmake * R cmake/sciqlop_applications.cmake * R cmake/sciqlop_package.cmake * R cmake/sciqlop_params.cmake * R core/CMakeLists.txt * R core/include/Common/spimpl.h * R core/include/DataSource/DataSourceController.h * R core/include/DataSource/DataSourceItem.h * R core/src/DataSource/DataSourceController.cpp * R core/src/DataSource/DataSourceItem.cpp * R core/tests/DataSource/TestDataSourceController.cpp * R core/vera-exclusions/exclusions.txt * R formatting/cmake/use_clangformat.cmake * R formatting/vera-exclusions/exclusions.txt * R gui/CMakeLists.txt * R gui/include/SqpApplication.h * R LICENSE * R app/src/mainwindow.cpp * R app/src/mainwindow.ui
Status change > Approved
You need to be logged in to leave comments.
Login now