GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1287:74e2e6e57838

Use correct product ID when creating an event

trabillard -

r1287:74e2e6e57838

parent child

Context file:

r1287:74e2e6e57838

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

                 static const QString NAME_DATA_KEY;
                 /// Key associated with the plugin of the item
                 static const QString PLUGIN_DATA_KEY;
+                /// Key associated with a unique id of the plugin
+                static const QString ID_DATA_KEY;
                 explicit DataSourceItem(DataSourceItemType type, const QString &name);
                 explicit DataSourceItem(DataSourceItemType type, QVariantHash data = {});

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

             const QString DataSourceItem::NAME_DATA_KEY = QStringLiteral("name");
             const QString DataSourceItem::PLUGIN_DATA_KEY = QStringLiteral("plugin");
+            const QString DataSourceItem::ID_DATA_KEY = QStringLiteral("uuid");
             struct DataSourceItem::DataSourceItemPrivate {
                 explicit DataSourceItemPrivate(DataSourceItemType type, QVariantHash data)

gui/src/Catalogue/CatalogueActionManager.cpp +3 -1

             #include <Actions/ActionsGuiController.h>
             #include <Catalogue/CatalogueController.h>
+            #include <DataSource/DataSourceItem.h>
             #include <SqpApplication.h>
             #include <Variable/Variable.h>
             #include <Visualization/VisualizationGraphWidget.h>
                             eventProduct->setTStart(zoneRange.m_TStart);
                             eventProduct->setTEnd(zoneRange.m_TEnd);
-                            eventProduct->setProductId(var->metadata().value("id", "TODO").toString()); // todo
+                            eventProduct->setProductId(
+                                var->metadata().value(DataSourceItem::ID_DATA_KEY, "UnknownID").toString());
                             productList.push_back(*eventProduct);
                         }

plugins/amda/src/AmdaPlugin.cpp +1 0

                     auto actionLabel = QObject::tr(
                         itemType == DataSourceItemType::PRODUCT ? "Load %1 product" : "Load %1 component");
                     addLoadAction(actionLabel.arg(item.name()));
+                    item.setData(DataSourceItem::ID_DATA_KEY, item.data(AMDA_XML_ID_KEY));
                 }
                 auto count = item.childCount();

plugins/mockplugin/src/MockPlugin.cpp +1 0

                 // Adds plugin name to product metadata
                 result->setData(DataSourceItem::PLUGIN_DATA_KEY, DATA_SOURCE_NAME);
+                result->setData(DataSourceItem::ID_DATA_KEY, data.value(DataSourceItem::NAME_DATA_KEY));
                 auto productName = data.value(DataSourceItem::NAME_DATA_KEY).toString();

General Comments 3

perrinel

|

Auto status change to "Under Review"

perrinel

|

Status change > Approved

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

	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