HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r418:0ec770a1fa8f

Merge branch 'feature/AmdaProviderImprovements' into develop

Alexandre Leroux -

r418:0ec770a1fa8f

parent child

Context file:

r418:0ec770a1fa8f

Expand all files

plugins/amda/include/AmdaDefs.h created 644 +16 0

@@ -0,0 +1,16
	1	#ifndef SCIQLOP_AMDADEFS_H
	2	#define SCIQLOP_AMDADEFS_H
	3
	4	#include <QString>
	5
	6	// ////////////// //
	7	// AMDA constants //
	8	// ////////////// //
	9
	10	// Relevant keys in JSON file
	11	extern const QString AMDA_COMPONENT_KEY;
	12	extern const QString AMDA_PRODUCT_KEY;
	13	extern const QString AMDA_ROOT_KEY;
	14	extern const QString AMDA_XML_ID_KEY;
	15
	16	#endif // SCIQLOP_AMDADEFS_H

plugins/amda/src/AmdaDefs.cpp created 644 +6 0

@@ -0,0 +1,6
	1	#include "AmdaDefs.h"
	2
	3	const QString AMDA_COMPONENT_KEY = QStringLiteral("component");
	4	const QString AMDA_PRODUCT_KEY = QStringLiteral("parameter");
	5	const QString AMDA_ROOT_KEY = QStringLiteral("dataCenter");
	6	const QString AMDA_XML_ID_KEY = QStringLiteral("xml:id");

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

             #ifndef SCIQLOP_DATAPROVIDERPARAMETERS_H
             #define SCIQLOP_DATAPROVIDERPARAMETERS_H
             #include "SqpDateTime.h"
             /**
              * @brief The DataProviderParameters struct holds the information needed to retrieve data from a
              * data provider
              * @sa IDataProvider
              */
             struct DataProviderParameters {
-                SqpDateTime m_Time;
+                /// Times for which retrieve data
+                QVector<SqpDateTime> m_Times;
+                /// Extra data that can be used by the provider to retrieve data
+                QVariantHash m_Data;
             };
             #endif // SCIQLOP_DATAPROVIDERPARAMETERS_H

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

             #ifndef SCIQLOP_IDATAPROVIDER_H
             #define SCIQLOP_IDATAPROVIDER_H
             #include <memory>
             #include <QObject>
             #include <QUuid>
             #include <Common/MetaTypes.h>
             #include <Data/SqpDateTime.h>
             class DataProviderParameters;
             class IDataSeries;
             class QNetworkReply;
             class QNetworkRequest;
             /**
              * @brief The IDataProvider interface aims to declare a data provider.
              *
              * A data provider is an entity that generates data and returns it according to various parameters
              * (time interval, product to retrieve the data, etc.)
              *
              * @sa IDataSeries
              */
             class IDataProvider : public QObject {
                 Q_OBJECT
             public:
                 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:
                 /**
                  * @brief dataProvided send dataSeries under dateTime and that corresponds of the data
                  * identified by identifier
                  */
                 void dataProvided(QUuid identifier, std::shared_ptr<IDataSeries> dateSerie,
                                   const SqpDateTime &dateTime);
                 /**
                  * @brief requestConstructed send a request for the data identified by identifier
                  * @callback is the methode call by the reply of the request when it is finished.
                  */
                 void requestConstructed(const QNetworkRequest &request, QUuid identifier,
                                         std::function<void(QNetworkReply *, QUuid)> callback);
             };
             // Required for using shared_ptr in signals/slots
             SCIQLOP_REGISTER_META_TYPE(IDATAPROVIDER_PTR_REGISTRY, std::shared_ptr<IDataProvider>)
             SCIQLOP_REGISTER_META_TYPE(IDATAPROVIDER_FUNCTION_REGISTRY,
                                        std::function<void(QNetworkReply *, QUuid)>)
             #endif // SCIQLOP_IDATAPROVIDER_H

core/include/DataSource/DataSourceController.h +2 0

             #ifndef SCIQLOP_DATASOURCECONTROLLER_H
             #define SCIQLOP_DATASOURCECONTROLLER_H
             #include <QLoggingCategory>
             #include <QObject>
             #include <QUuid>
             #include <Common/spimpl.h>
             Q_DECLARE_LOGGING_CATEGORY(LOG_DataSourceController)
             class DataSourceItem;
             class IDataProvider;
             /**
              * @brief The DataSourceController class aims to make the link between SciQlop and its plugins. This
              * is the intermediate class that SciQlop has to use in the way to connect a data source. Please
              * first use register method to initialize a plugin specified by its metadata name (JSON plugin
              * source) then others specifics method will be able to access it. You can load a data source driver
              * plugin then create a data source.
              */
             class DataSourceController : public QObject {
                 Q_OBJECT
             public:
                 explicit DataSourceController(QObject *parent = 0);
                 virtual ~DataSourceController();
                 /**
                  * Registers a data source. The method delivers a unique id that can be used afterwards to
                  * access to the data source properties (structure, connection parameters, data provider, etc.)
                  * @param dataSourceName the name of the data source
                  * @return the unique id with which the data source has been registered
                  */
                 QUuid registerDataSource(const QString &dataSourceName) noexcept;
                 /**
                  * Sets the structure of a data source. The controller takes ownership of the structure.
                  * @param dataSourceUid the unique id with which the data source has been registered into the
                  * controller. If it is invalid, the method has no effect.
                  * @param dataSourceItem the structure of the data source. It must be not null to be registered
                  * @sa registerDataSource()
                  */
                 void setDataSourceItem(const QUuid &dataSourceUid,
                                        std::unique_ptr<DataSourceItem> dataSourceItem) noexcept;
                 /**
                  * Sets the data provider used to retrieve data from of a data source. The controller takes
                  * ownership of the provider.
                  * @param dataSourceUid the unique id with which the data source has been registered into the
                  * controller. If it is invalid, the method has no effect.
                  * @param dataProvider the provider of the data source
                  * @sa registerDataSource()
                  */
                 void setDataProvider(const QUuid &dataSourceUid,
                                      std::unique_ptr<IDataProvider> dataProvider) noexcept;
                 /**
                  * Loads an item (product) as a variable in SciQlop
                  * @param dataSourceUid the unique id of the data source containing the item. It is used to get
                  * the data provider associated to the data source, and pass it to for the variable creation
                  * @param productItem the item to load
                  */
                 void loadProductItem(const QUuid &dataSourceUid, const DataSourceItem &productItem) noexcept;
             public slots:
                 /// Manage init/end of the controller
                 void initialize();
                 void finalize();
             signals:
                 /// Signal emitted when a structure has been set for a data source
                 void dataSourceItemSet(DataSourceItem *dataSourceItem);
                 /**
                  * Signal emitted when a variable creation is asked for a product
                  * @param variableName the name of the variable
+                 * @param variableMetadata the metadata of the variable
                  * @param variableProvider the provider that will be used to retrieve the data of the variable
                  * (can be null)
                  */
                 void variableCreationRequested(const QString &variableName,
+                                               const QVariantHash &variableMetadata,
                                                std::shared_ptr<IDataProvider> variableProvider);
             private:
                 void waitForFinish();
                 class DataSourceControllerPrivate;
                 spimpl::unique_impl_ptr<DataSourceControllerPrivate> impl;
             };
             #endif // SCIQLOP_DATASOURCECONTROLLER_H

core/include/DataSource/DataSourceItem.h +2 -2

             #ifndef SCIQLOP_DATASOURCEITEM_H
             #define SCIQLOP_DATASOURCEITEM_H
             #include <Common/spimpl.h>
             #include <QVariant>
             #include <QVector>
             class DataSourceItemAction;
             /**
              * Possible types of an item
              */
             enum class DataSourceItemType { NODE, PRODUCT, COMPONENT };
             /**
              * @brief The DataSourceItem class aims to represent a structure element of a data source.
              * A data source has a tree structure that is made up of a main DataSourceItem object (root)
              * containing other DataSourceItem objects (children).
              * For each DataSourceItem can be associated a set of data representing it.
              */
             class DataSourceItem {
             public:
                 /// Key associated with the name of the item
                 static const QString NAME_DATA_KEY;
                 explicit DataSourceItem(DataSourceItemType type, const QString &name);
-                explicit DataSourceItem(DataSourceItemType type, QHash<QString, QVariant> data = {});
+                explicit DataSourceItem(DataSourceItemType type, QVariantHash data = {});
                 /// @return the actions of the item as a vector
                 QVector<DataSourceItemAction *> actions() const noexcept;
                 /**
                  * Adds an action to the item. The item takes ownership of the action, and the action is
                  * automatically associated to the item
                  * @param action the action to add
                  */
                 void addAction(std::unique_ptr<DataSourceItemAction> action) noexcept;
                 /**
                  * Adds a child to the item. The item takes ownership of the child.
                  * @param child the child to add
                  */
                 void appendChild(std::unique_ptr<DataSourceItem> child) noexcept;
                 /**
                  * Returns the item's child associated to an index
                  * @param childIndex the index to search
                  * @return a pointer to the child if index is valid, nullptr otherwise
                  */
                 DataSourceItem *child(int childIndex) const noexcept;
                 int childCount() const noexcept;
                 /**
                  * Get the data associated to a key
                  * @param key the key to search
                  * @return the data found if key is valid, default QVariant otherwise
                  */
                 QVariant data(const QString &key) const noexcept;
                 /// Gets all data
-                const QHash<QString, QVariant> &data() const noexcept;
+                QVariantHash data() const noexcept;
                 bool isRoot() const noexcept;
                 QString name() const noexcept;
                 /**
                  * Get the item's parent
                  * @return a pointer to the parent if it exists, nullptr if the item is a root
                  */
                 DataSourceItem *parentItem() const noexcept;
                 /**
                  * Sets or appends a value to a key
                  * @param key the key
                  * @param value the value
                  * @param append if true, the value is added to the values already existing for the key,
                  * otherwise it replaces the existing values
                  */
                 void setData(const QString &key, const QVariant &value, bool append = false) noexcept;
                 DataSourceItemType type() const noexcept;
                 bool operator==(const DataSourceItem &other);
                 bool operator!=(const DataSourceItem &other);
             private:
                 class DataSourceItemPrivate;
                 spimpl::unique_impl_ptr<DataSourceItemPrivate> impl;
             };
             #endif // SCIQLOP_DATASOURCEITEMMODEL_H

core/include/Variable/Variable.h +4 -4

             #ifndef SCIQLOP_VARIABLE_H
             #define SCIQLOP_VARIABLE_H
             #include <Data/SqpDateTime.h>
             #include <QLoggingCategory>
             #include <QObject>
             #include <Common/MetaTypes.h>
             #include <Common/spimpl.h>
             Q_DECLARE_LOGGING_CATEGORY(LOG_Variable)
             class IDataSeries;
             class QString;
             /**
              * @brief The Variable class represents a variable in SciQlop.
              */
             class Variable : public QObject {
                 Q_OBJECT
             public:
-                explicit Variable(const QString &name, const QString &unit, const QString &mission,
+                explicit Variable(const QString &name, const SqpDateTime &dateTime,
-                                  const SqpDateTime &dateTime);
+                                  const QVariantHash &metadata = {});
                 QString name() const noexcept;
-                QString mission() const noexcept;
-                QString unit() const noexcept;
                 SqpDateTime dateTime() const noexcept;
                 void setDateTime(const SqpDateTime &dateTime) noexcept;
                 /// @return the data of the variable, nullptr if there is no data
                 IDataSeries *dataSeries() const noexcept;
+                QVariantHash metadata() const noexcept;
                 bool contains(const SqpDateTime &dateTime) const noexcept;
                 bool intersect(const SqpDateTime &dateTime) const noexcept;
                 bool isInside(const SqpDateTime &dateTime) const noexcept;
             public slots:
                 void setDataSeries(std::shared_ptr<IDataSeries> dataSeries) noexcept;
             signals:
                 void updated();
             private:
                 class VariablePrivate;
                 spimpl::unique_impl_ptr<VariablePrivate> impl;
             };
             // Required for using shared_ptr in signals/slots
             SCIQLOP_REGISTER_META_TYPE(VARIABLE_PTR_REGISTRY, std::shared_ptr<Variable>)
             #endif // SCIQLOP_VARIABLE_H

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

             #ifndef SCIQLOP_VARIABLECONTROLLER_H
             #define SCIQLOP_VARIABLECONTROLLER_H
             #include <Data/SqpDateTime.h>
             #include <QLoggingCategory>
             #include <QObject>
             #include <Common/spimpl.h>
             class IDataProvider;
             class QItemSelectionModel;
             class TimeController;
             class Variable;
             class VariableModel;
             Q_DECLARE_LOGGING_CATEGORY(LOG_VariableController)
             /**
              * @brief The VariableController class aims to handle the variables in SciQlop.
              */
             class VariableController : public QObject {
                 Q_OBJECT
             public:
                 explicit VariableController(QObject *parent = 0);
                 virtual ~VariableController();
                 VariableModel *variableModel() noexcept;
                 QItemSelectionModel *variableSelectionModel() noexcept;
                 void setTimeController(TimeController *timeController) noexcept;
                 /**
                  * Deletes from the controller the variable passed in parameter.
                  *
                  * Delete a variable includes:
                  * - the deletion of the various references to the variable in SciQlop
                  * - the deletion of the model variable
                  * - the deletion of the provider associated with the variable
                  * - removing the cache associated with the variable
                  *
                  * @param variable the variable to delete from the controller.
                  */
                 void deleteVariable(std::shared_ptr<Variable> variable) noexcept;
                 /**
                  * Deletes from the controller the variables passed in parameter.
                  * @param variables the variables to delete from the controller.
                  * @sa deleteVariable()
                  */
                 void deleteVariables(const QVector<std::shared_ptr<Variable> > &variables) noexcept;
             signals:
                 /// Signal emitted when a variable is about to be deleted from the controller
                 void variableAboutToBeDeleted(std::shared_ptr<Variable> variable);
             public slots:
                 /// Request the data loading of the variable whithin dateTime
                 void onRequestDataLoading(std::shared_ptr<Variable> variable, const SqpDateTime &dateTime);
                 /**
                  * Creates a new variable and adds it to the model
                  * @param name the name of the new variable
+                 * @param metadata the metadata of the new variable
                  * @param provider the data provider for the new variable
                  */
-                void createVariable(const QString &name, std::shared_ptr<IDataProvider> provider) noexcept;
+                void createVariable(const QString &name, const QVariantHash &metadata,
+                                    std::shared_ptr<IDataProvider> provider) noexcept;
                 /// Update the temporal parameters of every selected variable to dateTime
                 void onDateTimeOnSelection(const SqpDateTime &dateTime);
                 void onVariableRetrieveDataInProgress(QUuid identifier, double progress);
                 void initialize();
                 void finalize();
             private:
                 void waitForFinish();
                 class VariableControllerPrivate;
                 spimpl::unique_impl_ptr<VariableControllerPrivate> impl;
             };
             #endif // SCIQLOP_VARIABLECONTROLLER_H

