HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r408:49f712bf7e59

Updates IDataProvider::requestDataLoading() method's signature...

Alexandre Leroux -

r408:49f712bf7e59

parent child

Context file:

r408:49f712bf7e59

Collapse all files

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

              * @sa IDataProvider
              */
             struct DataProviderParameters {
-                SqpDateTime m_Time;
+                QVector<SqpDateTime> m_Times;
             };
             #endif // SCIQLOP_DATAPROVIDERPARAMETERS_H

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

                 virtual ~IDataProvider() noexcept = default;
                 /**
-                 * @brief requestDataLoading provide datas for the data identified by identifier for all
+                 * @brief requestDataLoading provide datas for the data identified by identifier and parameters
-                 * SqpDateTime of dateTimeList
                  */
-                virtual void requestDataLoading(QUuid identifier, const QVector<SqpDateTime> &dateTimeList) = 0;
+                virtual void requestDataLoading(QUuid identifier, const DataProviderParameters &parameters) = 0;
             signals:
                 /**

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

                         // Ask the provider for each data on the dateTimeListNotInCache
                         auto identifier = impl->m_VariableToIdentifier.at(variable);
                         impl->m_VariableToProviderMap.at(variable)->requestDataLoading(
-                            identifier, std::move(dateTimeListNotInCache));
+                            identifier, DataProviderParameters{std::move(dateTimeListNotInCache)});
                     }
                     else {
                         emit variable->updated();

plugins/amda/include/AmdaProvider.h +2 -2

             public:
                 explicit AmdaProvider();
-                void requestDataLoading(QUuid token, const QVector<SqpDateTime> &dateTimeList) override;
+                void requestDataLoading(QUuid token, const DataProviderParameters &parameters) override;
             private:
-                void retrieveData(QUuid token, const DataProviderParameters &parameters);
+                void retrieveData(QUuid token, const SqpDateTime &dateTime);
                 class AmdaProviderPrivate;
                 spimpl::unique_impl_ptr<AmdaProviderPrivate> impl;

plugins/amda/src/AmdaProvider.cpp +10 -9

             } // namespace
             struct AmdaProvider::AmdaProviderPrivate {
-                DataProviderParameters m_Params{};
+                SqpDateTime m_DateTime{};
                 std::unique_ptr<QNetworkAccessManager> m_AccessManager{nullptr};
                 QNetworkReply *m_Reply{nullptr};
                 //    std::unique_ptr<QTemporaryFile> m_File{nullptr};
                 }
             }
-            void AmdaProvider::requestDataLoading(QUuid token, const QVector<SqpDateTime> &dateTimeList)
+            void AmdaProvider::requestDataLoading(QUuid token, const DataProviderParameters &parameters)
             {
                 // NOTE: Try to use multithread if possible
-                for (const auto &dateTime : dateTimeList) {
+                const auto times = parameters.m_Times;
-                    retrieveData(token, DataProviderParameters{dateTime});
+                for (const auto &dateTime : qAsConst(times)) {
+                    retrieveData(token, dateTime);
                 }
             }
-            void AmdaProvider::retrieveData(QUuid token, const DataProviderParameters &parameters)
+            void AmdaProvider::retrieveData(QUuid token, const SqpDateTime &dateTime)
             {
                 // /////////// //
                 // Creates URL //
                 // /////////// //
-                auto startDate = dateFormat(parameters.m_Time.m_TStart);
+                auto startDate = dateFormat(dateTime.m_TStart);
-                auto endDate = dateFormat(parameters.m_Time.m_TEnd);
+                auto endDate = dateFormat(dateTime.m_TEnd);
                 auto productId = QStringLiteral("imf(0)");
                 auto url = QUrl{QString{AMDA_URL_FORMAT}.arg(startDate, endDate, productId)};
                         // Parse results file
                         if (auto dataSeries = AmdaResultParser::readTxt(tempFile->fileName())) {
-                            emit dataProvided(impl->m_Token, dataSeries, impl->m_Params.m_Time);
+                            emit dataProvided(impl->m_Token, dataSeries, impl->m_DateTime);
                         }
                         else {
                             /// @todo ALX : debug
                 // //////////////// //
                 impl->m_Token = token;
-                impl->m_Params = parameters;
+                impl->m_DateTime = dateTime;
                 emit requestConstructed(QNetworkRequest{url}, token, httpFinishedLambda);
             }

plugins/mockplugin/include/CosinusProvider.h +2 -3

              */
             class SCIQLOP_MOCKPLUGIN_EXPORT CosinusProvider : public IDataProvider {
             public:
-                void requestDataLoading(QUuid token, const QVector<SqpDateTime> &dateTimeList) override;
+                void requestDataLoading(QUuid token, const DataProviderParameters &parameters) override;
             private:
                 /// @sa IDataProvider::retrieveData()
-                std::shared_ptr<IDataSeries> retrieveData(const DataProviderParameters &parameters) const;
+                std::shared_ptr<IDataSeries> retrieveData(const SqpDateTime &dateTime) const;
-                std::shared_ptr<IDataSeries> retrieveDataSeries(const SqpDateTime &dateTime);
             };
             #endif // SCIQLOP_COSINUSPROVIDER_H

plugins/mockplugin/src/CosinusProvider.cpp +5 -7

             Q_LOGGING_CATEGORY(LOG_CosinusProvider, "CosinusProvider")
-            std::shared_ptr<IDataSeries>
+            std::shared_ptr<IDataSeries> CosinusProvider::retrieveData(const SqpDateTime &dateTime) const
-            CosinusProvider::retrieveData(const DataProviderParameters &parameters) const
             {
-                auto dateTime = parameters.m_Time;
                 auto dataIndex = 0;
                 // Gets the timerange from the parameters
                 return scalarSeries;
             }
-            void CosinusProvider::requestDataLoading(QUuid token, const QVector<SqpDateTime> &dateTimeList)
+            void CosinusProvider::requestDataLoading(QUuid token, const DataProviderParameters &parameters)
             {
                 qCDebug(LOG_CosinusProvider()) << "CosinusProvider::requestDataLoading"
                                                << QThread::currentThread()->objectName();
                 // NOTE: Try to use multithread if possible
-                for (const auto &dateTime : dateTimeList) {
+                const auto times = parameters.m_Times;
-                    auto scalarSeries = this->retrieveData(DataProviderParameters{dateTime});
+                for (const auto &dateTime : qAsConst(times)) {
+                    auto scalarSeries = this->retrieveData(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