GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r780:b0b8b5ec2893

Handles parametric frequency

Alexandre Leroux -

r780:b0b8b5ec2893

parent child

Context file:

r780:b0b8b5ec2893

Collapse all files

plugins/mockplugin/include/MockDefs.h created 644 +23 0

@@ -0,0 +1,23
	1	#ifndef SCIQLOP_MOCKDEFS_H
	2	#define SCIQLOP_MOCKDEFS_H
	3
	4	#include "MockPluginGlobal.h"
	5
	6	#include <QString>
	7	#include <QVariant>
	8
	9	// ////////////// //
	10	// Mock constants //
	11	// ////////////// //
	12
	13	// Metadata for cosinus provider //
	14
	15	/// Cosinus frequency (Hz)
	16	extern SCIQLOP_MOCKPLUGIN_EXPORT const QString COSINUS_FREQUENCY_KEY;
	17	extern SCIQLOP_MOCKPLUGIN_EXPORT const QVariant COSINUS_FREQUENCY_DEFAULT_VALUE;
	18
	19	/// Cosinus type ("scalar" or "vector")
	20	extern SCIQLOP_MOCKPLUGIN_EXPORT const QString COSINUS_TYPE_KEY;
	21	extern SCIQLOP_MOCKPLUGIN_EXPORT const QVariant COSINUS_TYPE_DEFAULT_VALUE;
	22
	23	#endif // SCIQLOP_MOCKDEFS_H

plugins/mockplugin/src/MockDefs.cpp created 644 +7 0

@@ -0,0 +1,7
	1	#include "MockDefs.h"
	2
	3	const QString COSINUS_FREQUENCY_KEY = QStringLiteral("cosinusFrequency");
	4	const QVariant COSINUS_FREQUENCY_DEFAULT_VALUE = 60.;
	5
	6	const QString COSINUS_TYPE_KEY = QStringLiteral("cosinusType");
	7	const QVariant COSINUS_TYPE_DEFAULT_VALUE = QStringLiteral("scalar");

plugins/mockplugin/src/CosinusProvider.cpp +11 -3

             #include "CosinusProvider.h"
+            #include "MockDefs.h"
             #include <Data/DataProviderParameters.h>
             #include <Data/ScalarSeries.h>
             #include <cmath>
             #include <QFuture>
             #include <QThread>
             #include <QtConcurrent/QtConcurrent>
             Q_LOGGING_CATEGORY(LOG_CosinusProvider, "CosinusProvider")
             std::shared_ptr<IDataProvider> CosinusProvider::clone() const
             {
                 // No copy is made in clone
                 return std::make_shared<CosinusProvider>();
             }
             std::shared_ptr<IDataSeries> CosinusProvider::retrieveData(QUuid acqIdentifier,
                                                                        const SqpRange &dataRangeRequested,
                                                                        const QVariantHash &data)
             {
                 // TODO: Add Mutex
                 auto dataIndex = 0;
+                // Retrieves frequency
+                auto freqVariant = data.value(COSINUS_FREQUENCY_KEY, COSINUS_FREQUENCY_DEFAULT_VALUE);
+                if (!freqVariant.canConvert<double>()) {
+                    qCCritical(LOG_CosinusProvider()) << tr("Can't retrieve data: invalid frequency");
+                    return nullptr;
+                }
                 // Gets the timerange from the parameters
-                double freq = 100.0;
+                double freq = freqVariant.toDouble();
-                double start = std::ceil(dataRangeRequested.m_TStart * freq); // 100 htz
+                double start = std::ceil(dataRangeRequested.m_TStart * freq);
-                double end = std::floor(dataRangeRequested.m_TEnd * freq);    // 100 htz
+                double end = std::floor(dataRangeRequested.m_TEnd * freq);
                 // We assure that timerange is valid
                 if (end < start) {
                     std::swap(start, end);
                 }
                 // Generates scalar series containing cosinus values (one value per second, end value is
                 // included)
                 auto dataCount = end - start + 1;
                 auto xAxisData = std::vector<double>{};
                 xAxisData.resize(dataCount);
                 auto valuesData = std::vector<double>{};
                 valuesData.resize(dataCount);
                 int progress = 0;
                 auto progressEnd = dataCount;
                 for (auto time = start; time <= end; ++time, ++dataIndex) {
                     auto it = m_VariableToEnableProvider.find(acqIdentifier);
                     if (it != m_VariableToEnableProvider.end() && it.value()) {
                         const auto timeOnFreq = time / freq;
                         xAxisData[dataIndex] = timeOnFreq;
                         valuesData[dataIndex] = std::cos(timeOnFreq);
                         // progression
                         int currentProgress = (time - start) * 100.0 / progressEnd;
                         if (currentProgress != progress) {
                             progress = currentProgress;
                             emit dataProvidedProgress(acqIdentifier, progress);
                             qCInfo(LOG_CosinusProvider()) << "TORM: CosinusProvider::retrieveData"
                                                           << QThread::currentThread()->objectName() << progress;
                             // NOTE: Try to use multithread if possible
                         }
                     }
                     else {
                         if (!it.value()) {
                             qCDebug(LOG_CosinusProvider())
                                 << "CosinusProvider::retrieveData: ARRET De l'acquisition detecté"
                                 << end - time;
                         }
                     }
                 }
                 if (progress != 100) {
                     // We can close progression beacause all data has been retrieved
                     emit dataProvidedProgress(acqIdentifier, 100);
                 }
                 return std::make_shared<ScalarSeries>(std::move(xAxisData), std::move(valuesData),
                                                       Unit{QStringLiteral("t"), true}, Unit{});
             }
             void CosinusProvider::requestDataLoading(QUuid acqIdentifier,
                                                      const DataProviderParameters &parameters)
             {
                 // TODO: Add Mutex
                 m_VariableToEnableProvider[acqIdentifier] = true;
                 qCDebug(LOG_CosinusProvider()) << "TORM: CosinusProvider::requestDataLoading"
                                                << QThread::currentThread()->objectName();
                 // NOTE: Try to use multithread if possible
                 const auto times = parameters.m_Times;
                 for (const auto &dateTime : qAsConst(times)) {
                     if (m_VariableToEnableProvider[acqIdentifier]) {
                         auto scalarSeries = this->retrieveData(acqIdentifier, dateTime, parameters.m_Data);
                         qCDebug(LOG_CosinusProvider()) << "TORM: CosinusProvider::dataProvided";
                         emit dataProvided(acqIdentifier, scalarSeries, dateTime);
                     }
                 }
             }
             void CosinusProvider::requestDataAborting(QUuid acqIdentifier)
             {
                 // TODO: Add Mutex
                 qCDebug(LOG_CosinusProvider()) << "CosinusProvider::requestDataAborting" << acqIdentifier
                                                << QThread::currentThread()->objectName();
                 auto it = m_VariableToEnableProvider.find(acqIdentifier);
                 if (it != m_VariableToEnableProvider.end()) {
                     it.value() = false;
                 }
                 else {
                     qCWarning(LOG_CosinusProvider())
                         << tr("Aborting progression of inexistant identifier detected !!!");
                 }
             }