core/include/Variable/VariableModel.h +3 -2

             #ifndef SCIQLOP_VARIABLEMODEL_H
             #define SCIQLOP_VARIABLEMODEL_H
             #include <Data/SqpDateTime.h>
             #include <QAbstractTableModel>
             #include <QLoggingCategory>
             #include <Common/MetaTypes.h>
             #include <Common/spimpl.h>
             Q_DECLARE_LOGGING_CATEGORY(LOG_VariableModel)
             enum VariableRoles { ProgressRole = Qt::UserRole };
             class IDataSeries;
             class Variable;
             /**
              * @brief The VariableModel class aims to hold the variables that have been created in SciQlop
              */
             class VariableModel : public QAbstractTableModel {
             public:
                 explicit VariableModel(QObject *parent = nullptr);
                 /**
                  * Creates a new variable in the model
                  * @param name the name of the new variable
                  * @param dateTime the dateTime of the new variable
+                 * @param metadata the metadata associated to the new variable
                  * @return the pointer to the new variable
                  */
-                std::shared_ptr<Variable> createVariable(const QString &name,
+                std::shared_ptr<Variable> createVariable(const QString &name, const SqpDateTime &dateTime,
-                                                         const SqpDateTime &dateTime) noexcept;
+                                                         const QVariantHash &metadata) noexcept;
                 /**
                  * Deletes a variable from the model, if it exists
                  * @param variable the variable to delete
                  */
                 void deleteVariable(std::shared_ptr<Variable> variable) noexcept;
                 std::shared_ptr<Variable> variable(int index) const;
                 void setDataProgress(std::shared_ptr<Variable> variable, double progress);
                 // /////////////////////////// //
                 // QAbstractTableModel methods //
                 // /////////////////////////// //
                 virtual int columnCount(const QModelIndex &parent = QModelIndex{}) const override;
                 virtual int rowCount(const QModelIndex &parent = QModelIndex{}) const override;
                 virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
                 virtual QVariant headerData(int section, Qt::Orientation orientation,
                                             int role = Qt::DisplayRole) const override;
             private:
                 class VariableModelPrivate;
                 spimpl::unique_impl_ptr<VariableModelPrivate> impl;
             private slots:
                 /// Slot called when data of a variable has been updated
                 void onVariableUpdated() noexcept;
             };
             // Registers QVector<int> metatype so it can be used in VariableModel::dataChanged() signal
             SCIQLOP_REGISTER_META_TYPE(QVECTOR_INT_REGISTRY, QVector<int>)
             #endif // SCIQLOP_VARIABLEMODEL_H

