HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r552:780b372cbdd1

Merge branch 'feature/VariableColumns' into develop

Alexandre Leroux -

r552:780b372cbdd1

parent child

Context file:

r552:780b372cbdd1

Collapse all files

core/include/DataSource/DataSourceItem.h +6 0

                  DataSourceItem *parentItem() const noexcept;
                  /**
+                  * Gets the item's root
+                  * @return the top parent, the item itself if it's the root item
+                  */
+                 const DataSourceItem &rootItem() const noexcept;
+                 /**
                   * Sets or appends a value to a key
                   * @param key the key
                   * @param value the value

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

              Q_LOGGING_CATEGORY(LOG_DataSourceController, "DataSourceController")
+             namespace {
+             /**
+              * Builds the metadata of the variable that will be generated from the loading of an item
+              * @param dataSourceItem the data source item from which to generate the metadata
+              * @return the metadata of the variable
+              */
+             QVariantHash variableMetadata(const DataSourceItem &dataSourceItem)
+             {
+                 // Variable metadata contains...
+                 // ... all metadata of the item
+                 auto result = dataSourceItem.data();
+                 // ... and the name of the plugin, recovered from root item
+                 result.insert(QStringLiteral("plugin"), dataSourceItem.rootItem().name());
+                 return result;
+             }
+             } // namespace
              class DataSourceController::DataSourceControllerPrivate {
              public:
                  QMutex m_WorkingMutex;
                      auto it = impl->m_DataProviders.find(dataSourceUid);
                      auto dataProvider = (it != impl->m_DataProviders.end()) ? it->second : nullptr;
-                     emit variableCreationRequested(productItem.name(), productItem.data(), dataProvider);
+                     emit variableCreationRequested(productItem.name(), variableMetadata(productItem),
+                                                    dataProvider);
                  }
                  else {
                      qCWarning(LOG_DataSourceController()) << tr("Can't load an item that is not a product");

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

                  return impl->m_Parent;
              }
+             const DataSourceItem &DataSourceItem::rootItem() const noexcept
+             {
+                 return isRoot() ? *this : parentItem()->rootItem();
+             }
              void DataSourceItem::setData(const QString &key, const QVariant &value, bool append) noexcept
              {
                  auto it = impl->m_Data.constFind(key);

core/src/Variable/VariableModel.cpp +14 -5

              const auto NAME_COLUMN = 0;
              const auto TSTART_COLUMN = 1;
              const auto TEND_COLUMN = 2;
-             const auto NB_COLUMNS = 3;
+             const auto UNIT_COLUMN = 3;
+             const auto MISSION_COLUMN = 4;
+             const auto PLUGIN_COLUMN = 5;
+             const auto NB_COLUMNS = 6;
              // Column properties
              const auto DEFAULT_HEIGHT = 25;
                  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}}};
+             const auto COLUMN_PROPERTIES = QHash<int, ColumnProperties>{
+                 {NAME_COLUMN, {QObject::tr("Name")}},       {TSTART_COLUMN, {QObject::tr("tStart"), 180}},
+                 {TEND_COLUMN, {QObject::tr("tEnd"), 180}},  {UNIT_COLUMN, {QObject::tr("Unit")}},
+                 {MISSION_COLUMN, {QObject::tr("Mission")}}, {PLUGIN_COLUMN, {QObject::tr("Plugin")}}};
              /// Format for datetimes
              const auto DATETIME_FORMAT = QStringLiteral("dd/MM/yyyy \nhh:mm:ss:zzz");
                                  return dateTimeVariant(variable->range().m_TStart);
                              case TEND_COLUMN:
                                  return dateTimeVariant(variable->range().m_TEnd);
+                             case UNIT_COLUMN:
+                                 return variable->metadata().value(QStringLiteral("units"));
+                             case MISSION_COLUMN:
+                                 return variable->metadata().value(QStringLiteral("mission"));
+                             case PLUGIN_COLUMN:
+                                 return variable->metadata().value(QStringLiteral("plugin"));
                              default:
                                  // No action
                                  break;

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