HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r410:af1b645db780

0

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:

0

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

0

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,
-                                                          const SqpDateTime &dateTime) noexcept;
+                 std::shared_ptr<Variable> createVariable(const QString &name, const SqpDateTime &dateTime,
+                                                          const QVariantHash &metadata) noexcept;
                  /**
                   * Deletes a variable from the model, if it exists

0

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");

0

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

0

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

0

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

	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