core/src/DataSource/DataSourceController.cpp +3 -3

             #include "DataSource/DataSourceController.h"
             #include "DataSource/DataSourceItem.h"
             #include <Data/IDataProvider.h>
             #include <QMutex>
             #include <QThread>
             #include <QDir>
             #include <QStandardPaths>
             Q_LOGGING_CATEGORY(LOG_DataSourceController, "DataSourceController")
             class DataSourceController::DataSourceControllerPrivate {
             public:
                 QMutex m_WorkingMutex;
                 /// Data sources registered
                 QHash<QUuid, QString> m_DataSources;
                 /// Data sources structures
                 std::map<QUuid, std::unique_ptr<DataSourceItem> > m_DataSourceItems;
                 /// Data providers registered
                 /// @remarks Data providers are stored as shared_ptr as they can be sent to a variable and
                 /// continue to live without necessarily the data source controller
                 std::map<QUuid, std::shared_ptr<IDataProvider> > m_DataProviders;
             };
             DataSourceController::DataSourceController(QObject *parent)
                     : impl{spimpl::make_unique_impl<DataSourceControllerPrivate>()}
             {
                 qCDebug(LOG_DataSourceController()) << tr("DataSourceController construction")
                                                     << QThread::currentThread();
             }
             DataSourceController::~DataSourceController()
             {
                 qCDebug(LOG_DataSourceController()) << tr("DataSourceController destruction")
                                                     << QThread::currentThread();
                 this->waitForFinish();
             }
             QUuid DataSourceController::registerDataSource(const QString &dataSourceName) noexcept
             {
                 auto dataSourceUid = QUuid::createUuid();
                 impl->m_DataSources.insert(dataSourceUid, dataSourceName);
                 return dataSourceUid;
             }
             void DataSourceController::setDataSourceItem(
                 const QUuid &dataSourceUid, std::unique_ptr<DataSourceItem> dataSourceItem) noexcept
             {
                 if (!dataSourceItem) {
                     qCWarning(LOG_DataSourceController())
                         << tr("Data source item can't be registered (null item)");
                     return;
                 }
                 if (impl->m_DataSources.contains(dataSourceUid)) {
                     // The data provider is implicitly converted to a shared_ptr
                     impl->m_DataSourceItems.insert(std::make_pair(dataSourceUid, std::move(dataSourceItem)));
                     // Retrieves the data source item to emit the signal with it
                     auto it = impl->m_DataSourceItems.find(dataSourceUid);
                     if (it != impl->m_DataSourceItems.end()) {
                         emit dataSourceItemSet(it->second.get());
                     }
                 }
                 else {
                     qCWarning(LOG_DataSourceController()) << tr("Can't set data source item for uid %1 : no "
                                                                 "data source has been registered with the uid")
                                                                  .arg(dataSourceUid.toString());
                 }
             }
             void DataSourceController::setDataProvider(const QUuid &dataSourceUid,
                                                        std::unique_ptr<IDataProvider> dataProvider) noexcept
             {
                 if (impl->m_DataSources.contains(dataSourceUid)) {
                     impl->m_DataProviders.insert(std::make_pair(dataSourceUid, std::move(dataProvider)));
                 }
                 else {
                     qCWarning(LOG_DataSourceController()) << tr("Can't set data provider for uid %1 : no data "
                                                                 "source has been registered with the uid")
                                                                  .arg(dataSourceUid.toString());
                 }
             }
             void DataSourceController::loadProductItem(const QUuid &dataSourceUid,
                                                        const DataSourceItem &productItem) noexcept
             {
-                if (productItem.type() == DataSourceItemType::PRODUCT) {
+                if (productItem.type() == DataSourceItemType::PRODUCT
+                    || productItem.type() == DataSourceItemType::COMPONENT) {
                     /// Retrieves the data provider of the data source (if any)
                     auto it = impl->m_DataProviders.find(dataSourceUid);
                     auto dataProvider = (it != impl->m_DataProviders.end()) ? it->second : nullptr;
-                    /// @todo retrieve timerange, and pass it to the signal
+                    emit variableCreationRequested(productItem.name(), productItem.data(), dataProvider);
-                    emit variableCreationRequested(productItem.name(), dataProvider);
                 }
                 else {
                     qCWarning(LOG_DataSourceController()) << tr("Can't load an item that is not a product");
                 }
             }
             void DataSourceController::initialize()
             {
                 qCDebug(LOG_DataSourceController()) << tr("DataSourceController init")
                                                     << QThread::currentThread();
                 impl->m_WorkingMutex.lock();
                 qCDebug(LOG_DataSourceController()) << tr("DataSourceController init END");
             }
             void DataSourceController::finalize()
             {
                 impl->m_WorkingMutex.unlock();
             }
             void DataSourceController::waitForFinish()
             {
                 QMutexLocker locker{&impl->m_WorkingMutex};
             }

core/src/DataSource/DataSourceItem.cpp +5 -5

             #include <DataSource/DataSourceItem.h>
             #include <DataSource/DataSourceItemAction.h>
             #include <QVector>
             const QString DataSourceItem::NAME_DATA_KEY = QStringLiteral("name");
             struct DataSourceItem::DataSourceItemPrivate {
-                explicit DataSourceItemPrivate(DataSourceItemType type, QHash<QString, QVariant> data)
+                explicit DataSourceItemPrivate(DataSourceItemType type, QVariantHash data)
                         : m_Parent{nullptr}, m_Children{}, m_Type{type}, m_Data{std::move(data)}, m_Actions{}
                 {
                 }
                 DataSourceItem *m_Parent;
                 std::vector<std::unique_ptr<DataSourceItem> > m_Children;
                 DataSourceItemType m_Type;
-                QHash<QString, QVariant> m_Data;
+                QVariantHash m_Data;
                 std::vector<std::unique_ptr<DataSourceItemAction> > m_Actions;
             };
             DataSourceItem::DataSourceItem(DataSourceItemType type, const QString &name)
-                    : DataSourceItem{type, QHash<QString, QVariant>{{NAME_DATA_KEY, name}}}
+                    : DataSourceItem{type, QVariantHash{{NAME_DATA_KEY, name}}}
             {
             }
-            DataSourceItem::DataSourceItem(DataSourceItemType type, QHash<QString, QVariant> data)
+            DataSourceItem::DataSourceItem(DataSourceItemType type, QVariantHash data)
                     : impl{spimpl::make_unique_impl<DataSourceItemPrivate>(type, std::move(data))}
             {
             }
             QVector<DataSourceItemAction *> DataSourceItem::actions() const noexcept
             {
                 auto result = QVector<DataSourceItemAction *>{};
                 std::transform(std::cbegin(impl->m_Actions), std::cend(impl->m_Actions),
                                std::back_inserter(result), [](const auto &action) { return action.get(); });
                 return result;
             }
             void DataSourceItem::addAction(std::unique_ptr<DataSourceItemAction> action) noexcept
             {
                 action->setDataSourceItem(this);
                 impl->m_Actions.push_back(std::move(action));
             }
             void DataSourceItem::appendChild(std::unique_ptr<DataSourceItem> child) noexcept
             {
                 child->impl->m_Parent = this;
                 impl->m_Children.push_back(std::move(child));
             }
             DataSourceItem *DataSourceItem::child(int childIndex) const noexcept
             {
                 if (childIndex < 0 || childIndex >= childCount()) {
                     return nullptr;
                 }
                 else {
                     return impl->m_Children.at(childIndex).get();
                 }
             }
             int DataSourceItem::childCount() const noexcept
             {
                 return impl->m_Children.size();
             }
             QVariant DataSourceItem::data(const QString &key) const noexcept
             {
                 return impl->m_Data.value(key);
             }
-            const QHash<QString, QVariant> &DataSourceItem::data() const noexcept
+            QVariantHash DataSourceItem::data() const noexcept
             {
                 return impl->m_Data;
             }
             bool DataSourceItem::isRoot() const noexcept
             {
                 return impl->m_Parent == nullptr;
             }
             QString DataSourceItem::name() const noexcept
             {
                 return data(NAME_DATA_KEY).toString();
             }
             DataSourceItem *DataSourceItem::parentItem() const noexcept
             {
                 return impl->m_Parent;
             }
             void DataSourceItem::setData(const QString &key, const QVariant &value, bool append) noexcept
             {
                 auto it = impl->m_Data.constFind(key);
                 if (append && it != impl->m_Data.constEnd()) {
                     // Case of an existing value to which we want to add to the new value
                     if (it->canConvert<QVariantList>()) {
                         auto variantList = it->value<QVariantList>();
                         variantList.append(value);
                         impl->m_Data.insert(key, variantList);
                     }
                     else {
                         impl->m_Data.insert(key, QVariantList{*it, value});
                     }
                 }
                 else {
                     // Other cases :
                     // - new value in map OR
                     // - replacement of an existing value (not appending)
                     impl->m_Data.insert(key, value);
                 }
             }
             DataSourceItemType DataSourceItem::type() const noexcept
             {
                 return impl->m_Type;
             }
             bool DataSourceItem::operator==(const DataSourceItem &other)
             {
                 // Compares items' attributes
                 if (std::tie(impl->m_Type, impl->m_Data) == std::tie(other.impl->m_Type, other.impl->m_Data)) {
                     // Compares contents of items' children
                     return std::equal(std::cbegin(impl->m_Children), std::cend(impl->m_Children),
                                       std::cbegin(other.impl->m_Children),
                                       [](const auto &itemChild, const auto &otherChild) {
                                           return *itemChild == *otherChild;
                                       });
                 }
                 else {
                     return false;
                 }
             }
             bool DataSourceItem::operator!=(const DataSourceItem &other)
             {
                 return !(*this == other);
             }

core/src/Variable/Variable.cpp +11 -22

             #include "Variable/Variable.h"
             #include <Data/IDataSeries.h>
             #include <Data/SqpDateTime.h>
             #include <QReadWriteLock>
             #include <QThread>
             Q_LOGGING_CATEGORY(LOG_Variable, "Variable")
             struct Variable::VariablePrivate {
-                explicit VariablePrivate(const QString &name, const QString &unit, const QString &mission,
+                explicit VariablePrivate(const QString &name, const SqpDateTime &dateTime,
-                                         const SqpDateTime &dateTime)
+                                         const QVariantHash &metadata)
-                        : m_Name{name},
+                        : m_Name{name}, m_DateTime{dateTime}, m_Metadata{metadata}, m_DataSeries{nullptr}
-                          m_Unit{unit},
-                          m_Mission{mission},
-                          m_DateTime{dateTime},
-                          m_DataSeries{nullptr}
                 {
                 }
                 QString m_Name;
-                QString m_Unit;
-                QString m_Mission;
                 SqpDateTime m_DateTime; // The dateTime available in the view and loaded. not the cache.
+                QVariantHash m_Metadata;
                 std::unique_ptr<IDataSeries> m_DataSeries;
             };
-            Variable::Variable(const QString &name, const QString &unit, const QString &mission,
+            Variable::Variable(const QString &name, const SqpDateTime &dateTime, const QVariantHash &metadata)
-                               const SqpDateTime &dateTime)
+                    : impl{spimpl::make_unique_impl<VariablePrivate>(name, dateTime, metadata)}
-                    : impl{spimpl::make_unique_impl<VariablePrivate>(name, unit, mission, dateTime)}
             {
             }
             QString Variable::name() const noexcept
             {
                 return impl->m_Name;
             }
-            QString Variable::mission() const noexcept
-                return impl->m_Mission;
-            QString Variable::unit() const noexcept
-                return impl->m_Unit;
             SqpDateTime Variable::dateTime() const noexcept
             {
                 return impl->m_DateTime;
             }
             void Variable::setDateTime(const SqpDateTime &dateTime) noexcept
             {
                 impl->m_DateTime = dateTime;
             }
             void Variable::setDataSeries(std::shared_ptr<IDataSeries> dataSeries) noexcept
             {
                 qCDebug(LOG_Variable()) << "Variable::setDataSeries" << QThread::currentThread()->objectName();
                 if (!dataSeries) {
                     /// @todo ALX : log
                     return;
                 }
                 // Inits the data series of the variable
                 if (!impl->m_DataSeries) {
                     impl->m_DataSeries = dataSeries->clone();
                 }
                 else {
                     dataSeries->lockWrite();
                     impl->m_DataSeries->lockWrite();
                     impl->m_DataSeries->merge(dataSeries.get());
                     impl->m_DataSeries->unlock();
                     dataSeries->unlock();
                     emit updated();
                 }
             }
             IDataSeries *Variable::dataSeries() const noexcept
             {
                 return impl->m_DataSeries.get();
             }
+            QVariantHash Variable::metadata() const noexcept
+            {
+                return impl->m_Metadata;
+            }
             bool Variable::contains(const SqpDateTime &dateTime) const noexcept
             {
                 return impl->m_DateTime.contains(dateTime);
             }
             bool Variable::intersect(const SqpDateTime &dateTime) const noexcept
             {
                 return impl->m_DateTime.intersect(dateTime);
             }
             bool Variable::isInside(const SqpDateTime &dateTime) const noexcept
             {
                 return dateTime.contains(SqpDateTime{impl->m_DateTime.m_TStart, impl->m_DateTime.m_TEnd});
             }

core/src/Variable/VariableController.cpp +5 -9

             #include <Variable/Variable.h>
             #include <Variable/VariableCacheController.h>
             #include <Variable/VariableController.h>
             #include <Variable/VariableModel.h>
             #include <Data/DataProviderParameters.h>
             #include <Data/IDataProvider.h>
             #include <Data/IDataSeries.h>
             #include <Time/TimeController.h>
             #include <QDateTime>
             #include <QMutex>
             #include <QThread>
             #include <QUuid>
             #include <QtCore/QItemSelectionModel>
             #include <unordered_map>
             Q_LOGGING_CATEGORY(LOG_VariableController, "VariableController")
             struct VariableController::VariableControllerPrivate {
                 explicit VariableControllerPrivate(VariableController *parent)
                         : m_WorkingMutex{},
                           m_VariableModel{new VariableModel{parent}},
                           m_VariableSelectionModel{new QItemSelectionModel{m_VariableModel, parent}},
                           m_VariableCacheController{std::make_unique<VariableCacheController>()}
                 {
                 }
                 QMutex m_WorkingMutex;
                 /// Variable model. The VariableController has the ownership
                 VariableModel *m_VariableModel;
                 QItemSelectionModel *m_VariableSelectionModel;
                 TimeController *m_TimeController{nullptr};
                 std::unique_ptr<VariableCacheController> m_VariableCacheController;
                 std::unordered_map<std::shared_ptr<Variable>, std::shared_ptr<IDataProvider> >
                     m_VariableToProviderMap;
                 std::unordered_map<std::shared_ptr<Variable>, QUuid> m_VariableToIdentifier;
             };
             VariableController::VariableController(QObject *parent)
                     : QObject{parent}, impl{spimpl::make_unique_impl<VariableControllerPrivate>(this)}
             {
                 qCDebug(LOG_VariableController()) << tr("VariableController construction")
                                                   << QThread::currentThread();
             }
             VariableController::~VariableController()
             {
                 qCDebug(LOG_VariableController()) << tr("VariableController destruction")
                                                   << QThread::currentThread();
                 this->waitForFinish();
             }
             VariableModel *VariableController::variableModel() noexcept
             {
                 return impl->m_VariableModel;
             }
             QItemSelectionModel *VariableController::variableSelectionModel() noexcept
             {
                 return impl->m_VariableSelectionModel;
             }
             void VariableController::setTimeController(TimeController *timeController) noexcept
             {
                 impl->m_TimeController = timeController;
             }
             void VariableController::deleteVariable(std::shared_ptr<Variable> variable) noexcept
             {
                 if (!variable) {
                     qCCritical(LOG_VariableController()) << "Can't delete variable: variable is null";
                     return;
                 }
                 // Spreads in SciQlop that the variable will be deleted, so that potential receivers can
                 // make some treatments before the deletion
                 emit variableAboutToBeDeleted(variable);
                 // Deletes provider
                 auto nbProvidersDeleted = impl->m_VariableToProviderMap.erase(variable);
                 qCDebug(LOG_VariableController())
                     << tr("Number of providers deleted for variable %1: %2")
                            .arg(variable->name(), QString::number(nbProvidersDeleted));
                 // Clears cache
                 impl->m_VariableCacheController->clear(variable);
                 // Deletes from model
                 impl->m_VariableModel->deleteVariable(variable);
             }
             void VariableController::deleteVariables(
                 const QVector<std::shared_ptr<Variable> > &variables) noexcept
             {
                 for (auto variable : qAsConst(variables)) {
                     deleteVariable(variable);
                 }
             }
-            void VariableController::createVariable(const QString &name,
+            void VariableController::createVariable(const QString &name, const QVariantHash &metadata,
                                                     std::shared_ptr<IDataProvider> provider) noexcept
             {
                 if (!impl->m_TimeController) {
                     qCCritical(LOG_VariableController())
                         << tr("Impossible to create variable: The time controller is null");
                     return;
                 }
-                /// @todo : for the moment :
-                /// - the provider is only used to retrieve data from the variable for its initialization, but
-                /// it will be retained later
-                /// - default data are generated for the variable, without taking into account the timerange set
-                /// in sciqlop
                 auto dateTime = impl->m_TimeController->dateTime();
-                if (auto newVariable = impl->m_VariableModel->createVariable(name, dateTime)) {
+                if (auto newVariable = impl->m_VariableModel->createVariable(name, dateTime, metadata)) {
                     auto identifier = QUuid::createUuid();
                     // store the provider
                     impl->m_VariableToProviderMap[newVariable] = provider;
                     impl->m_VariableToIdentifier[newVariable] = identifier;
                     auto addDateTimeAcquired = [ this, varW = std::weak_ptr<Variable>{newVariable} ](
                         QUuid identifier, auto dataSeriesAcquired, auto dateTimeToPutInCache)
                     {
                         if (auto variable = varW.lock()) {
                             auto varIdentifier = impl->m_VariableToIdentifier.at(variable);
                             if (varIdentifier == identifier) {
                                 impl->m_VariableCacheController->addDateTime(variable, dateTimeToPutInCache);
                                 variable->setDataSeries(dataSeriesAcquired);
                             }
                         }
                     };
                     connect(provider.get(), &IDataProvider::dataProvided, addDateTimeAcquired);
                     this->onRequestDataLoading(newVariable, dateTime);
                 }
             }
             void VariableController::onDateTimeOnSelection(const SqpDateTime &dateTime)
             {
                 qCDebug(LOG_VariableController()) << "VariableController::onDateTimeOnSelection"
                                                   << QThread::currentThread()->objectName();
                 auto selectedRows = impl->m_VariableSelectionModel->selectedRows();
                 for (const auto &selectedRow : qAsConst(selectedRows)) {
                     if (auto selectedVariable = impl->m_VariableModel->variable(selectedRow.row())) {
                         selectedVariable->setDateTime(dateTime);
                         this->onRequestDataLoading(selectedVariable, dateTime);
                     }
                 }
             }
             void VariableController::onVariableRetrieveDataInProgress(QUuid identifier, double progress)
             {
                 auto findReply = [identifier](const auto &entry) { return identifier == entry.second; };
                 auto end = impl->m_VariableToIdentifier.cend();
                 auto it = std::find_if(impl->m_VariableToIdentifier.cbegin(), end, findReply);
                 if (it != end) {
                     impl->m_VariableModel->setDataProgress(it->first, progress);
                 }
             }
             void VariableController::onRequestDataLoading(std::shared_ptr<Variable> variable,
                                                           const SqpDateTime &dateTime)
             {
                 qCDebug(LOG_VariableController()) << "VariableController::onRequestDataLoading"
                                                   << QThread::currentThread()->objectName();
                 // we want to load data of the variable for the dateTime.
                 // First we check if the cache contains some of them.
                 // For the other, we ask the provider to give them.
                 if (variable) {
                     auto dateTimeListNotInCache
                         = impl->m_VariableCacheController->provideNotInCacheDateTimeList(variable, dateTime);
                     if (!dateTimeListNotInCache.empty()) {
                         // 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), variable->metadata()});
                     }
                     else {
                         emit variable->updated();
                     }
                 }
                 else {
                     qCCritical(LOG_VariableController()) << tr("Impossible to load data of a variable null");
                 }
             }
             void VariableController::initialize()
             {
                 qCDebug(LOG_VariableController()) << tr("VariableController init") << QThread::currentThread();
                 impl->m_WorkingMutex.lock();
                 qCDebug(LOG_VariableController()) << tr("VariableController init END");
             }
             void VariableController::finalize()
             {
                 impl->m_WorkingMutex.unlock();
             }
             void VariableController::waitForFinish()
             {
                 QMutexLocker locker{&impl->m_WorkingMutex};
             }

core/src/Variable/VariableModel.cpp +3 -4

             #include <Variable/Variable.h>
             #include <Variable/VariableModel.h>
             #include <Data/IDataSeries.h>
             #include <QDateTime>
             #include <QSize>
             #include <unordered_map>
             Q_LOGGING_CATEGORY(LOG_VariableModel, "VariableModel")
             namespace {
             // Column indexes
             const auto NAME_COLUMN = 0;
             const auto TSTART_COLUMN = 1;
             const auto TEND_COLUMN = 2;
             const auto NB_COLUMNS = 3;
             // Column properties
             const auto DEFAULT_HEIGHT = 25;
             const auto DEFAULT_WIDTH = 100;
             struct ColumnProperties {
                 ColumnProperties(const QString &name = {}, int width = DEFAULT_WIDTH,
                                  int height = DEFAULT_HEIGHT)
                         : m_Name{name}, m_Width{width}, m_Height{height}
                 {
                 }
                 QString m_Name;
                 int m_Width;
                 int m_Height;
             };
             const auto COLUMN_PROPERTIES
                 = QHash<int, ColumnProperties>{{NAME_COLUMN, {QObject::tr("Name")}},
                                                {TSTART_COLUMN, {QObject::tr("tStart"), 180}},
                                                {TEND_COLUMN, {QObject::tr("tEnd"), 180}}};
             /// Format for datetimes
             const auto DATETIME_FORMAT = QStringLiteral("dd/MM/yyyy \nhh:mm:ss:zzz");
             } // namespace
             struct VariableModel::VariableModelPrivate {
                 /// Variables created in SciQlop
                 std::vector<std::shared_ptr<Variable> > m_Variables;
                 std::unordered_map<std::shared_ptr<Variable>, double> m_VariableToProgress;
                 /// Return the row index of the variable. -1 if it's not found
                 int indexOfVariable(Variable *variable) const noexcept;
             };
             VariableModel::VariableModel(QObject *parent)
                     : QAbstractTableModel{parent}, impl{spimpl::make_unique_impl<VariableModelPrivate>()}
             {
             }
             std::shared_ptr<Variable> VariableModel::createVariable(const QString &name,
-                                                                    const SqpDateTime &dateTime) noexcept
+                                                                    const SqpDateTime &dateTime,
+                                                                    const QVariantHash &metadata) noexcept
             {
                 auto insertIndex = rowCount();
                 beginInsertRows({}, insertIndex, insertIndex);
-                /// @todo For the moment, the other data of the variable is initialized with default values
+                auto variable = std::make_shared<Variable>(name, dateTime, metadata);
-                auto variable = std::make_shared<Variable>(name, QStringLiteral("unit"),
-                                                           QStringLiteral("mission"), dateTime);
                 impl->m_Variables.push_back(variable);
                 connect(variable.get(), &Variable::updated, this, &VariableModel::onVariableUpdated);
                 endInsertRows();
                 return variable;
             }
             void VariableModel::deleteVariable(std::shared_ptr<Variable> variable) noexcept
             {
                 if (!variable) {
                     qCCritical(LOG_Variable()) << "Can't delete a null variable from the model";
                     return;
                 }
                 // Finds variable in the model
                 auto begin = impl->m_Variables.cbegin();
                 auto end = impl->m_Variables.cend();
                 auto it = std::find(begin, end, variable);
                 if (it != end) {
                     auto removeIndex = std::distance(begin, it);
                     // Deletes variable
                     beginRemoveRows({}, removeIndex, removeIndex);
                     impl->m_Variables.erase(it);
                     endRemoveRows();
                 }
                 else {
                     qCritical(LOG_VariableModel())
                         << tr("Can't delete variable %1 from the model: the variable is not in the model")
                                .arg(variable->name());
                 }
             }
             std::shared_ptr<Variable> VariableModel::variable(int index) const
             {
                 return (index >= 0 && index < impl->m_Variables.size()) ? impl->m_Variables[index] : nullptr;
             }
             void VariableModel::setDataProgress(std::shared_ptr<Variable> variable, double progress)
             {
                 impl->m_VariableToProgress[variable] = progress;
                 auto modelIndex = createIndex(impl->indexOfVariable(variable.get()), NAME_COLUMN);
                 emit dataChanged(modelIndex, modelIndex);
             }
             int VariableModel::columnCount(const QModelIndex &parent) const
             {
                 Q_UNUSED(parent);
                 return NB_COLUMNS;
             }
             int VariableModel::rowCount(const QModelIndex &parent) const
             {
                 Q_UNUSED(parent);
                 return impl->m_Variables.size();
             }
             QVariant VariableModel::data(const QModelIndex &index, int role) const
             {
                 if (!index.isValid()) {
                     return QVariant{};
                 }
                 if (index.row() < 0 || index.row() >= rowCount()) {
                     return QVariant{};
                 }
                 if (role == Qt::DisplayRole) {
                     if (auto variable = impl->m_Variables.at(index.row()).get()) {
                         /// Lambda function that builds the variant to return for a time value
                         auto dateTimeVariant = [](double time) {
                             auto dateTime = QDateTime::fromMSecsSinceEpoch(time * 1000.);
                             return dateTime.toString(DATETIME_FORMAT);
                         };
                         switch (index.column()) {
                             case NAME_COLUMN:
                                 return variable->name();
                             case TSTART_COLUMN:
                                 return dateTimeVariant(variable->dateTime().m_TStart);
                             case TEND_COLUMN:
                                 return dateTimeVariant(variable->dateTime().m_TEnd);
                             default:
                                 // No action
                                 break;
                         }
                         qWarning(LOG_VariableModel())
                             << tr("Can't get data (unknown column %1)").arg(index.column());
                     }
                     else {
                         qWarning(LOG_VariableModel()) << tr("Can't get data (no variable)");
                     }
                 }
                 else if (role == VariableRoles::ProgressRole) {
                     if (auto variable = impl->m_Variables.at(index.row())) {
                         auto it = impl->m_VariableToProgress.find(variable);
                         if (it != impl->m_VariableToProgress.cend()) {
                             return it->second;
                         }
                     }
                 }
                 return QVariant{};
             }
             QVariant VariableModel::headerData(int section, Qt::Orientation orientation, int role) const
             {
                 if (role != Qt::DisplayRole && role != Qt::SizeHintRole) {
                     return QVariant{};
                 }
                 if (orientation == Qt::Horizontal) {
                     auto propertiesIt = COLUMN_PROPERTIES.find(section);
                     if (propertiesIt != COLUMN_PROPERTIES.cend()) {
                         // Role is either DisplayRole or SizeHintRole
                         return (role == Qt::DisplayRole)
                                    ? QVariant{propertiesIt->m_Name}
                                    : QVariant{QSize{propertiesIt->m_Width, propertiesIt->m_Height}};
                     }
                     else {
                         qWarning(LOG_VariableModel())
                             << tr("Can't get header data (unknown column %1)").arg(section);
                     }
                 }
                 return QVariant{};
             }
             void VariableModel::onVariableUpdated() noexcept
             {
                 // Finds variable that has been updated in the model
                 if (auto updatedVariable = dynamic_cast<Variable *>(sender())) {
                     auto updatedVariableIndex = impl->indexOfVariable(updatedVariable);
                     if (updatedVariableIndex > -1) {
                         emit dataChanged(createIndex(updatedVariableIndex, 0),
                                          createIndex(updatedVariableIndex, columnCount() - 1));
                     }
                 }
             }
             int VariableModel::VariableModelPrivate::indexOfVariable(Variable *variable) const noexcept
             {
                 auto begin = std::cbegin(m_Variables);
                 auto end = std::cend(m_Variables);
                 auto it
                     = std::find_if(begin, end, [variable](const auto &var) { return var.get() == variable; });
                 if (it != end) {
                     // Gets the index of the variable in the model: we assume here that views have the same
                     // order as the model
                     return std::distance(begin, it);
                 }
                 else {
                     return -1;
                 }
             }

core/tests/Variable/TestVariableCacheController.cpp +2 -2

             #include <Variable/Variable.h>
             #include <Variable/VariableCacheController.h>
             #include <QObject>
             #include <QtTest>
             #include <memory>
             class TestVariableCacheController : public QObject {
                 Q_OBJECT
             private slots:
                 void testProvideNotInCacheDateTimeList();
                 void testAddDateTime();
             };
             void TestVariableCacheController::testProvideNotInCacheDateTimeList()
             {
                 VariableCacheController variableCacheController{};
                 auto ts0 = QDateTime{QDate{2017, 01, 01}, QTime{2, 3, 0, 0}};
                 auto te0 = QDateTime{QDate{2017, 01, 01}, QTime{2, 4, 0, 0}};
                 auto sqp0 = SqpDateTime{static_cast<double>(ts0.toMSecsSinceEpoch()),
                                         static_cast<double>(te0.toMSecsSinceEpoch())};
                 auto ts1 = QDateTime{QDate{2017, 01, 01}, QTime{2, 6, 0, 0}};
                 auto te1 = QDateTime{QDate{2017, 01, 01}, QTime{2, 8, 0, 0}};
                 auto sqp1 = SqpDateTime{static_cast<double>(ts1.toMSecsSinceEpoch()),
                                         static_cast<double>(te1.toMSecsSinceEpoch())};
                 auto ts2 = QDateTime{QDate{2017, 01, 01}, QTime{2, 18, 0, 0}};
                 auto te2 = QDateTime{QDate{2017, 01, 01}, QTime{2, 20, 0, 0}};
                 auto sqp2 = SqpDateTime{static_cast<double>(ts2.toMSecsSinceEpoch()),
                                         static_cast<double>(te2.toMSecsSinceEpoch())};
-                auto var0 = std::make_shared<Variable>("", "", "", sqp0);
+                auto var0 = std::make_shared<Variable>("", sqp0);
                 variableCacheController.addDateTime(var0, sqp0);
                 variableCacheController.addDateTime(var0, sqp1);
                 variableCacheController.addDateTime(var0, sqp2);
                 // first case [ts,te] < ts0
                 auto ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 0, 0, 0}};
                 auto te = QDateTime{QDate{2017, 01, 01}, QTime{2, 1, 0, 0}};
                 auto sqp = SqpDateTime{static_cast<double>(ts.toMSecsSinceEpoch()),
                                        static_cast<double>(te.toMSecsSinceEpoch())};
                 auto notInCach = variableCacheController.provideNotInCacheDateTimeList(var0, sqp);
                 QCOMPARE(notInCach.size(), 1);
                 auto notInCacheSqp = notInCach.first();
                 QCOMPARE(notInCacheSqp.m_TStart, static_cast<double>(ts.toMSecsSinceEpoch()));
                 QCOMPARE(notInCacheSqp.m_TEnd, static_cast<double>(te.toMSecsSinceEpoch()));
                 // second case ts < ts0 &&  ts0 < te <= te0
                 ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 0, 0, 0}};
                 te = QDateTime{QDate{2017, 01, 01}, QTime{2, 3, 30, 0}};
                 sqp = SqpDateTime{static_cast<double>(ts.toMSecsSinceEpoch()),
                                   static_cast<double>(te.toMSecsSinceEpoch())};
                 notInCach = variableCacheController.provideNotInCacheDateTimeList(var0, sqp);
                 QCOMPARE(notInCach.size(), 1);
                 notInCacheSqp = notInCach.first();
                 QCOMPARE(notInCacheSqp.m_TStart, static_cast<double>(ts.toMSecsSinceEpoch()));
                 QCOMPARE(notInCacheSqp.m_TEnd, static_cast<double>(ts0.toMSecsSinceEpoch()));
                 // 3th case ts < ts0 &&  te0 < te <= ts1
                 ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 0, 0, 0}};
                 te = QDateTime{QDate{2017, 01, 01}, QTime{2, 5, 0, 0}};
                 sqp = SqpDateTime{static_cast<double>(ts.toMSecsSinceEpoch()),
                                   static_cast<double>(te.toMSecsSinceEpoch())};
                 notInCach = variableCacheController.provideNotInCacheDateTimeList(var0, sqp);
                 QCOMPARE(notInCach.size(), 2);
                 notInCacheSqp = notInCach.first();
                 QCOMPARE(notInCacheSqp.m_TStart, static_cast<double>(ts.toMSecsSinceEpoch()));
                 QCOMPARE(notInCacheSqp.m_TEnd, static_cast<double>(ts0.toMSecsSinceEpoch()));
                 notInCacheSqp = notInCach.at(1);
                 QCOMPARE(notInCacheSqp.m_TStart, static_cast<double>(te0.toMSecsSinceEpoch()));
                 QCOMPARE(notInCacheSqp.m_TEnd, static_cast<double>(te.toMSecsSinceEpoch()));
                 // 4th case ts < ts0 &&  ts1 < te <= te1
                 ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 0, 0, 0}};
                 te = QDateTime{QDate{2017, 01, 01}, QTime{2, 7, 0, 0}};
                 sqp = SqpDateTime{static_cast<double>(ts.toMSecsSinceEpoch()),
                                   static_cast<double>(te.toMSecsSinceEpoch())};
                 notInCach = variableCacheController.provideNotInCacheDateTimeList(var0, sqp);
                 QCOMPARE(notInCach.size(), 2);
                 notInCacheSqp = notInCach.first();
                 QCOMPARE(notInCacheSqp.m_TStart, static_cast<double>(ts.toMSecsSinceEpoch()));
                 QCOMPARE(notInCacheSqp.m_TEnd, static_cast<double>(ts0.toMSecsSinceEpoch()));
                 notInCacheSqp = notInCach.at(1);
                 QCOMPARE(notInCacheSqp.m_TStart, static_cast<double>(te0.toMSecsSinceEpoch()));
                 QCOMPARE(notInCacheSqp.m_TEnd, static_cast<double>(ts1.toMSecsSinceEpoch()));
                 // 5th case ts < ts0 &&  te3 < te
                 ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 0, 0, 0}};
                 te = QDateTime{QDate{2017, 01, 01}, QTime{2, 22, 0, 0}};
                 sqp = SqpDateTime{static_cast<double>(ts.toMSecsSinceEpoch()),
                                   static_cast<double>(te.toMSecsSinceEpoch())};
                 notInCach = variableCacheController.provideNotInCacheDateTimeList(var0, sqp);
                 QCOMPARE(notInCach.size(), 4);
                 notInCacheSqp = notInCach.first();
                 QCOMPARE(notInCacheSqp.m_TStart, static_cast<double>(ts.toMSecsSinceEpoch()));
                 QCOMPARE(notInCacheSqp.m_TEnd, static_cast<double>(ts0.toMSecsSinceEpoch()));
                 notInCacheSqp = notInCach.at(1);
                 QCOMPARE(notInCacheSqp.m_TStart, static_cast<double>(te0.toMSecsSinceEpoch()));
                 QCOMPARE(notInCacheSqp.m_TEnd, static_cast<double>(ts1.toMSecsSinceEpoch()));
                 notInCacheSqp = notInCach.at(2);
                 QCOMPARE(notInCacheSqp.m_TStart, static_cast<double>(te1.toMSecsSinceEpoch()));
                 QCOMPARE(notInCacheSqp.m_TEnd, static_cast<double>(ts2.toMSecsSinceEpoch()));
                 notInCacheSqp = notInCach.at(3);
                 QCOMPARE(notInCacheSqp.m_TStart, static_cast<double>(te2.toMSecsSinceEpoch()));
                 QCOMPARE(notInCacheSqp.m_TEnd, static_cast<double>(te.toMSecsSinceEpoch()));
                 // 6th case ts2 < ts
                 ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 45, 0, 0}};
                 te = QDateTime{QDate{2017, 01, 01}, QTime{2, 47, 0, 0}};
                 sqp = SqpDateTime{static_cast<double>(ts.toMSecsSinceEpoch()),
                                   static_cast<double>(te.toMSecsSinceEpoch())};
                 notInCach = variableCacheController.provideNotInCacheDateTimeList(var0, sqp);
                 QCOMPARE(notInCach.size(), 1);
                 notInCacheSqp = notInCach.first();
                 QCOMPARE(notInCacheSqp.m_TStart, static_cast<double>(ts.toMSecsSinceEpoch()));
                 QCOMPARE(notInCacheSqp.m_TEnd, static_cast<double>(te.toMSecsSinceEpoch()));
                 // 7th case ts = te0 && te < ts1
                 ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 4, 0, 0}};
                 te = QDateTime{QDate{2017, 01, 01}, QTime{2, 5, 0, 0}};
                 sqp = SqpDateTime{static_cast<double>(ts.toMSecsSinceEpoch()),
                                   static_cast<double>(te.toMSecsSinceEpoch())};
                 notInCach = variableCacheController.provideNotInCacheDateTimeList(var0, sqp);
                 QCOMPARE(notInCach.size(), 1);
                 notInCacheSqp = notInCach.first();
                 QCOMPARE(notInCacheSqp.m_TStart, static_cast<double>(te0.toMSecsSinceEpoch()));
                 QCOMPARE(notInCacheSqp.m_TEnd, static_cast<double>(te.toMSecsSinceEpoch()));
                 // 8th case ts0 < ts < te0 && te < ts1
                 ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 3, 30, 0}};
                 te = QDateTime{QDate{2017, 01, 01}, QTime{2, 5, 0, 0}};
                 sqp = SqpDateTime{static_cast<double>(ts.toMSecsSinceEpoch()),
                                   static_cast<double>(te.toMSecsSinceEpoch())};
                 notInCach = variableCacheController.provideNotInCacheDateTimeList(var0, sqp);
                 QCOMPARE(notInCach.size(), 1);
                 notInCacheSqp = notInCach.first();
                 QCOMPARE(notInCacheSqp.m_TStart, static_cast<double>(te0.toMSecsSinceEpoch()));
                 QCOMPARE(notInCacheSqp.m_TEnd, static_cast<double>(te.toMSecsSinceEpoch()));
                 // 9th case ts0 < ts < te0 &&  ts1 < te < te1
                 ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 3, 30, 0}};
                 te = QDateTime{QDate{2017, 01, 01}, QTime{2, 7, 0, 0}};
                 sqp = SqpDateTime{static_cast<double>(ts.toMSecsSinceEpoch()),
                                   static_cast<double>(te.toMSecsSinceEpoch())};
                 notInCach = variableCacheController.provideNotInCacheDateTimeList(var0, sqp);
                 QCOMPARE(notInCach.size(), 1);
                 notInCacheSqp = notInCach.first();
                 QCOMPARE(notInCacheSqp.m_TStart, static_cast<double>(te0.toMSecsSinceEpoch()));
                 QCOMPARE(notInCacheSqp.m_TEnd, static_cast<double>(ts1.toMSecsSinceEpoch()));
                 // 10th case te1 < ts < te < ts2
                 ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 9, 0, 0}};
                 te = QDateTime{QDate{2017, 01, 01}, QTime{2, 10, 0, 0}};
                 sqp = SqpDateTime{static_cast<double>(ts.toMSecsSinceEpoch()),
                                   static_cast<double>(te.toMSecsSinceEpoch())};
                 notInCach = variableCacheController.provideNotInCacheDateTimeList(var0, sqp);
                 QCOMPARE(notInCach.size(), 1);
                 notInCacheSqp = notInCach.first();
                 QCOMPARE(notInCacheSqp.m_TStart, static_cast<double>(ts.toMSecsSinceEpoch()));
                 QCOMPARE(notInCacheSqp.m_TEnd, static_cast<double>(te.toMSecsSinceEpoch()));
                 // 11th case te0 < ts < ts1 &&  te3 < te
                 ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 5, 0, 0}};
                 te = QDateTime{QDate{2017, 01, 01}, QTime{2, 47, 0, 0}};
                 sqp = SqpDateTime{static_cast<double>(ts.toMSecsSinceEpoch()),
                                   static_cast<double>(te.toMSecsSinceEpoch())};
                 notInCach = variableCacheController.provideNotInCacheDateTimeList(var0, sqp);
                 QCOMPARE(notInCach.size(), 3);
                 notInCacheSqp = notInCach.first();
                 QCOMPARE(notInCacheSqp.m_TStart, static_cast<double>(ts.toMSecsSinceEpoch()));
                 QCOMPARE(notInCacheSqp.m_TEnd, static_cast<double>(ts1.toMSecsSinceEpoch()));
                 notInCacheSqp = notInCach.at(1);
                 QCOMPARE(notInCacheSqp.m_TStart, static_cast<double>(te1.toMSecsSinceEpoch()));
                 QCOMPARE(notInCacheSqp.m_TEnd, static_cast<double>(ts2.toMSecsSinceEpoch()));
                 notInCacheSqp = notInCach.at(2);
                 QCOMPARE(notInCacheSqp.m_TStart, static_cast<double>(te2.toMSecsSinceEpoch()));
                 QCOMPARE(notInCacheSqp.m_TEnd, static_cast<double>(te.toMSecsSinceEpoch()));
                 // 12th case te0 < ts < ts1 &&  te3 < te
                 ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 5, 0, 0}};
                 te = QDateTime{QDate{2017, 01, 01}, QTime{2, 10, 0, 0}};
                 sqp = SqpDateTime{static_cast<double>(ts.toMSecsSinceEpoch()),
                                   static_cast<double>(te.toMSecsSinceEpoch())};
                 notInCach = variableCacheController.provideNotInCacheDateTimeList(var0, sqp);
                 QCOMPARE(notInCach.size(), 2);
                 notInCacheSqp = notInCach.first();
                 QCOMPARE(notInCacheSqp.m_TStart, static_cast<double>(ts.toMSecsSinceEpoch()));
                 QCOMPARE(notInCacheSqp.m_TEnd, static_cast<double>(ts1.toMSecsSinceEpoch()));
                 notInCacheSqp = notInCach.at(1);
                 QCOMPARE(notInCacheSqp.m_TStart, static_cast<double>(te1.toMSecsSinceEpoch()));
                 QCOMPARE(notInCacheSqp.m_TEnd, static_cast<double>(te.toMSecsSinceEpoch()));
                 // 12th case ts0 < ts < te0
                 ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 3, 10, 0}};
                 te = QDateTime{QDate{2017, 01, 01}, QTime{2, 3, 50, 0}};
                 sqp = SqpDateTime{static_cast<double>(ts.toMSecsSinceEpoch()),
                                   static_cast<double>(te.toMSecsSinceEpoch())};
                 notInCach = variableCacheController.provideNotInCacheDateTimeList(var0, sqp);
                 QCOMPARE(notInCach.size(), 0);
             }
             void TestVariableCacheController::testAddDateTime()
             {
                 VariableCacheController variableCacheController{};
                 auto ts0 = QDateTime{QDate{2017, 01, 01}, QTime{2, 3, 0, 0}};
                 auto te0 = QDateTime{QDate{2017, 01, 01}, QTime{2, 4, 0, 0}};
                 auto sqp0 = SqpDateTime{static_cast<double>(ts0.toMSecsSinceEpoch()),
                                         static_cast<double>(te0.toMSecsSinceEpoch())};
                 auto ts1 = QDateTime{QDate{2017, 01, 01}, QTime{2, 6, 0, 0}};
                 auto te1 = QDateTime{QDate{2017, 01, 01}, QTime{2, 8, 0, 0}};
                 auto sqp1 = SqpDateTime{static_cast<double>(ts1.toMSecsSinceEpoch()),
                                         static_cast<double>(te1.toMSecsSinceEpoch())};
                 auto ts2 = QDateTime{QDate{2017, 01, 01}, QTime{2, 18, 0, 0}};
                 auto te2 = QDateTime{QDate{2017, 01, 01}, QTime{2, 20, 0, 0}};
                 auto sqp2 = SqpDateTime{static_cast<double>(ts2.toMSecsSinceEpoch()),
                                         static_cast<double>(te2.toMSecsSinceEpoch())};
                 auto ts01 = QDateTime{QDate{2017, 01, 01}, QTime{2, 4, 0, 0}};
                 auto te01 = QDateTime{QDate{2017, 01, 01}, QTime{2, 6, 0, 0}};
                 auto sqp01 = SqpDateTime{static_cast<double>(ts01.toMSecsSinceEpoch()),
                                          static_cast<double>(te01.toMSecsSinceEpoch())};
                 auto ts3 = QDateTime{QDate{2017, 01, 01}, QTime{2, 14, 0, 0}};
                 auto te3 = QDateTime{QDate{2017, 01, 01}, QTime{2, 16, 0, 0}};
                 auto sqp3 = SqpDateTime{static_cast<double>(ts3.toMSecsSinceEpoch()),
                                         static_cast<double>(te3.toMSecsSinceEpoch())};
                 auto ts03 = QDateTime{QDate{2017, 01, 01}, QTime{2, 4, 0, 0}};
                 auto te03 = QDateTime{QDate{2017, 01, 01}, QTime{2, 22, 0, 0}};
                 auto sqp03 = SqpDateTime{static_cast<double>(ts03.toMSecsSinceEpoch()),
                                          static_cast<double>(te03.toMSecsSinceEpoch())};
-                auto var0 = std::make_shared<Variable>("", "", "", sqp0);
+                auto var0 = std::make_shared<Variable>("", sqp0);
                 // First case: add the first interval to the variable :sqp0
                 variableCacheController.addDateTime(var0, sqp0);
                 auto dateCacheList = variableCacheController.dateCacheList(var0);
                 QCOMPARE(dateCacheList.count(), 1);
                 auto dateCache = dateCacheList.at(0);
                 QCOMPARE(dateCache.m_TStart, static_cast<double>(ts0.toMSecsSinceEpoch()));
                 QCOMPARE(dateCache.m_TEnd, static_cast<double>(te0.toMSecsSinceEpoch()));
                 // 2nd case: add a second interval : sqp1 > sqp0
                 variableCacheController.addDateTime(var0, sqp1);
                 dateCacheList = variableCacheController.dateCacheList(var0);
                 QCOMPARE(dateCacheList.count(), 2);
                 dateCache = dateCacheList.at(0);
                 QCOMPARE(dateCache.m_TStart, static_cast<double>(ts0.toMSecsSinceEpoch()));
                 QCOMPARE(dateCache.m_TEnd, static_cast<double>(te0.toMSecsSinceEpoch()));
                 dateCache = dateCacheList.at(1);
                 QCOMPARE(dateCache.m_TStart, static_cast<double>(ts1.toMSecsSinceEpoch()));
                 QCOMPARE(dateCache.m_TEnd, static_cast<double>(te1.toMSecsSinceEpoch()));
                 // 3th case: merge sqp0 & sqp1 with sqp01
                 variableCacheController.addDateTime(var0, sqp01);
                 dateCacheList = variableCacheController.dateCacheList(var0);
                 QCOMPARE(dateCacheList.count(), 1);
                 dateCache = dateCacheList.at(0);
                 QCOMPARE(dateCache.m_TStart, static_cast<double>(ts0.toMSecsSinceEpoch()));
                 QCOMPARE(dateCache.m_TEnd, static_cast<double>(te1.toMSecsSinceEpoch()));
                 // 4th case: add a second interval : sqp1 > sqp0
                 variableCacheController.addDateTime(var0, sqp2);
                 variableCacheController.addDateTime(var0, sqp3);
                 dateCacheList = variableCacheController.dateCacheList(var0);
                 QCOMPARE(dateCacheList.count(), 3);
                 dateCache = dateCacheList.at(0);
                 QCOMPARE(dateCache.m_TStart, static_cast<double>(ts0.toMSecsSinceEpoch()));
                 QCOMPARE(dateCache.m_TEnd, static_cast<double>(te1.toMSecsSinceEpoch()));
                 dateCache = dateCacheList.at(1);
                 QCOMPARE(dateCache.m_TStart, static_cast<double>(ts3.toMSecsSinceEpoch()));
                 QCOMPARE(dateCache.m_TEnd, static_cast<double>(te3.toMSecsSinceEpoch()));
                 dateCache = dateCacheList.at(2);
                 QCOMPARE(dateCache.m_TStart, static_cast<double>(ts2.toMSecsSinceEpoch()));
                 QCOMPARE(dateCache.m_TEnd, static_cast<double>(te2.toMSecsSinceEpoch()));
                 // 5th case: merge all interval
                 variableCacheController.addDateTime(var0, sqp03);
                 dateCacheList = variableCacheController.dateCacheList(var0);
                 QCOMPARE(dateCacheList.count(), 1);
                 dateCache = dateCacheList.at(0);
                 QCOMPARE(dateCache.m_TStart, static_cast<double>(ts0.toMSecsSinceEpoch()));
                 QCOMPARE(dateCache.m_TEnd, static_cast<double>(te03.toMSecsSinceEpoch()));
             }
             QTEST_MAIN(TestVariableCacheController)
             #include "TestVariableCacheController.moc"

