GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1385:c105882e93b6

remove unused old parameter for worker

perrinel -

r1385:c105882e93b6

parent child

Context file:

r1385:c105882e93b6

core/include/Data/AcquisitionRequest.h 0 -2

                 QUuid m_AcqIdentifier;
                 QUuid m_vIdentifier;
                 DataProviderParameters m_DataProviderParameters;
-                SqpRange m_RangeRequested;
-                SqpRange m_CacheRangeRequested;
                 int m_Size;
                 int m_Progression;
                 std::shared_ptr<IDataProvider> m_Provider;

core/include/Variable/VariableAcquisitionWorker.h +3 -5

                 explicit VariableAcquisitionWorker(QObject *parent = 0);
                 virtual ~VariableAcquisitionWorker();
-                QUuid pushVariableRequest(QUuid varRequestId, QUuid vIdentifier, SqpRange rangeRequested,
+                QUuid pushVariableRequest(QUuid varRequestId, QUuid vIdentifier,
-                                          SqpRange cacheRangeRequested, DataProviderParameters parameters,
+                                          DataProviderParameters parameters,
                                           std::shared_ptr<IDataProvider> provider);
                 void abortProgressRequested(QUuid vIdentifier);
                 void initialize();
                 void finalize();
             signals:
-                void dataProvided(QUuid vIdentifier, const SqpRange &rangeRequested,
+                void dataProvided(QUuid vIdentifier, QVector<AcquisitionDataPacket> dataAcquired);
-                                  const SqpRange &cacheRangeRequested,
-                                  QVector<AcquisitionDataPacket> dataAcquired);
                 void variableRequestInProgress(QUuid vIdentifier, double progress);

core/include/Variable/VariableController.h +1 -3

                 void onUpdateDateTime(std::shared_ptr<Variable> variable, const SqpRange &dateTime);
-                void onDataProvided(QUuid vIdentifier, const SqpRange &rangeRequested,
+                void onDataProvided(QUuid vIdentifier, QVector<AcquisitionDataPacket> dataAcquired);
-                                    const SqpRange &cacheRangeRequested,
-                                    QVector<AcquisitionDataPacket> dataAcquired);
                 void onVariableRetrieveDataInProgress(QUuid identifier, double progress);

core/src/Variable/VariableAcquisitionWorker.cpp +3 -8

             QUuid VariableAcquisitionWorker::pushVariableRequest(QUuid varRequestId, QUuid vIdentifier,
-                                                                 SqpRange rangeRequested,
-                                                                 SqpRange cacheRangeRequested,
                                                                  DataProviderParameters parameters,
                                                                  std::shared_ptr<IDataProvider> provider)
             {
                 qCDebug(LOG_VariableAcquisitionWorker())
-                    << tr("TORM VariableAcquisitionWorker::pushVariableRequest ") << cacheRangeRequested;
+                    << tr("TORM VariableAcquisitionWorker::pushVariableRequest varRequestId: ") << varRequestId
+                    << "vId: " << vIdentifier;
                 auto varRequestIdCanceled = QUuid();
                 // Request creation
                 acqRequest.m_VarRequestId = varRequestId;
                 acqRequest.m_vIdentifier = vIdentifier;
                 acqRequest.m_DataProviderParameters = parameters;
-                acqRequest.m_RangeRequested = rangeRequested;
-                acqRequest.m_CacheRangeRequested = cacheRangeRequested;
                 acqRequest.m_Size = parameters.m_Times.size();
                 acqRequest.m_Provider = provider;
                     // removed the finished request
                     if (acqRequest.m_Size == acqRequest.m_Progression) {
                         auto varId = acqRequest.m_vIdentifier;
-                        auto rangeRequested = acqRequest.m_RangeRequested;
-                        auto cacheRangeRequested = acqRequest.m_CacheRangeRequested;
                         // Return the data
                         aIdToADPVit = impl->m_AcqIdentifierToAcqDataPacketVectorMap.find(acqIdentifier);
                         if (aIdToADPVit != impl->m_AcqIdentifierToAcqDataPacketVectorMap.cend()) {
-                            emit dataProvided(varId, rangeRequested, cacheRangeRequested, aIdToADPVit->second);
+                            emit dataProvided(varId, aIdToADPVit->second);
                         }
                         impl->unlock();

core/src/Variable/VariableController.cpp +6 -12

                     this->onRequestDataLoading(QVector<std::shared_ptr<Variable> >{newVariable}, range, false);
-                    //        auto varRequestId = QUuid::createUuid();
-                    //        qCInfo(LOG_VariableController()) << "createVariable: " << varId << varRequestId;
-                    //        impl->processRequest(newVariable, range, varRequestId);
-                    //        impl->updateVariableRequest(varRequestId);
                     emit variableAdded(newVariable);
                     return newVariable;
                 this->onRequestDataLoading(QVector<std::shared_ptr<Variable> >{variable}, dateTime, synchro);
             }
-            void VariableController::onDataProvided(QUuid vIdentifier, const SqpRange &rangeRequested,
+            void VariableController::onDataProvided(QUuid vIdentifier,
-                                                    const SqpRange &cacheRangeRequested,
                                                     QVector<AcquisitionDataPacket> dataAcquired)
             {
                 qCDebug(LOG_VariableController()) << tr("onDataProvided") << QThread::currentThread();
             void VariableController::onVariableRetrieveDataInProgress(QUuid identifier, double progress)
             {
-                qCDebug(LOG_VariableController())
+                qCDebug(LOG_VariableController()) << "TORM: variableController::onVariableRetrieveDataInProgress"
-                    << "TORM: variableController::onVariableRetrieveDataInProgress"
+                                                 << QThread::currentThread()->objectName() << progress;
-                    << QThread::currentThread()->objectName() << progress;
                 if (auto var = impl->findVariable(identifier)) {
+                    qCDebug(LOG_VariableController())
+                        << "TORM: variableController::onVariableRetrieveDataInProgress FOUND";
                     impl->m_VariableModel->setDataProgress(var, progress);
                 }
                 else {
                         qCDebug(LOG_VariableController()) << "executeVarRequest " << varRequest.m_RangeRequested
                                                           << varRequest.m_CacheRangeRequested;
                         m_VariableAcquisitionWorker->pushVariableRequest(
-                            varRequest.m_VariableGroupId, varId, varRequest.m_RangeRequested,
+                            varRequest.m_VariableGroupId, varId,
-                            varRequest.m_CacheRangeRequested,
                             DataProviderParameters{std::move(notInCacheRangeList), var->metadata()},
                             varProvider);
                     }

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