Auto status change to "Under Review"
@@ -47,6 +47,12 signals: | |||
|
47 | 47 | void dataProvided(QUuid identifier, std::shared_ptr<IDataSeries> dateSerie, |
|
48 | 48 | const SqpDateTime &dateTime); |
|
49 | 49 | |
|
50 | /** | |
|
51 | * @brief dataProvided send dataSeries under dateTime and that corresponds of the data | |
|
52 | * identified by identifier | |
|
53 | */ | |
|
54 | void dataProvidedProgress(QUuid identifier, double progress); | |
|
55 | ||
|
50 | 56 | |
|
51 | 57 | /** |
|
52 | 58 | * @brief requestConstructed send a request for the data identified by identifier |
@@ -32,9 +32,9 NetworkController::NetworkController(QObject *parent) | |||
|
32 | 32 | void NetworkController::onProcessRequested(const QNetworkRequest &request, QUuid identifier, |
|
33 | 33 | std::function<void(QNetworkReply *, QUuid)> callback) |
|
34 | 34 | { |
|
35 | auto reply = impl->m_AccessManager->get(request); | |
|
36 | 35 | qCDebug(LOG_NetworkController()) << tr("NetworkController registered") |
|
37 |
<< QThread::currentThread() |
|
|
36 | << QThread::currentThread()->objectName(); | |
|
37 | auto reply = impl->m_AccessManager->get(request); | |
|
38 | 38 | |
|
39 | 39 | // Store the couple reply id |
|
40 | 40 | impl->lockWrite(); |
@@ -81,6 +81,8 void NetworkController::onProcessRequested(const QNetworkRequest &request, QUuid | |||
|
81 | 81 | |
|
82 | 82 | connect(reply, &QNetworkReply::finished, this, onReplyFinished); |
|
83 | 83 | connect(reply, &QNetworkReply::downloadProgress, this, onReplyProgress); |
|
84 | qCDebug(LOG_NetworkController()) << tr("NetworkController registered END") | |
|
85 | << QThread::currentThread()->objectName() << reply; | |
|
84 | 86 | } |
|
85 | 87 | |
|
86 | 88 | void NetworkController::initialize() |
@@ -88,6 +90,17 void NetworkController::initialize() | |||
|
88 | 90 | qCDebug(LOG_NetworkController()) << tr("NetworkController init") << QThread::currentThread(); |
|
89 | 91 | impl->m_WorkingMutex.lock(); |
|
90 | 92 | impl->m_AccessManager = std::make_unique<QNetworkAccessManager>(); |
|
93 | ||
|
94 | ||
|
95 | auto onReplyErrors = [this](QNetworkReply *reply, const QList<QSslError> &errors) { | |
|
96 | ||
|
97 | qCCritical(LOG_NetworkController()) << tr("NetworkAcessManager errors: ") << errors; | |
|
98 | ||
|
99 | }; | |
|
100 | ||
|
101 | ||
|
102 | connect(impl->m_AccessManager.get(), &QNetworkAccessManager::sslErrors, this, onReplyErrors); | |
|
103 | ||
|
91 | 104 | qCDebug(LOG_NetworkController()) << tr("NetworkController init END"); |
|
92 | 105 | } |
|
93 | 106 |
@@ -144,6 +144,8 void VariableController::createVariable(const QString &name, const QVariantHash | |||
|
144 | 144 | }; |
|
145 | 145 | |
|
146 | 146 | connect(provider.get(), &IDataProvider::dataProvided, addDateTimeAcquired); |
|
147 | connect(provider.get(), &IDataProvider::dataProvidedProgress, this, | |
|
148 | &VariableController::onVariableRetrieveDataInProgress); | |
|
147 | 149 | this->onRequestDataLoading(newVariable, dateTime); |
|
148 | 150 | } |
|
149 | 151 | } |
@@ -106,11 +106,6 SqpApplication::SqpApplication(int &argc, char **argv) | |||
|
106 | 106 | impl->m_NetworkControllerThread.start(); |
|
107 | 107 | impl->m_VariableControllerThread.start(); |
|
108 | 108 | impl->m_VisualizationControllerThread.start(); |
|
109 | ||
|
110 | // Core connections: | |
|
111 | // NetworkController <-> VariableController | |
|
112 | connect(&sqpApp->networkController(), &NetworkController::replyDownloadProgress, | |
|
113 | &sqpApp->variableController(), &VariableController::onVariableRetrieveDataInProgress); | |
|
114 | 109 | } |
|
115 | 110 | |
|
116 | 111 | SqpApplication::~SqpApplication() |
@@ -48,6 +48,10 AmdaProvider::AmdaProvider() | |||
|
48 | 48 | &networkController, |
|
49 | 49 | SLOT(onProcessRequested(QNetworkRequest, QUuid, |
|
50 | 50 | std::function<void(QNetworkReply *, QUuid)>))); |
|
51 | ||
|
52 | ||
|
53 | connect(&sqpApp->networkController(), SIGNAL(replyDownloadProgress(QUuid, double)), this, | |
|
54 | SIGNAL(dataProvidedProgress(QUuid, double))); | |
|
51 | 55 | } |
|
52 | 56 | } |
|
53 | 57 |
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