gui/include/Visualization/operations/MenuBuilder.h +3 -2

             #ifndef SCIQLOP_MENUBUILDER_H
             #define SCIQLOP_MENUBUILDER_H
             #include <QLoggingCategory>
             #include <QMenu>
             #include <QStack>
             Q_DECLARE_LOGGING_CATEGORY(LOG_MenuBuilder)
             /// Helper assigned to build a hierarchical menu
             class MenuBuilder {
             public:
                 /**
                  * Ctor
                  * @param menu the parent menu
                  */
                 explicit MenuBuilder(QMenu *menu);
                 /**
                  * Adds action to the current menu
                  * @param actionName the name of the action
                  * @param actionFunction the function that will be executed when the action is triggered
                  */
                 template <typename ActionFun>
                 void addAction(const QString &actionName, ActionFun actionFunction);
                 /**
-                 * Adds a new menu to the current menu
+                 * Adds a new menu to the current menu and returns it
                  * @param name the name of the menu
                  * @param icon the icon of the menu (can be null)
+                 * @returns the created menu, nullptr if it couldn't be created
                  */
-                void addMenu(const QString &name, const QIcon &icon = {});
+                QMenu *addMenu(const QString &name, const QIcon &icon = {});
                 /// Adds a separator to the current menu. The separator is added only if the menu already
                 /// contains entries
                 void addSeparator();
                 /// Closes the current menu
                 void closeMenu();
             private:
                 /// @return the current menu (i.e. the top menu of the stack), nullptr if there is no menu
                 QMenu *currentMenu() const;
                 /// Stack of all menus currently opened
                 QStack<QMenu *> m_Menus{};
             };
             template <typename ActionFun>
             void MenuBuilder::addAction(const QString &actionName, ActionFun actionFunction)
             {
                 if (auto currMenu = currentMenu()) {
                     currMenu->addAction(actionName, actionFunction);
                 }
                 else {
                     qCCritical(LOG_MenuBuilder()) << QObject::tr("No current menu to attach the action");
                 }
             }
             #endif // SCIQLOP_MENUBUILDER_H

