GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r376:313aeb6a2933

Transits tokens in provider requests

Alexandre Leroux -

r376:313aeb6a2933

parent child

Context file:

r376:313aeb6a2933

Collapse all files

core/include/Data/IDataProvider.h +4 -2

             #include <memory>
             #include <QObject>
+            #include <QUuid>
             #include <Common/MetaTypes.h>
             public:
                 virtual ~IDataProvider() noexcept = default;
-                virtual void requestDataLoading(const QVector<SqpDateTime> &dateTimeList) = 0;
+                virtual void requestDataLoading(QUuid token, const QVector<SqpDateTime> &dateTimeList) = 0;
             signals:
-                void dataProvided(std::shared_ptr<IDataSeries> dateSerie, const SqpDateTime &dateTime);
+                void dataProvided(QUuid token, std::shared_ptr<IDataSeries> dateSerie,
+                                  const SqpDateTime &dateTime);
             };
             // Required for using shared_ptr in signals/slots

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

             #include <QDateTime>
             #include <QMutex>
             #include <QThread>
+            #include <QUuid>
             #include <QtCore/QItemSelectionModel>
             #include <unordered_map>
                 std::unordered_map<std::shared_ptr<Variable>, std::shared_ptr<IDataProvider> >
                     m_VariableToProviderMap;
+                std::unordered_map<std::shared_ptr<Variable>, QUuid> m_VariableToToken;
             };
             VariableController::VariableController(QObject *parent)
                 /// in sciqlop
                 auto dateTime = impl->m_TimeController->dateTime();
                 if (auto newVariable = impl->m_VariableModel->createVariable(name, dateTime)) {
+                    auto token = QUuid::createUuid();
                     // store the provider
                     impl->m_VariableToProviderMap[newVariable] = provider;
+                    impl->m_VariableToToken[newVariable] = token;
                     auto addDateTimeAcquired = [ this, varW = std::weak_ptr<Variable>{newVariable} ](
-                        auto dataSeriesAcquired, auto dateTimeToPutInCache)
+                        QUuid token, auto dataSeriesAcquired, auto dateTimeToPutInCache)
                     {
                         if (auto variable = varW.lock()) {
-                            impl->m_VariableCacheController->addDateTime(variable, dateTimeToPutInCache);
+                            auto varToken = impl->m_VariableToToken.at(variable);
-                            variable->setDataSeries(dataSeriesAcquired);
+                            if (varToken == token) {
+                                impl->m_VariableCacheController->addDateTime(variable, dateTimeToPutInCache);
+                                variable->setDataSeries(dataSeriesAcquired);
+                            }
                         }
                     };
                     if (!dateTimeListNotInCache.empty()) {
                         // Ask the provider for each data on the dateTimeListNotInCache
+                        auto token = impl->m_VariableToToken.at(variable);
                         impl->m_VariableToProviderMap.at(variable)->requestDataLoading(
-                            std::move(dateTimeListNotInCache));
+                            token, std::move(dateTimeListNotInCache));
                     }
                     else {
                         emit variable->updated();

plugins/mockplugin/include/CosinusProvider.h +1 -1

              */
             class SCIQLOP_MOCKPLUGIN_EXPORT CosinusProvider : public IDataProvider {
             public:
-                void requestDataLoading(const QVector<SqpDateTime> &dateTimeList) override;
+                void requestDataLoading(QUuid token, const QVector<SqpDateTime> &dateTimeList) override;
             private:

plugins/mockplugin/src/CosinusProvider.cpp +2 -2

                 return scalarSeries;
             }
-            void CosinusProvider::requestDataLoading(const QVector<SqpDateTime> &dateTimeList)
+            void CosinusProvider::requestDataLoading(QUuid token, const QVector<SqpDateTime> &dateTimeList)
             {
                 qCDebug(LOG_CosinusProvider()) << "CosinusProvider::requestDataLoading"
                                                << QThread::currentThread()->objectName();
                 // NOTE: Try to use multithread if possible
                 for (const auto &dateTime : dateTimeList) {
                     auto scalarSeries = this->retrieveData(DataProviderParameters{dateTime});
-                    emit dataProvided(scalarSeries, dateTime);
+                    emit dataProvided(token, scalarSeries, dateTime);
                 }
             }

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