GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation Commit - r694:34234d13df5c

request is now passed by shared pointer instead of const &

perrinel -

r694:34234d13df5c

parent child

Context file:

r694:34234d13df5c

core/include/Data/IDataProvider.h +1 -1

                   * @brief requestConstructed send a request for the data identified by acqIdentifier
                   * @callback is the methode call by the reply of the request when it is finished.
                   */
-                 void requestConstructed(const QNetworkRequest &request, QUuid acqIdentifier,
+                 void requestConstructed(std::shared_ptr<QNetworkRequest> request, QUuid acqIdentifier,
                                          std::function<void(QNetworkReply *, QUuid)> callback);
              };

core/include/Network/NetworkController.h +6 -2

              #include <QObject>
              #include <QUuid>
+             #include <Common/MetaTypes.h>
              #include <Common/spimpl.h>
              #include <functional>
              public slots:
                  /// Execute request and call callback when the reply is finished. Identifier is attached to the
                  /// callback
-                 void onProcessRequested(const QNetworkRequest &request, QUuid identifier,
+                 void onProcessRequested(std::shared_ptr<QNetworkRequest> request, QUuid identifier,
                                          std::function<void(QNetworkReply *, QUuid)> callback);
                  /// Cancel the request of identifier
                  void onReplyCanceled(QUuid identifier);
              signals:
                  void replyFinished(QNetworkReply *reply, QUuid identifier);
-                 void replyDownloadProgress(QUuid identifier, const QNetworkRequest &networkRequest,
+                 void replyDownloadProgress(QUuid identifier, std::shared_ptr<QNetworkRequest> networkRequest,
                                             double progress);
              private:
                  spimpl::unique_impl_ptr<NetworkControllerPrivate> impl;
              };
+             SCIQLOP_REGISTER_META_TYPE(NETWORKREQUEST_REGISTRY, std::shared_ptr<QNetworkRequest>)
              #endif // SCIQLOP_NETWORKCONTROLLER_H

core/src/Network/NetworkController.cpp +7 -8

              {
              }
-             void NetworkController::onProcessRequested(const QNetworkRequest &request, QUuid identifier,
+             void NetworkController::onProcessRequested(std::shared_ptr<QNetworkRequest> request,
+                                                        QUuid identifier,
                                                         std::function<void(QNetworkReply *, QUuid)> callback)
              {
-                 qCDebug(LOG_NetworkController()) << tr("NetworkController registered")
-                                                  << QThread::currentThread()->objectName();
-                 auto reply = impl->m_AccessManager->get(request);
+                 qCDebug(LOG_NetworkController()) << tr("NetworkController onProcessRequested")
+                                                  << QThread::currentThread()->objectName() << &request;
+                 auto reply = impl->m_AccessManager->get(*request);
                  // Store the couple reply id
                  impl->lockWrite();
                  auto onReplyFinished = [request, reply, this, identifier, callback]() {
                      qCDebug(LOG_NetworkController()) << tr("NetworkController onReplyFinished")
-                                                      << QThread::currentThread() << reply;
+                                                      << QThread::currentThread() << request.get() << reply;
                      impl->lockRead();
                      auto it = impl->m_NetworkReplyToVariableId.find(reply);
                      impl->unlock();
                          // Deletes reply
                          callback(reply, identifier);
                          reply->deleteLater();
-                         emit this->replyDownloadProgress(identifier, request, 0);
                      }
                      qCDebug(LOG_NetworkController()) << tr("NetworkController onReplyFinished END")
                      double progress = (bytesRead * 100.0) / totalBytes;
                      qCDebug(LOG_NetworkController()) << tr("NetworkController onReplyProgress") << progress
-                                                      << QThread::currentThread() << reply;
+                                                      << QThread::currentThread() << request.get() << reply;
                      impl->lockRead();
                      auto it = impl->m_NetworkReplyToVariableId.find(reply);
                      impl->unlock();

core/src/Variable/VariableAcquisitionWorker.cpp +1 -31

                          = std::isnan(progress) ? 0.0 : (progress * currentPartSize) / 100.0;
                      auto currentAlreadyProgress = aIdToARit->second.m_Progression * currentPartSize;
-                     qCInfo(LOG_VariableAcquisitionWorker()) << tr("TORM: progress :") << progress;
-                     qCInfo(LOG_VariableAcquisitionWorker()) << tr("TORM: onVariableRetrieveDataInProgress A:")
-                                                             << aIdToARit->second.m_Progression
-                                                             << aIdToARit->second.m_Size;
-                     qCInfo(LOG_VariableAcquisitionWorker()) << tr("TORM: onVariableRetrieveDataInProgress B:")
-                                                             << currentPartSize;
-                     qCInfo(LOG_VariableAcquisitionWorker()) << tr("TORM: onVariableRetrieveDataInProgress C:")
-                                                             << currentPartProgress;
-                     qCInfo(LOG_VariableAcquisitionWorker()) << tr("TORM: onVariableRetrieveDataInProgress D:")
-                                                             << currentAlreadyProgress;
-                     qCInfo(LOG_VariableAcquisitionWorker()) << tr("TORM: onVariableRetrieveDataInProgress E:")
-                                                             << currentAlreadyProgress + currentPartProgress
-                                                             << "\n";
                      auto finalProgression = currentAlreadyProgress + currentPartProgress;
                      emit variableRequestInProgress(aIdToARit->second.m_vIdentifier, finalProgression);
                                                                     std::shared_ptr<IDataSeries> dataSeries,
                                                                     SqpRange dataRangeAcquired)
              {
-                 qCInfo(LOG_VariableAcquisitionWorker()) << tr("TORM: onVariableDataAcquired on range ")
+                 qCDebug(LOG_VariableAcquisitionWorker()) << tr("TORM: onVariableDataAcquired on range ")
                                                          << acqIdentifier << dataRangeAcquired;
                  impl->lockWrite();
                  auto aIdToARit = impl->m_AcqIdentifierToAcqRequestMap.find(acqIdentifier);
                  m_VIdentifierToCurrrentAcqIdNextIdPairMap.erase(vIdentifier);
                  unlock();
              }
-             //void VariableAcquisitionWorker::onExecuteRequest(QUuid acqIdentifier)
-             //{
-             //    qCDebug(LOG_VariableAcquisitionWorker()) << tr("onExecuteRequest") << QThread::currentThread();
-             //    impl->lockRead();
-             //    auto it = impl->m_AcqIdentifierToAcqRequestMap.find(acqIdentifier);
-             //    if (it != impl->m_AcqIdentifierToAcqRequestMap.cend()) {
-             //        auto request = it->second;
-             //        impl->unlock();
-             //        request.m_Provider->requestDataLoading(acqIdentifier, request.m_DataProviderParameters);
-             //    }
-             //    else {
-             //        impl->unlock();
-             //        // TODO log no acqIdentifier recognized
-             //    }
-             //}

core/src/Variable/VariableController.cpp +2 -1

              void VariableController::onVariableRetrieveDataInProgress(QUuid identifier, double progress)
              {
-                 qCInfo(LOG_VariableController()) << "TORM: ariableController::onVariableRetrieveDataInProgress"
+                 qCDebug(LOG_VariableController())
+                     << "TORM: variableController::onVariableRetrieveDataInProgress"
-                                                  << QThread::currentThread()->objectName() << progress;
                  if (auto var = impl->findVariable(identifier)) {
                      impl->m_VariableModel->setDataProgress(var, progress);

General Comments 2

perrinel

|

Pull request updated. Auto status change to "Under Review"

Changed commits:
  * 2 added
  * 0 removed

Changed files:
  * A core/include/Variable/VariableAcquisitionWorker.h
  * M core/include/Data/IDataProvider.h
  * M core/include/Variable/VariableController.h
  * M core/src/Network/NetworkController.cpp
  * M core/src/Variable/VariableAcquisitionWorker.cpp
  * M core/src/Variable/VariableController.cpp
  * M plugins/amda/src/AmdaProvider.cpp

Write
Preview

You need to be logged in to leave comments. Login now

	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