gui/src/SqpApplication.cpp +4 -2

             #include "SqpApplication.h"
             #include <Data/IDataProvider.h>
             #include <DataSource/DataSourceController.h>
             #include <Network/NetworkController.h>
             #include <QThread>
             #include <Time/TimeController.h>
             #include <Variable/Variable.h>
             #include <Variable/VariableController.h>
             #include <Visualization/VisualizationController.h>
             Q_LOGGING_CATEGORY(LOG_SqpApplication, "SqpApplication")
             class SqpApplication::SqpApplicationPrivate {
             public:
                 SqpApplicationPrivate()
                         : m_DataSourceController{std::make_unique<DataSourceController>()},
                           m_NetworkController{std::make_unique<NetworkController>()},
                           m_TimeController{std::make_unique<TimeController>()},
                           m_VariableController{std::make_unique<VariableController>()},
                           m_VisualizationController{std::make_unique<VisualizationController>()}
                 {
                     // /////////////////////////////// //
                     // Connections between controllers //
                     // /////////////////////////////// //
                     // VariableController <-> DataSourceController
                     connect(m_DataSourceController.get(),
-                            SIGNAL(variableCreationRequested(const QString &, std::shared_ptr<IDataProvider>)),
+                            SIGNAL(variableCreationRequested(const QString &, const QVariantHash &,
+                                                             std::shared_ptr<IDataProvider>)),
                             m_VariableController.get(),
-                            SLOT(createVariable(const QString &, std::shared_ptr<IDataProvider>)));
+                            SLOT(createVariable(const QString &, const QVariantHash &,
+                                                std::shared_ptr<IDataProvider>)));
                     // VariableController <-> VisualizationController
                     connect(m_VariableController.get(),
                             SIGNAL(variableAboutToBeDeleted(std::shared_ptr<Variable>)),
                             m_VisualizationController.get(),
                             SIGNAL(variableAboutToBeDeleted(std::shared_ptr<Variable>)), Qt::DirectConnection);
                     m_DataSourceController->moveToThread(&m_DataSourceControllerThread);
                     m_NetworkController->moveToThread(&m_NetworkControllerThread);
                     m_VariableController->moveToThread(&m_VariableControllerThread);
                     m_VisualizationController->moveToThread(&m_VisualizationControllerThread);
                     // Additionnal init
                     m_VariableController->setTimeController(m_TimeController.get());
                 }
                 virtual ~SqpApplicationPrivate()
                 {
                     qCInfo(LOG_SqpApplication()) << tr("SqpApplicationPrivate destruction");
                     m_DataSourceControllerThread.quit();
                     m_DataSourceControllerThread.wait();
                     m_NetworkControllerThread.quit();
                     m_NetworkControllerThread.wait();
                     m_VariableControllerThread.quit();
                     m_VariableControllerThread.wait();
                     m_VisualizationControllerThread.quit();
                     m_VisualizationControllerThread.wait();
                 }
                 std::unique_ptr<DataSourceController> m_DataSourceController;
                 std::unique_ptr<VariableController> m_VariableController;
                 std::unique_ptr<TimeController> m_TimeController;
                 std::unique_ptr<NetworkController> m_NetworkController;
                 std::unique_ptr<VisualizationController> m_VisualizationController;
                 QThread m_DataSourceControllerThread;
                 QThread m_NetworkControllerThread;
                 QThread m_VariableControllerThread;
                 QThread m_VisualizationControllerThread;
             };
             SqpApplication::SqpApplication(int &argc, char **argv)
                     : QApplication{argc, argv}, impl{spimpl::make_unique_impl<SqpApplicationPrivate>()}
             {
                 qCDebug(LOG_SqpApplication()) << tr("SqpApplication construction") << QThread::currentThread();
                 connect(&impl->m_DataSourceControllerThread, &QThread::started,
                         impl->m_DataSourceController.get(), &DataSourceController::initialize);
                 connect(&impl->m_DataSourceControllerThread, &QThread::finished,
                         impl->m_DataSourceController.get(), &DataSourceController::finalize);
                 connect(&impl->m_NetworkControllerThread, &QThread::started, impl->m_NetworkController.get(),
                         &NetworkController::initialize);
                 connect(&impl->m_NetworkControllerThread, &QThread::finished, impl->m_NetworkController.get(),
                         &NetworkController::finalize);
                 connect(&impl->m_VariableControllerThread, &QThread::started, impl->m_VariableController.get(),
                         &VariableController::initialize);
                 connect(&impl->m_VariableControllerThread, &QThread::finished, impl->m_VariableController.get(),
                         &VariableController::finalize);
                 connect(&impl->m_VisualizationControllerThread, &QThread::started,
                         impl->m_VisualizationController.get(), &VisualizationController::initialize);
                 connect(&impl->m_VisualizationControllerThread, &QThread::finished,
                         impl->m_VisualizationController.get(), &VisualizationController::finalize);
                 impl->m_DataSourceControllerThread.start();
                 impl->m_NetworkControllerThread.start();
                 impl->m_VariableControllerThread.start();
                 impl->m_VisualizationControllerThread.start();
                 // Core connections:
                 // NetworkController <-> VariableController
                 connect(&sqpApp->networkController(), &NetworkController::replyDownloadProgress,
                         &sqpApp->variableController(), &VariableController::onVariableRetrieveDataInProgress);
             }
             SqpApplication::~SqpApplication()
             {
             }
             void SqpApplication::initialize()
             {
             }
             DataSourceController &SqpApplication::dataSourceController() noexcept
             {
                 return *impl->m_DataSourceController;
             }
             NetworkController &SqpApplication::networkController() noexcept
             {
                 return *impl->m_NetworkController;
             }
             TimeController &SqpApplication::timeController() noexcept
             {
                 return *impl->m_TimeController;
             }
             VariableController &SqpApplication::variableController() noexcept
             {
                 return *impl->m_VariableController;
             }
             VisualizationController &SqpApplication::visualizationController() noexcept
             {
                 return *impl->m_VisualizationController;
             }

