GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r410:af1b645db780

Updates variable creation to pass metadata...

Alexandre Leroux -

r410:af1b645db780

parent child

Context file:

r410:af1b645db780

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

                 /**
                  * 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:

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

                 /**
                  * 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);

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

                  * 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

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

                     auto dataProvider = (it != impl->m_DataProviders.end()) ? it->second : nullptr;
                     /// @todo retrieve timerange, and pass it to the signal
-                    emit variableCreationRequested(productItem.name(), dataProvider);
+                    emit variableCreationRequested(productItem.name(), productItem.data(), dataProvider);
                 }
                 else {
                     qCWarning(LOG_DataSourceController()) << tr("Can't load an item that is not a product");

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

                 }
             }
-            void VariableController::createVariable(const QString &name,
+            void VariableController::createVariable(const QString &name, const QVariantHash &metadata,
                                                     std::shared_ptr<IDataProvider> provider) noexcept
             {
                 /// - 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

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

             }
             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);
-                auto variable = std::make_shared<Variable>(name, dateTime);
+                auto variable = std::make_shared<Variable>(name, dateTime, metadata);
                 impl->m_Variables.push_back(variable);
                 connect(variable.get(), &Variable::updated, this, &VariableModel::onVariableUpdated);

gui/src/SqpApplication.cpp +4 -2

                     // 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(),

General Comments 0

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

No TODOs yet

	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