From 958cef2901c0804c6b97b4e3e1694f0e7e396c13 2017-09-28 09:12:18 From: Alexandre Leroux Date: 2017-09-28 09:12:18 Subject: [PATCH] Changes plugin products to integrate parametric frequencies --- diff --git a/plugins/mockplugin/src/MockPlugin.cpp b/plugins/mockplugin/src/MockPlugin.cpp index 916c3f1..a36ac23 100644 --- a/plugins/mockplugin/src/MockPlugin.cpp +++ b/plugins/mockplugin/src/MockPlugin.cpp @@ -45,8 +45,18 @@ std::unique_ptr createDataSourceItem(const QUuid &dataSourceUid) // Magnetic field products auto magneticFieldFolder = std::make_unique(DataSourceItemType::NODE, QStringLiteral("Magnetic field")); - magneticFieldFolder->appendChild(createProductItem(QStringLiteral("FGM"), dataSourceUid)); - magneticFieldFolder->appendChild(createProductItem(QStringLiteral("SC"), dataSourceUid)); + magneticFieldFolder->appendChild( + createProductItem({{DataSourceItem::NAME_DATA_KEY, QStringLiteral("Scalar 10 Hz")}, + {COSINUS_FREQUENCY_KEY, 10.}}, + dataSourceUid)); + magneticFieldFolder->appendChild( + createProductItem({{DataSourceItem::NAME_DATA_KEY, QStringLiteral("Scalar 60 Hz")}, + {COSINUS_FREQUENCY_KEY, 60.}}, + dataSourceUid)); + magneticFieldFolder->appendChild( + createProductItem({{DataSourceItem::NAME_DATA_KEY, QStringLiteral("Scalar 100 Hz")}, + {COSINUS_FREQUENCY_KEY, 100.}}, + dataSourceUid)); // Electric field products auto electricFieldFolder = std::make_unique(DataSourceItemType::NODE, diff --git a/plugins/mockplugin/tests/TestCosinusAcquisition.cpp b/plugins/mockplugin/tests/TestCosinusAcquisition.cpp index c178b92..472a671 100644 --- a/plugins/mockplugin/tests/TestCosinusAcquisition.cpp +++ b/plugins/mockplugin/tests/TestCosinusAcquisition.cpp @@ -1,4 +1,5 @@ #include "CosinusProvider.h" +#include "MockDefs.h" #include #include @@ -158,7 +159,8 @@ void TestCosinusAcquisition::testAcquisition() QFETCH(SqpRange, initialRange); sqpApp->timeController().onTimeToUpdate(initialRange); auto provider = std::make_shared(); - auto variable = sqpApp->variableController().createVariable("MMS", {}, provider); + auto variable = sqpApp->variableController().createVariable( + "MMS", {{COSINUS_TYPE_KEY, "scalar"}, {COSINUS_FREQUENCY_KEY, 100.}}, provider); QTest::qWait(OPERATION_DELAY); validateVariable(variable, initialRange);