gui/src/Visualization/operations/GenerateVariableMenuOperation.cpp +5 -1

             #include "Visualization/operations/GenerateVariableMenuOperation.h"
             #include "Visualization/operations/MenuBuilder.h"
             #include "Visualization/VisualizationGraphWidget.h"
             #include "Visualization/VisualizationTabWidget.h"
             #include "Visualization/VisualizationZoneWidget.h"
             #include <Variable/Variable.h>
             #include <QMenu>
             #include <QStack>
             Q_LOGGING_CATEGORY(LOG_GenerateVariableMenuOperation, "GenerateVariableMenuOperation")
             struct GenerateVariableMenuOperation::GenerateVariableMenuOperationPrivate {
                 explicit GenerateVariableMenuOperationPrivate(QMenu *menu, std::shared_ptr<Variable> variable)
                         : m_Variable{variable}, m_PlotMenuBuilder{menu}, m_UnplotMenuBuilder{menu}
                 {
                 }
                 void visitRootEnter()
                 {
                     // Creates the root menu
-                    m_PlotMenuBuilder.addMenu(QObject::tr("Plot"), QIcon{":/icones/plot.png"});
+                    if (auto plotMenu
+                        = m_PlotMenuBuilder.addMenu(QObject::tr("Plot"), QIcon{":/icones/plot.png"})) {
+                        plotMenu->setEnabled(m_Variable && m_Variable->dataSeries() != nullptr);
+                    }
                     m_UnplotMenuBuilder.addMenu(QObject::tr("Unplot"), QIcon{":/icones/unplot.png"});
                 }
                 void visitRootLeave()
                 {
                     // Closes the root menu
                     m_PlotMenuBuilder.closeMenu();
                     m_UnplotMenuBuilder.closeMenu();
                 }
                 void visitNodeEnter(const IVisualizationWidget &container)
                 {
                     // Opens a new menu associated to the node
                     m_PlotMenuBuilder.addMenu(container.name());
                     m_UnplotMenuBuilder.addMenu(container.name());
                 }
                 template <typename ActionFun>
                 void visitNodeLeavePlot(const IVisualizationWidget &container, const QString &actionName,
                                         ActionFun actionFunction)
                 {
                     if (m_Variable && container.canDrop(*m_Variable)) {
                         m_PlotMenuBuilder.addSeparator();
                         m_PlotMenuBuilder.addAction(actionName, actionFunction);
                     }
                     // Closes the menu associated to the node
                     m_PlotMenuBuilder.closeMenu();
                 }
                 void visitNodeLeaveUnplot()
                 {
                     // Closes the menu associated to the node
                     m_UnplotMenuBuilder.closeMenu();
                 }
                 template <typename ActionFun>
                 void visitLeafPlot(const IVisualizationWidget &container, const QString &actionName,
                                    ActionFun actionFunction)
                 {
                     if (m_Variable && container.canDrop(*m_Variable)) {
                         m_PlotMenuBuilder.addAction(actionName, actionFunction);
                     }
                 }
                 template <typename ActionFun>
                 void visitLeafUnplot(const IVisualizationWidget &container, const QString &actionName,
                                      ActionFun actionFunction)
                 {
                     if (m_Variable && container.contains(*m_Variable)) {
                         m_UnplotMenuBuilder.addAction(actionName, actionFunction);
                     }
                 }
                 std::shared_ptr<Variable> m_Variable;
                 MenuBuilder m_PlotMenuBuilder;   ///< Builder for the 'Plot' menu
                 MenuBuilder m_UnplotMenuBuilder; ///< Builder for the 'Unplot' menu
             };
             GenerateVariableMenuOperation::GenerateVariableMenuOperation(QMenu *menu,
                                                                          std::shared_ptr<Variable> variable)
                     : impl{spimpl::make_unique_impl<GenerateVariableMenuOperationPrivate>(menu, variable)}
             {
             }
             void GenerateVariableMenuOperation::visitEnter(VisualizationWidget *widget)
             {
                 // VisualizationWidget is not intended to accommodate a variable
                 Q_UNUSED(widget)
                 // 'Plot' and 'Unplot' menus
                 impl->visitRootEnter();
             }
             void GenerateVariableMenuOperation::visitLeave(VisualizationWidget *widget)
             {
                 // VisualizationWidget is not intended to accommodate a variable
                 Q_UNUSED(widget)
                 // 'Plot' and 'Unplot' menus
                 impl->visitRootLeave();
             }
             void GenerateVariableMenuOperation::visitEnter(VisualizationTabWidget *tabWidget)
             {
                 if (tabWidget) {
                     // 'Plot' and 'Unplot' menus
                     impl->visitNodeEnter(*tabWidget);
                 }
                 else {
                     qCCritical(LOG_GenerateVariableMenuOperation(),
                                "Can't visit enter VisualizationTabWidget : the widget is null");
                 }
             }
             void GenerateVariableMenuOperation::visitLeave(VisualizationTabWidget *tabWidget)
             {
                 if (tabWidget) {
                     // 'Plot' menu
                     impl->visitNodeLeavePlot(*tabWidget, QObject::tr("Open in a new zone"),
                                              [ varW = std::weak_ptr<Variable>{impl->m_Variable}, tabWidget ]() {
                                                  if (auto var = varW.lock()) {
                                                      tabWidget->createZone(var);
                                                  }
                                              });
                     // 'Unplot' menu
                     impl->visitNodeLeaveUnplot();
                 }
                 else {
                     qCCritical(LOG_GenerateVariableMenuOperation(),
                                "Can't visit leave VisualizationTabWidget : the widget is null");
                 }
             }
             void GenerateVariableMenuOperation::visitEnter(VisualizationZoneWidget *zoneWidget)
             {
                 if (zoneWidget) {
                     // 'Plot' and 'Unplot' menus
                     impl->visitNodeEnter(*zoneWidget);
                 }
                 else {
                     qCCritical(LOG_GenerateVariableMenuOperation(),
                                "Can't visit enter VisualizationZoneWidget : the widget is null");
                 }
             }
             void GenerateVariableMenuOperation::visitLeave(VisualizationZoneWidget *zoneWidget)
             {
                 if (zoneWidget) {
                     // 'Plot' menu
                     impl->visitNodeLeavePlot(
                         *zoneWidget, QObject::tr("Open in a new graph"),
                         [ varW = std::weak_ptr<Variable>{impl->m_Variable}, zoneWidget ]() {
                             if (auto var = varW.lock()) {
                                 zoneWidget->createGraph(var);
                             }
                         });
                     // 'Unplot' menu
                     impl->visitNodeLeaveUnplot();
                 }
                 else {
                     qCCritical(LOG_GenerateVariableMenuOperation(),
                                "Can't visit leave VisualizationZoneWidget : the widget is null");
                 }
             }
             void GenerateVariableMenuOperation::visit(VisualizationGraphWidget *graphWidget)
             {
                 if (graphWidget) {
                     // 'Plot' menu
                     impl->visitLeafPlot(*graphWidget, QObject::tr("Open in %1").arg(graphWidget->name()),
                                         [ varW = std::weak_ptr<Variable>{impl->m_Variable}, graphWidget ]() {
                                             if (auto var = varW.lock()) {
                                                 graphWidget->addVariableUsingGraph(var);
                                             }
                                         });
                     // 'Unplot' menu
                     impl->visitLeafUnplot(*graphWidget, QObject::tr("Remove from %1").arg(graphWidget->name()),
                                           [ varW = std::weak_ptr<Variable>{impl->m_Variable}, graphWidget ]() {
                                               if (auto var = varW.lock()) {
                                                   graphWidget->removeVariable(var);
                                               }
                                           });
                 }
                 else {
                     qCCritical(LOG_GenerateVariableMenuOperation(),
                                "Can't visit VisualizationGraphWidget : the widget is null");
                 }
             }