plugins/mockplugin/src/MockPlugin.cpp +4 -2

             #include "MockPlugin.h"
             #include "CosinusProvider.h"
+            #include "MockDefs.h"
             #include <DataSource/DataSourceController.h>
             #include <DataSource/DataSourceItem.h>
             #include <DataSource/DataSourceItemAction.h>
             #include <SqpApplication.h>
             Q_LOGGING_CATEGORY(LOG_MockPlugin, "MockPlugin")
             namespace {
             /// Name of the data source
             const auto DATA_SOURCE_NAME = QStringLiteral("MMS");
             /// Creates the data provider relative to the plugin
             std::unique_ptr<IDataProvider> createDataProvider() noexcept
             {
                 return std::make_unique<CosinusProvider>();
             }
-            std::unique_ptr<DataSourceItem> createProductItem(const QString &productName,
+            std::unique_ptr<DataSourceItem> createProductItem(const QVariantHash &data,
                                                               const QUuid &dataSourceUid)
             {
-                auto result = std::make_unique<DataSourceItem>(DataSourceItemType::PRODUCT, productName);
+                auto result = std::make_unique<DataSourceItem>(DataSourceItemType::PRODUCT, data);
+                auto productName = data.value(DataSourceItem::NAME_DATA_KEY).toString();
                 // Add action to load product from DataSourceController
                 result->addAction(std::make_unique<DataSourceItemAction>(
                     QObject::tr("Load %1 product").arg(productName),
                     [productName, dataSourceUid](DataSourceItem &item) {
                         if (auto app = sqpApp) {
                             app->dataSourceController().loadProductItem(dataSourceUid, item);
                         }
                     }));
                 return result;
             }
             /// Creates the data source item relative to the plugin
             std::unique_ptr<DataSourceItem> createDataSourceItem(const QUuid &dataSourceUid) noexcept
             {
                 // Magnetic field products
                 auto magneticFieldFolder = std::make_unique<DataSourceItem>(DataSourceItemType::NODE,
                                                                             QStringLiteral("Magnetic field"));
                 magneticFieldFolder->appendChild(createProductItem(QStringLiteral("FGM"), dataSourceUid));
                 magneticFieldFolder->appendChild(createProductItem(QStringLiteral("SC"), dataSourceUid));
                 // Electric field products
                 auto electricFieldFolder = std::make_unique<DataSourceItem>(DataSourceItemType::NODE,
                                                                             QStringLiteral("Electric field"));
                 // Root
                 auto root = std::make_unique<DataSourceItem>(DataSourceItemType::NODE, DATA_SOURCE_NAME);
                 root->appendChild(std::move(magneticFieldFolder));
                 root->appendChild(std::move(electricFieldFolder));
                 return root;
             }
             } // namespace
             void MockPlugin::initialize()
             {
                 if (auto app = sqpApp) {
                     // Registers to the data source controller
                     auto &dataSourceController = app->dataSourceController();
                     auto dataSourceUid = dataSourceController.registerDataSource(DATA_SOURCE_NAME);
                     // Sets data source tree
                     dataSourceController.setDataSourceItem(dataSourceUid, createDataSourceItem(dataSourceUid));
                     // Sets data provider
                     dataSourceController.setDataProvider(dataSourceUid, createDataProvider());
                 }
                 else {
                     qCWarning(LOG_MockPlugin()) << tr("Can't access to SciQlop application");
                 }
             }

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