gui/src/Visualization/operations/MenuBuilder.cpp +5 -2

             #include "Visualization/operations/MenuBuilder.h"
             Q_LOGGING_CATEGORY(LOG_MenuBuilder, "MenuBuilder")
             MenuBuilder::MenuBuilder(QMenu *menu)
             {
                 if (menu) {
                     m_Menus.push(menu);
                 }
                 else {
                     qCCritical(LOG_MenuBuilder()) << QObject::tr("No parent menu has been defined");
                 }
             }
-            void MenuBuilder::addMenu(const QString &name, const QIcon &icon)
+            QMenu *MenuBuilder::addMenu(const QString &name, const QIcon &icon)
             {
                 if (auto currMenu = currentMenu()) {
-                    m_Menus.push(currMenu->addMenu(icon, name));
+                    auto menu = currMenu->addMenu(icon, name);
+                    m_Menus.push(menu);
+                    return menu;
                 }
                 else {
                     qCCritical(LOG_MenuBuilder()) << QObject::tr("No current menu to attach the new menu");
+                    return nullptr;
                 }
             }
             void MenuBuilder::addSeparator()
             {
                 if (auto currMenu = currentMenu()) {
                     if (!currMenu->isEmpty()) {
                         currMenu->addSeparator();
                     }
                 }
                 else {
                     qCCritical(LOG_MenuBuilder()) << QObject::tr("No current menu to attach the separator");
                 }
             }
             void MenuBuilder::closeMenu()
             {
                 if (!m_Menus.isEmpty()) {
                     if (auto closedMenu = m_Menus.pop()) {
                         // Purge menu : if the closed menu has no entries, we remove it from its parent (the
                         // current menu)
                         if (auto currMenu = currentMenu()) {
                             if (closedMenu->isEmpty()) {
                                 currMenu->removeAction(closedMenu->menuAction());
                             }
                         }
                     }
                 }
             }
             QMenu *MenuBuilder::currentMenu() const
             {
                 return !m_Menus.isEmpty() ? m_Menus.top() : nullptr;
             }

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

             #ifndef SCIQLOP_AMDAPROVIDER_H
             #define SCIQLOP_AMDAPROVIDER_H
             #include "AmdaGlobal.h"
-            #include <Common/spimpl.h>
             #include <Data/IDataProvider.h>
             #include <QLoggingCategory>
             Q_DECLARE_LOGGING_CATEGORY(LOG_AmdaProvider)
             class QNetworkReply;
             /**
              * @brief The AmdaProvider class is an example of how a data provider can generate data
              */
             class SCIQLOP_AMDA_EXPORT AmdaProvider : public IDataProvider {
             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, const QVariantHash &data);
-                class AmdaProviderPrivate;
-                spimpl::unique_impl_ptr<AmdaProviderPrivate> impl;
-                // private slots:
-                //    void httpFinished(QNetworkReply *reply, QUuid dataId) noexcept;
-                //    void httpDownloadFinished(QNetworkReply *reply, QUuid dataId) noexcept;
-                //    void httpDownloadReadyRead(QNetworkReply *reply, QUuid dataId) noexcept;
             };
             #endif // SCIQLOP_AMDAPROVIDER_H

plugins/amda/src/AmdaParser.cpp +6 -10

             #include "AmdaParser.h"
+            #include "AmdaDefs.h"
             #include <DataSource/DataSourceItem.h>
             #include <QFile>
             #include <QJsonArray>
             #include <QJsonDocument>
             #include <QJsonObject>
             Q_LOGGING_CATEGORY(LOG_AmdaParser, "AmdaParser")
             namespace {
-            // Significant keys of an AMDA's JSON file
-            const auto COMPONENT_KEY = QStringLiteral("component");
-            const auto PRODUCT_KEY = QStringLiteral("parameter");
-            const auto ROOT_KEY = QStringLiteral("dataCenter");
             /// Returns the correct item type according to the key passed in parameter
             DataSourceItemType itemType(const QString &key) noexcept
             {
-                if (key == PRODUCT_KEY) {
+                if (key == AMDA_PRODUCT_KEY) {
                     return DataSourceItemType::PRODUCT;
                 }
-                else if (key == COMPONENT_KEY) {
+                else if (key == AMDA_COMPONENT_KEY) {
                     return DataSourceItemType::COMPONENT;
                 }
                 else {
                     return DataSourceItemType::NODE;
                 }
             }
             /**
              * Processes an entry of the JSON file to populate/create data source items
              * @param jsonKey the entry's key
              * @param jsonValue the entry's value
              * @param item the current item for which the entry processing will be applied
              * @param appendData flag indicating that the entry is part of an array. In the case of an array of
              * values, each value will be concatenated to the others (rather than replacing the others)
              */
             void parseEntry(const QString &jsonKey, const QJsonValue &jsonValue, DataSourceItem &item,
                             bool isArrayEntry = false)
             {
                 if (jsonValue.isObject()) {
                     // Case of an object:
                     // - a new data source item is created and
                     // - parsing is called recursively to process the new item
                     // - the new item is then added as a child of the former item
                     auto object = jsonValue.toObject();
                     auto newItem = std::make_unique<DataSourceItem>(itemType(jsonKey));
                     for (auto it = object.constBegin(), end = object.constEnd(); it != end; ++it) {
                         parseEntry(it.key(), it.value(), *newItem);
                     }
                     item.appendChild(std::move(newItem));
                 }
                 else if (jsonValue.isArray()) {
                     // Case of an array: the item is populated with the arrays' content
                     auto object = jsonValue.toArray();
                     for (auto it = object.constBegin(), end = object.constEnd(); it != end; ++it) {
                         parseEntry(jsonKey, *it, item, true);
                     }
                 }
                 else {
                     // Case of a simple value: we add a data to the item. If the simple value is a part of an
                     // array, it is concatenated to the values already existing for this key
                     item.setData(jsonKey, jsonValue.toVariant(), isArrayEntry);
                 }
             }
             } // namespace
             std::unique_ptr<DataSourceItem> AmdaParser::readJson(const QString &filePath) noexcept
             {
                 QFile jsonFile{filePath};
                 if (!jsonFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
                     qCCritical(LOG_AmdaParser())
                         << QObject::tr("Can't retrieve data source tree from file %1: %2")
                                .arg(filePath, jsonFile.errorString());
                     return nullptr;
                 }
                 auto json = jsonFile.readAll();
                 auto jsonDocument = QJsonDocument::fromJson(json);
                 // Check preconditions for parsing
                 if (!jsonDocument.isObject()) {
                     qCCritical(LOG_AmdaParser())
                         << QObject::tr(
                                "Can't retrieve data source tree from file %1: the file is malformed (there is "
                                "not one and only one root object)")
                                .arg(filePath);
                     return nullptr;
                 }
                 auto jsonDocumentObject = jsonDocument.object();
-                if (!jsonDocumentObject.contains(ROOT_KEY)) {
+                if (!jsonDocumentObject.contains(AMDA_ROOT_KEY)) {
                     qCCritical(LOG_AmdaParser())
                         << QObject::tr(
                                "Can't retrieve data source tree from file %1: the file is malformed (the key "
                                "for the root element was not found (%2))")
-                               .arg(filePath, ROOT_KEY);
+                               .arg(filePath, AMDA_ROOT_KEY);
                     return nullptr;
                 }
-                auto rootValue = jsonDocumentObject.value(ROOT_KEY);
+                auto rootValue = jsonDocumentObject.value(AMDA_ROOT_KEY);
                 if (!rootValue.isObject()) {
                     qCCritical(LOG_AmdaParser())
                         << QObject::tr(
                                "Can't retrieve data source tree from file %1: the file is malformed (the root "
                                "element is of the wrong type)")
                                .arg(filePath);
                     return nullptr;
                 }
                 // Makes the parsing
                 auto rootObject = rootValue.toObject();
                 auto rootItem = std::make_unique<DataSourceItem>(DataSourceItemType::NODE);
                 for (auto it = rootObject.constBegin(), end = rootObject.constEnd(); it != end; ++it) {
                     parseEntry(it.key(), it.value(), *rootItem);
                 }
                 return rootItem;
             }

plugins/amda/src/AmdaPlugin.cpp +21 -6

             #include "AmdaPlugin.h"
+            #include "AmdaDefs.h"
             #include "AmdaParser.h"
             #include "AmdaProvider.h"
             #include <DataSource/DataSourceController.h>
             #include <DataSource/DataSourceItem.h>
             #include <DataSource/DataSourceItemAction.h>
             #include <SqpApplication.h>
             Q_LOGGING_CATEGORY(LOG_AmdaPlugin, "AmdaPlugin")
             namespace {
             /// Name of the data source
             const auto DATA_SOURCE_NAME = QStringLiteral("AMDA");
             /// Path of the file used to generate the data source item for AMDA
             const auto JSON_FILE_PATH = QStringLiteral(":/samples/AmdaSample.json");
             void associateActions(DataSourceItem &item, const QUuid &dataSourceUid)
             {
-                if (item.type() == DataSourceItemType::PRODUCT) {
+                auto addLoadAction = [&item, dataSourceUid](const QString &label) {
-                    auto itemName = item.name();
+                    item.addAction(
+                        std::make_unique<DataSourceItemAction>(label, [dataSourceUid](DataSourceItem &item) {
-                    item.addAction(std::make_unique<DataSourceItemAction>(
-                        QObject::tr("Load %1 product").arg(itemName),
-                        [itemName, dataSourceUid](DataSourceItem &item) {
                             if (auto app = sqpApp) {
                                 app->dataSourceController().loadProductItem(dataSourceUid, item);
                             }
                         }));
+                };
+                const auto itemType = item.type();
+                if (itemType == DataSourceItemType::PRODUCT) {
+                    /// @todo : As for the moment we do not manage the loading of vectors, in the case of a
+                    /// parameter, we update the identifier of download of the data:
+                    /// - if the parameter has no component, the identifier remains the same
+                    /// - if the parameter has at least one component, the identifier is that of the first
+                    /// component (for example, "imf" becomes "imf (0)")
+                    if (item.childCount() != 0) {
+                        item.setData(AMDA_XML_ID_KEY, item.child(0)->data(AMDA_XML_ID_KEY));
+                    }
+                    addLoadAction(QObject::tr("Load %1 product").arg(item.name()));
+                }
+                else if (itemType == DataSourceItemType::COMPONENT) {
+                    addLoadAction(QObject::tr("Load %1 component").arg(item.name()));
                 }
                 auto count = item.childCount();
                 for (auto i = 0; i < count; ++i) {
                     if (auto child = item.child(i)) {
                         associateActions(*child, dataSourceUid);
                     }
                 }
             }
             } // namespace
             void AmdaPlugin::initialize()
             {
                 if (auto app = sqpApp) {
                     // Registers to the data source controller
                     auto &dataSourceController = app->dataSourceController();
                     auto dataSourceUid = dataSourceController.registerDataSource(DATA_SOURCE_NAME);
                     // Sets data source tree
                     if (auto dataSourceItem = AmdaParser::readJson(JSON_FILE_PATH)) {
                         associateActions(*dataSourceItem, dataSourceUid);
                         dataSourceController.setDataSourceItem(dataSourceUid, std::move(dataSourceItem));
                     }
                     else {
                         qCCritical(LOG_AmdaPlugin()) << tr("No data source item could be generated for AMDA");
                     }
                     // Sets data provider
                     dataSourceController.setDataProvider(dataSourceUid, std::make_unique<AmdaProvider>());
                 }
                 else {
                     qCWarning(LOG_AmdaPlugin()) << tr("Can't access to SciQlop application");
                 }
             }

plugins/amda/src/AmdaProvider.cpp +46 -45

             #include "AmdaProvider.h"
+            #include "AmdaDefs.h"
             #include "AmdaResultParser.h"
             #include <Data/DataProviderParameters.h>
             #include <Network/NetworkController.h>
             #include <SqpApplication.h>
             #include <Variable/Variable.h>
             #include <QNetworkAccessManager>
             #include <QNetworkReply>
             #include <QTemporaryFile>
             #include <QThread>
             Q_LOGGING_CATEGORY(LOG_AmdaProvider, "AmdaProvider")
             namespace {
             /// URL format for a request on AMDA server. The parameters are as follows:
             /// - %1: start date
             /// - %2: end date
             /// - %3: parameter id
             const auto AMDA_URL_FORMAT = QStringLiteral(
                 "http://amda.irap.omp.eu/php/rest/"
                 "getParameter.php?startTime=%1&stopTime=%2&parameterID=%3&sampling=60&outputFormat=ASCII&"
                 "timeFormat=ISO8601&gzip=0");
             /// Dates format passed in the URL (e.g 2013-09-23T09:00)
             const auto AMDA_TIME_FORMAT = QStringLiteral("yyyy-MM-ddThh:ss");
             /// Formats a time to a date that can be passed in URL
             QString dateFormat(double sqpDateTime) noexcept
             {
                 auto dateTime = QDateTime::fromMSecsSinceEpoch(sqpDateTime * 1000.);
                 return dateTime.toString(AMDA_TIME_FORMAT);
             }
             } // namespace
-            struct AmdaProvider::AmdaProviderPrivate {
+            AmdaProvider::AmdaProvider()
-                DataProviderParameters m_Params{};
-                std::unique_ptr<QNetworkAccessManager> m_AccessManager{nullptr};
-                QNetworkReply *m_Reply{nullptr};
-                //    std::unique_ptr<QTemporaryFile> m_File{nullptr};
-                QUuid m_Token;
-            };
-            AmdaProvider::AmdaProvider() : impl{spimpl::make_unique_impl<AmdaProviderPrivate>()}
             {
                 qCDebug(LOG_NetworkController()) << tr("AmdaProvider::AmdaProvider")
                                                  << QThread::currentThread();
                 if (auto app = sqpApp) {
                     auto &networkController = app->networkController();
-                    connect(this, &AmdaProvider::requestConstructed, &networkController,
+                    connect(this, SIGNAL(requestConstructed(QNetworkRequest, QUuid,
-                            &NetworkController::onProcessRequested);
+                                                            std::function<void(QNetworkReply *, QUuid)>)),
+                            &networkController,
+                            SLOT(onProcessRequested(QNetworkRequest, QUuid,
+                                                    std::function<void(QNetworkReply *, QUuid)>)));
                 }
             }
-            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});
+                const auto data = parameters.m_Data;
+                for (const auto &dateTime : qAsConst(times)) {
+                    retrieveData(token, dateTime, data);
                 }
             }
-            void AmdaProvider::retrieveData(QUuid token, const DataProviderParameters &parameters)
+            void AmdaProvider::retrieveData(QUuid token, const SqpDateTime &dateTime, const QVariantHash &data)
             {
+                // Retrieves product ID from data: if the value is invalid, no request is made
+                auto productId = data.value(AMDA_XML_ID_KEY).toString();
+                if (productId.isNull()) {
+                    qCCritical(LOG_AmdaProvider()) << tr("Can't retrieve data: unknown product id");
+                    return;
+                }
                 // /////////// //
                 // 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)};
                 auto tempFile = std::make_shared<QTemporaryFile>();
                 // LAMBDA
-                auto httpDownloadFinished = [this, tempFile](QNetworkReply *reply, QUuid dataId) noexcept {
+                auto httpDownloadFinished
+                    = [this, dateTime, tempFile, token](QNetworkReply *reply, QUuid dataId) noexcept {
-                    if (tempFile) {
+                          Q_UNUSED(dataId);
-                        auto replyReadAll = reply->readAll();
-                        if (!replyReadAll.isEmpty()) {
+                          if (tempFile) {
-                            tempFile->write(replyReadAll);
+                              auto replyReadAll = reply->readAll();
+                              if (!replyReadAll.isEmpty()) {
-                        tempFile->close();
+                                  tempFile->write(replyReadAll);
+                              }
-                        // Parse results file
+                              tempFile->close();
-                        if (auto dataSeries = AmdaResultParser::readTxt(tempFile->fileName())) {
-                            emit dataProvided(impl->m_Token, dataSeries, impl->m_Params.m_Time);
+                              // Parse results file
+                              if (auto dataSeries = AmdaResultParser::readTxt(tempFile->fileName())) {
-                        else {
+                                  emit dataProvided(token, dataSeries, dateTime);
-                            /// @todo ALX : debug
+                              else {
+                                  /// @todo ALX : debug
+                              }
-                    // Deletes reply
-                    reply->deleteLater();
-                    reply = nullptr;
+                          // Deletes reply
-                };
+                          reply->deleteLater();
+                          reply = nullptr;
+                      };
                 auto httpFinishedLambda = [this, httpDownloadFinished, tempFile](QNetworkReply *reply,
                                                                                  QUuid dataId) noexcept {
                     auto downloadFileUrl = QUrl{QString{reply->readAll()}};
                     // Deletes old reply
                     reply->deleteLater();
                     // Executes request for downloading file //
                     // Creates destination file
                     if (tempFile->open()) {
                         // Executes request
                         emit requestConstructed(QNetworkRequest{downloadFileUrl}, dataId, httpDownloadFinished);
                     }
                 };
                 // //////////////// //
                 // Executes request //
                 // //////////////// //
-                impl->m_Token = token;
-                impl->m_Params = parameters;
                 emit requestConstructed(QNetworkRequest{url}, token, httpFinishedLambda);
             }

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

             #ifndef SCIQLOP_COSINUSPROVIDER_H
             #define SCIQLOP_COSINUSPROVIDER_H
             #include "MockPluginGlobal.h"
             #include <Data/IDataProvider.h>
             #include <QLoggingCategory>
             Q_DECLARE_LOGGING_CATEGORY(LOG_CosinusProvider)
             /**
              * @brief The CosinusProvider class is an example of how a data provider can generate data
              */
             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

             #include "CosinusProvider.h"
             #include <Data/DataProviderParameters.h>
             #include <Data/ScalarSeries.h>
             #include <cmath>
             #include <QDateTime>
             #include <QThread>
             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
                 double freq = 100.0;
                 double start = dateTime.m_TStart * freq; // 100 htz
                 double end = dateTime.m_TEnd * freq;     // 100 htz
                 // We assure that timerange is valid
                 if (end < start) {
                     std::swap(start, end);
                 }
                 // Generates scalar series containing cosinus values (one value per second)
                 auto scalarSeries
                     = std::make_shared<ScalarSeries>(end - start, Unit{QStringLiteral("t"), true}, Unit{});
                 for (auto time = start; time < end; ++time, ++dataIndex) {
                     const auto timeOnFreq = time / freq;
                     scalarSeries->setData(dataIndex, timeOnFreq, std::cos(timeOnFreq));
                 }
                 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