##// END OF EJS Templates
GIT_REPOSITORIES » LPP » Users » mperrinel » SciQLop-fork
RSS

Fork of HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop

Adds plugin column to variable widget...
Adds plugin column to variable widget To retrieve the "plugin" field, we add to the metadata of the variable the name of the data source root item
perrinel - - Load All Authors

File last commit:

r546:c13ea1918c0c
r551:b0a7e1650d9f
Show More
VariableController.cpp
541 lines | 21.0 KiB | text/x-c | CppLexer
/ core / src / Variable / VariableController.cpp
History | Source | Raw |Copy content |Copy permalink
perrinel
The mock plugin can now create data with view operation
 r235 #include <Variable/Variable.h>
perrinel
Implementation of V5 acquisition
 r539 #include <Variable/VariableAcquisitionWorker.h>
perrinel
Create a variable notify the variable cache parameter
 r225 #include <Variable/VariableCacheController.h>
perrinel
Implementation of V5 acquisition
 r539 #include <Variable/VariableCacheStrategy.h>
Alexandre Leroux
Inits variable controller and adds it to the SciQlop app
 r111 #include <Variable/VariableController.h>
Alexandre Leroux
Adds Variable model in the Variable controller
 r113 #include <Variable/VariableModel.h>
perrinel
Implementation of V5 acquisition
 r539 #include <Variable/VariableSynchronizationGroup.h>
Alexandre Leroux
Inits variable controller and adds it to the SciQlop app
 r111
Alexandre Leroux
Updates VariableController::createVariable() method...
 r166 #include <Data/DataProviderParameters.h>
#include <Data/IDataProvider.h>
#include <Data/IDataSeries.h>
perrinel
Time widget is now used with the variable createion request
 r193 #include <Time/TimeController.h>
Alexandre Leroux
Updates VariableController::createVariable() method...
 r166
Alexandre Leroux
Inits variable controller and adds it to the SciQlop app
 r111 #include <QMutex>
#include <QThread>
Alexandre Leroux
Transits tokens in provider requests
 r376 #include <QUuid>
perrinel
Temporal parameters of the selected variables can be updated using the...
 r304 #include <QtCore/QItemSelectionModel>
Alexandre Leroux
Inits variable controller and adds it to the SciQlop app
 r111
perrinel
Implementation of V5 acquisition
 r539 #include <set>
perrinel
Create a variable notify the variable cache parameter
 r225 #include <unordered_map>
Alexandre Leroux
Inits variable controller and adds it to the SciQlop app
 r111 Q_LOGGING_CATEGORY(LOG_VariableController, "VariableController")
perrinel
Implementation of V5 acquisition
 r539 namespace {
perrinel
change grapheRange to graphRange
 r545 SqpRange computeSynchroRangeRequested(const SqpRange &varRange, const SqpRange &graphRange,
perrinel
Implementation of V5 acquisition
 r539 const SqpRange &oldGraphRange)
{
perrinel
change grapheRange to graphRange
 r545 auto zoomType = VariableController::getZoomType(graphRange, oldGraphRange);
perrinel
Implementation of V5 acquisition
 r539
auto varRangeRequested = varRange;
switch (zoomType) {
case AcquisitionZoomType::ZoomIn: {
perrinel
change grapheRange to graphRange
 r545 auto deltaLeft = graphRange.m_TStart - oldGraphRange.m_TStart;
auto deltaRight = oldGraphRange.m_TEnd - graphRange.m_TEnd;
perrinel
Implementation of V5 acquisition
 r539 varRangeRequested.m_TStart += deltaLeft;
varRangeRequested.m_TEnd -= deltaRight;
break;
}
case AcquisitionZoomType::ZoomOut: {
perrinel
change grapheRange to graphRange
 r545 auto deltaLeft = oldGraphRange.m_TStart - graphRange.m_TStart;
auto deltaRight = graphRange.m_TEnd - oldGraphRange.m_TEnd;
perrinel
Implementation of V5 acquisition
 r539 varRangeRequested.m_TStart -= deltaLeft;
varRangeRequested.m_TEnd += deltaRight;
break;
}
case AcquisitionZoomType::PanRight: {
perrinel
change grapheRange to graphRange
 r545 auto deltaRight = graphRange.m_TEnd - oldGraphRange.m_TEnd;
perrinel
Implementation of V5 acquisition
 r539 varRangeRequested.m_TStart += deltaRight;
varRangeRequested.m_TEnd += deltaRight;
break;
}
case AcquisitionZoomType::PanLeft: {
perrinel
change grapheRange to graphRange
 r545 auto deltaLeft = oldGraphRange.m_TStart - graphRange.m_TStart;
perrinel
Implementation of V5 acquisition
 r539 varRangeRequested.m_TStart -= deltaLeft;
varRangeRequested.m_TEnd -= deltaLeft;
break;
}
case AcquisitionZoomType::Unknown: {
qCCritical(LOG_VariableController())
<< VariableController::tr("Impossible to synchronize: zoom type unknown");
break;
}
default:
qCCritical(LOG_VariableController()) << VariableController::tr(
"Impossible to synchronize: zoom type not take into account");
// No action
break;
}
return varRangeRequested;
}
}
Alexandre Leroux
Inits variable controller and adds it to the SciQlop app
 r111 struct VariableController::VariableControllerPrivate {
Alexandre Leroux
Use raw pointer for VariableModel (QObject class)
 r159 explicit VariableControllerPrivate(VariableController *parent)
perrinel
Create a variable notify the variable cache parameter
 r225 : m_WorkingMutex{},
m_VariableModel{new VariableModel{parent}},
perrinel
Temporal parameters of the selected variables can be updated using the...
 r304 m_VariableSelectionModel{new QItemSelectionModel{m_VariableModel, parent}},
perrinel
Implementation of V5 acquisition
 r539 m_VariableCacheController{std::make_unique<VariableCacheController>()},
m_VariableCacheStrategy{std::make_unique<VariableCacheStrategy>()},
m_VariableAcquisitionWorker{std::make_unique<VariableAcquisitionWorker>()}
{
m_VariableAcquisitionWorker->moveToThread(&m_VariableAcquisitionWorkerThread);
m_VariableAcquisitionWorkerThread.setObjectName("VariableAcquisitionWorkerThread");
}
virtual ~VariableControllerPrivate()
Alexandre Leroux
Inits variable controller and adds it to the SciQlop app
 r111 {
perrinel
Implementation of V5 acquisition
 r539 qCDebug(LOG_VariableController()) << tr("VariableControllerPrivate destruction");
m_VariableAcquisitionWorkerThread.quit();
m_VariableAcquisitionWorkerThread.wait();
Alexandre Leroux
Inits variable controller and adds it to the SciQlop app
 r111 }
perrinel
Implementation of V5 acquisition
 r539
void processRequest(std::shared_ptr<Variable> var, const SqpRange &rangeRequested);
perrinel
Update worker for SqpRange compatibility
 r530 QVector<SqpRange> provideNotInCacheDateTimeList(std::shared_ptr<Variable> variable,
const SqpRange &dateTime);
perrinel
Add code of ProvideNotInCacheRange in VC controller
 r529
perrinel
Implementation of V5 acquisition
 r539 std::shared_ptr<Variable> findVariable(QUuid vIdentifier);
std::shared_ptr<IDataSeries>
retrieveDataSeries(const QVector<AcquisitionDataPacket> acqDataPacketVector);
void registerProvider(std::shared_ptr<IDataProvider> provider);
Alexandre Leroux
Inits variable controller and adds it to the SciQlop app
 r111 QMutex m_WorkingMutex;
Alexandre Leroux
Use raw pointer for VariableModel (QObject class)
 r159 /// Variable model. The VariableController has the ownership
VariableModel *m_VariableModel;
perrinel
Temporal parameters of the selected variables can be updated using the...
 r304 QItemSelectionModel *m_VariableSelectionModel;
perrinel
Time widget is now used with the variable createion request
 r193
perrinel
Create a variable notify the variable cache parameter
 r225
perrinel
Correction MR
 r195 TimeController *m_TimeController{nullptr};
perrinel
Create a variable notify the variable cache parameter
 r225 std::unique_ptr<VariableCacheController> m_VariableCacheController;
perrinel
Implementation of V5 acquisition
 r539 std::unique_ptr<VariableCacheStrategy> m_VariableCacheStrategy;
std::unique_ptr<VariableAcquisitionWorker> m_VariableAcquisitionWorker;
QThread m_VariableAcquisitionWorkerThread;
perrinel
The mock plugin can now create data with view operation
 r235
std::unordered_map<std::shared_ptr<Variable>, std::shared_ptr<IDataProvider> >
m_VariableToProviderMap;
Alexandre Leroux
Corrects regression on variable destruction
 r420 std::unordered_map<std::shared_ptr<Variable>, QUuid> m_VariableToIdentifierMap;
perrinel
Implementation of V5 acquisition
 r539 std::map<QUuid, std::shared_ptr<VariableSynchronizationGroup> >
m_GroupIdToVariableSynchronizationGroupMap;
std::map<QUuid, QUuid> m_VariableIdGroupIdMap;
std::set<std::shared_ptr<IDataProvider> > m_ProviderSet;
Alexandre Leroux
Inits variable controller and adds it to the SciQlop app
 r111 };
perrinel
Implementation of V5 acquisition
 r539
Alexandre Leroux
Inits variable controller and adds it to the SciQlop app
 r111 VariableController::VariableController(QObject *parent)
Alexandre Leroux
Use raw pointer for VariableModel (QObject class)
 r159 : QObject{parent}, impl{spimpl::make_unique_impl<VariableControllerPrivate>(this)}
Alexandre Leroux
Inits variable controller and adds it to the SciQlop app
 r111 {
perrinel
Correction clang format
 r365 qCDebug(LOG_VariableController()) << tr("VariableController construction")
<< QThread::currentThread();
perrinel
Implement of the abort download process
 r422
connect(impl->m_VariableModel, &VariableModel::abortProgessRequested, this,
&VariableController::onAbortProgressRequested);
perrinel
Implementation of V5 acquisition
 r539
connect(impl->m_VariableAcquisitionWorker.get(), &VariableAcquisitionWorker::dataProvided, this,
&VariableController::onDataProvided);
connect(impl->m_VariableAcquisitionWorker.get(),
&VariableAcquisitionWorker::variableRequestInProgress, this,
&VariableController::onVariableRetrieveDataInProgress);
connect(&impl->m_VariableAcquisitionWorkerThread, &QThread::started,
impl->m_VariableAcquisitionWorker.get(), &VariableAcquisitionWorker::initialize);
connect(&impl->m_VariableAcquisitionWorkerThread, &QThread::finished,
impl->m_VariableAcquisitionWorker.get(), &VariableAcquisitionWorker::finalize);
impl->m_VariableAcquisitionWorkerThread.start();
Alexandre Leroux
Inits variable controller and adds it to the SciQlop app
 r111 }
VariableController::~VariableController()
{
perrinel
Correction clang format
 r365 qCDebug(LOG_VariableController()) << tr("VariableController destruction")
<< QThread::currentThread();
Alexandre Leroux
Inits variable controller and adds it to the SciQlop app
 r111 this->waitForFinish();
}
Alexandre Leroux
Updates VariableController::createVariable() method...
 r166 VariableModel *VariableController::variableModel() noexcept
Alexandre Leroux
Adds Variable model in the Variable controller
 r113 {
Alexandre Leroux
Updates VariableController::createVariable() method...
 r166 return impl->m_VariableModel;
Alexandre Leroux
Adds Variable model in the Variable controller
 r113 }
perrinel
Temporal parameters of the selected variables can be updated using the...
 r304 QItemSelectionModel *VariableController::variableSelectionModel() noexcept
{
return impl->m_VariableSelectionModel;
}
perrinel
Time widget is now used with the variable createion request
 r193 void VariableController::setTimeController(TimeController *timeController) noexcept
{
impl->m_TimeController = timeController;
}
Alexandre Leroux
Variable deletion (1)...
 r329 void VariableController::deleteVariable(std::shared_ptr<Variable> variable) noexcept
{
if (!variable) {
qCCritical(LOG_VariableController()) << "Can't delete variable: variable is null";
return;
}
Alexandre Leroux
Variable deletion (6)...
 r335 // Spreads in SciQlop that the variable will be deleted, so that potential receivers can
// make some treatments before the deletion
emit variableAboutToBeDeleted(variable);
Alexandre Leroux
Variable deletion (2)...
 r330
Alexandre Leroux
Corrects regression on variable destruction
 r420 // Deletes identifier
impl->m_VariableToIdentifierMap.erase(variable);
Alexandre Leroux
Variable deletion (2)...
 r330 // Deletes provider
auto nbProvidersDeleted = impl->m_VariableToProviderMap.erase(variable);
qCDebug(LOG_VariableController())
<< tr("Number of providers deleted for variable %1: %2")
.arg(variable->name(), QString::number(nbProvidersDeleted));
Alexandre Leroux
Variable deletion (1)...
 r329
Alexandre Leroux
Variable deletion (2)...
 r331 // Clears cache
impl->m_VariableCacheController->clear(variable);
Alexandre Leroux
Variable deletion (3)...
 r332 // Deletes from model
impl->m_VariableModel->deleteVariable(variable);
}
Alexandre Leroux
Variable deletion (1)...
 r329
void VariableController::deleteVariables(
const QVector<std::shared_ptr<Variable> > &variables) noexcept
{
for (auto variable : qAsConst(variables)) {
deleteVariable(variable);
}
}
perrinel
Implement of the abort download process
 r422 void VariableController::abortProgress(std::shared_ptr<Variable> variable)
{
}
Alexandre Leroux
Updates variable creation to pass metadata...
 r410 void VariableController::createVariable(const QString &name, const QVariantHash &metadata,
Alexandre Leroux
Updates VariableController::createVariable() method...
 r166 std::shared_ptr<IDataProvider> provider) noexcept
Alexandre Leroux
Affects model to the Variable Widget
 r152 {
perrinel
Time widget is now used with the variable createion request
 r193
if (!impl->m_TimeController) {
qCCritical(LOG_VariableController())
<< tr("Impossible to create variable: The time controller is null");
return;
}
perrinel
Implementation of V5 acquisition
 r539 auto range = impl->m_TimeController->dateTime();
Alexandre Leroux
Updates variable creation to pass metadata...
 r410
perrinel
Implementation of V5 acquisition
 r539 if (auto newVariable = impl->m_VariableModel->createVariable(name, range, metadata)) {
perrinel
Implement the network controller to permit the execution of a request...
 r389 auto identifier = QUuid::createUuid();
perrinel
Create a variable notify the variable cache parameter
 r225
perrinel
The mock plugin can now create data with view operation
 r235 // store the provider
perrinel
Implementation of V5 acquisition
 r539 impl->registerProvider(provider);
// Associate the provider
perrinel
The mock plugin can now create data with view operation
 r235 impl->m_VariableToProviderMap[newVariable] = provider;
Alexandre Leroux
Corrects regression on variable destruction
 r420 impl->m_VariableToIdentifierMap[newVariable] = identifier;
perrinel
The cache is now updated only if date requested has been successfully...
 r318
perrinel
Implementation of V5 acquisition
 r539 impl->processRequest(newVariable, range);
Alexandre Leroux
Updates VariableController::createVariable() method...
 r166 }
Alexandre Leroux
Affects model to the Variable Widget
 r152 }
perrinel
Change SqpRange for SqpDateTime
 r512 void VariableController::onDateTimeOnSelection(const SqpRange &dateTime)
perrinel
Temporal parameters of the selected variables can be updated using the...
 r304 {
perrinel
Implementation of V5 acquisition
 r539 // TODO check synchronisation
perrinel
Correction clang format
 r365 qCDebug(LOG_VariableController()) << "VariableController::onDateTimeOnSelection"
<< QThread::currentThread()->objectName();
perrinel
Temporal parameters of the selected variables can be updated using the...
 r304 auto selectedRows = impl->m_VariableSelectionModel->selectedRows();
for (const auto &selectedRow : qAsConst(selectedRows)) {
if (auto selectedVariable = impl->m_VariableModel->variable(selectedRow.row())) {
perrinel
Implementation of V5 acquisition
 r539 selectedVariable->setRange(dateTime);
impl->processRequest(selectedVariable, dateTime);
perrinel
Add comment
 r442
// notify that rescale operation has to be done
perrinel
Add connection logical for the rescale operation
 r437 emit rangeChanged(selectedVariable, dateTime);
perrinel
Temporal parameters of the selected variables can be updated using the...
 r304 }
}
}
perrinel
Implementation of V5 acquisition
 r539 void VariableController::onDataProvided(QUuid vIdentifier, const SqpRange &rangeRequested,
const SqpRange &cacheRangeRequested,
QVector<AcquisitionDataPacket> dataAcquired)
perrinel
Add implementation of progress bar on variable inspector connected to...
 r401 {
perrinel
Correction for MR
 r546 if (auto var = impl->findVariable(vIdentifier)) {
perrinel
Implementation of V5 acquisition
 r539 var->setRange(rangeRequested);
var->setCacheRange(cacheRangeRequested);
perrinel
Add synchronization part of v5 acquisition
 r540 qCDebug(LOG_VariableController()) << tr("1: onDataProvided") << rangeRequested;
qCDebug(LOG_VariableController()) << tr("2: onDataProvided") << cacheRangeRequested;
perrinel
Implementation of V5 acquisition
 r539
auto retrievedDataSeries = impl->retrieveDataSeries(dataAcquired);
perrinel
Add synchronization part of v5 acquisition
 r540 qCDebug(LOG_VariableController()) << tr("3: onDataProvided")
<< retrievedDataSeries->range();
perrinel
Implementation of V5 acquisition
 r539 var->mergeDataSeries(retrievedDataSeries);
perrinel
The dataSeries of a variable is now shared istead of uniq to avoid...
 r542 qCDebug(LOG_VariableController()) << tr("4: onDataProvided");
perrinel
Implementation of V5 acquisition
 r539 emit var->updated();
}
else {
qCCritical(LOG_VariableController()) << tr("Impossible to provide data to a null variable");
}
}
perrinel
Add implementation of progress bar on variable inspector connected to...
 r401
perrinel
Implementation of V5 acquisition
 r539 void VariableController::onVariableRetrieveDataInProgress(QUuid identifier, double progress)
{
perrinel
Correction for MR
 r546 if (auto var = impl->findVariable(identifier)) {
perrinel
Implementation of V5 acquisition
 r539 impl->m_VariableModel->setDataProgress(var, progress);
}
else {
qCCritical(LOG_VariableController())
<< tr("Impossible to notify progression of a null variable");
perrinel
Add implementation of progress bar on variable inspector connected to...
 r401 }
}
perrinel
Implement of the abort download process
 r422 void VariableController::onAbortProgressRequested(std::shared_ptr<Variable> variable)
{
qCDebug(LOG_VariableController()) << "TORM: VariableController::onAbortProgressRequested"
<< QThread::currentThread()->objectName();
perrinel
Add thread protection on AbortDownload process
 r423 auto it = impl->m_VariableToIdentifierMap.find(variable);
if (it != impl->m_VariableToIdentifierMap.cend()) {
perrinel
Implement of the abort download process
 r422 impl->m_VariableToProviderMap.at(variable)->requestDataAborting(it->second);
}
else {
qCWarning(LOG_VariableController())
<< tr("Aborting progression of inexistant variable detected !!!")
<< QThread::currentThread()->objectName();
}
}
perrinel
Implementation of V5 acquisition
 r539 void VariableController::onAddSynchronizationGroupId(QUuid synchronizationGroupId)
{
perrinel
Add synchronization part of v5 acquisition
 r540 qCDebug(LOG_VariableController()) << "TORM: VariableController::onAddSynchronizationGroupId"
<< QThread::currentThread()->objectName()
<< synchronizationGroupId;
perrinel
Implementation of V5 acquisition
 r539 auto vSynchroGroup = std::make_shared<VariableSynchronizationGroup>();
impl->m_GroupIdToVariableSynchronizationGroupMap.insert(
std::make_pair(synchronizationGroupId, vSynchroGroup));
}
void VariableController::onRemoveSynchronizationGroupId(QUuid synchronizationGroupId)
{
impl->m_GroupIdToVariableSynchronizationGroupMap.erase(synchronizationGroupId);
}
perrinel
Add synchronization part of v5 acquisition
 r540 void VariableController::onAddSynchronized(std::shared_ptr<Variable> variable,
QUuid synchronizationGroupId)
{
qCDebug(LOG_VariableController()) << "TORM: VariableController::onAddSynchronized"
<< synchronizationGroupId;
perrinel
Correction for MR
 r546 auto varToVarIdIt = impl->m_VariableToIdentifierMap.find(variable);
if (varToVarIdIt != impl->m_VariableToIdentifierMap.cend()) {
auto groupIdToVSGIt
perrinel
Add synchronization part of v5 acquisition
 r540 = impl->m_GroupIdToVariableSynchronizationGroupMap.find(synchronizationGroupId);
perrinel
Correction for MR
 r546 if (groupIdToVSGIt != impl->m_GroupIdToVariableSynchronizationGroupMap.cend()) {
perrinel
Add synchronization part of v5 acquisition
 r540 impl->m_VariableIdGroupIdMap.insert(
perrinel
Correction for MR
 r546 std::make_pair(varToVarIdIt->second, synchronizationGroupId));
groupIdToVSGIt->second->addVariableId(varToVarIdIt->second);
perrinel
Add synchronization part of v5 acquisition
 r540 }
else {
qCCritical(LOG_VariableController())
<< tr("Impossible to synchronize a variable with an unknown sycnhronization group")
<< variable->name();
}
}
else {
qCCritical(LOG_VariableController())
<< tr("Impossible to synchronize a variable with no identifier") << variable->name();
}
}
perrinel
The mock plugin can now create data with view operation
 r235
perrinel
Implementation of V5 acquisition
 r539 void VariableController::onRequestDataLoading(QVector<std::shared_ptr<Variable> > variables,
const SqpRange &range, const SqpRange &oldRange,
bool synchronise)
perrinel
The mock plugin can now create data with view operation
 r235 {
perrinel
Implementation of V5 acquisition
 r539 // NOTE: oldRange isn't really necessary since oldRange == variable->range().
perrinel
Correction for MR
 r546 qCDebug(LOG_VariableController()) << "VariableController::onRequestDataLoading"
<< QThread::currentThread()->objectName();
perrinel
The mock plugin can now create data with view operation
 r235 // we want to load data of the variable for the dateTime.
// First we check if the cache contains some of them.
// For the other, we ask the provider to give them.
perrinel
Correction for MR
 r546 for (const auto &var : variables) {
perrinel
Add synchronization part of v5 acquisition
 r540 qCDebug(LOG_VariableController()) << "processRequest for" << var->name();
perrinel
Implementation of V5 acquisition
 r539 impl->processRequest(var, range);
}
perrinel
The mock plugin can now create data with view operation
 r235
perrinel
Implementation of V5 acquisition
 r539 if (synchronise) {
// Get the group ids
perrinel
Add synchronization part of v5 acquisition
 r540 qCDebug(LOG_VariableController())
perrinel
Correction for MR
 r546 << "TORM VariableController::onRequestDataLoading for synchro var ENABLE";
perrinel
Implementation of V5 acquisition
 r539 auto groupIds = std::set<QUuid>();
perrinel
Correction for MR
 r546 for (const auto &var : variables) {
perrinel
Add synchronization part of v5 acquisition
 r540 auto varToVarIdIt = impl->m_VariableToIdentifierMap.find(var);
if (varToVarIdIt != impl->m_VariableToIdentifierMap.cend()) {
auto vId = varToVarIdIt->second;
auto varIdToGroupIdIt = impl->m_VariableIdGroupIdMap.find(vId);
if (varIdToGroupIdIt != impl->m_VariableIdGroupIdMap.cend()) {
auto gId = varIdToGroupIdIt->second;
perrinel
Implementation of V5 acquisition
 r539 if (groupIds.find(gId) == groupIds.cend()) {
perrinel
Add synchronization part of v5 acquisition
 r540 qCDebug(LOG_VariableController()) << "Synchro detect group " << gId;
perrinel
Implementation of V5 acquisition
 r539 groupIds.insert(gId);
}
}
}
perrinel
Fix the cosinus bug....
 r298 }
perrinel
Implementation of V5 acquisition
 r539
// We assume here all group ids exist
perrinel
Correction for MR
 r546 for (const auto &gId : groupIds) {
perrinel
Implementation of V5 acquisition
 r539 auto vSynchronizationGroup = impl->m_GroupIdToVariableSynchronizationGroupMap.at(gId);
auto vSyncIds = vSynchronizationGroup->getIds();
perrinel
Add synchronization part of v5 acquisition
 r540 qCDebug(LOG_VariableController()) << "Var in synchro group ";
perrinel
Implementation of V5 acquisition
 r539 for (auto vId : vSyncIds) {
auto var = impl->findVariable(vId);
perrinel
Add synchronization part of v5 acquisition
 r540
// Don't process already processed var
if (!variables.contains(var)) {
if (var != nullptr) {
qCDebug(LOG_VariableController()) << "processRequest synchro for"
<< var->name();
auto vSyncRangeRequested
= computeSynchroRangeRequested(var->range(), range, oldRange);
impl->processRequest(var, vSyncRangeRequested);
}
else {
qCCritical(LOG_VariableController())
<< tr("Impossible to synchronize a null variable");
}
perrinel
Implementation of V5 acquisition
 r539 }
}
perrinel
Fix the cosinus bug....
 r298 }
perrinel
The mock plugin can now create data with view operation
 r235 }
}
Alexandre Leroux
Inits variable controller and adds it to the SciQlop app
 r111 void VariableController::initialize()
{
qCDebug(LOG_VariableController()) << tr("VariableController init") << QThread::currentThread();
impl->m_WorkingMutex.lock();
qCDebug(LOG_VariableController()) << tr("VariableController init END");
}
void VariableController::finalize()
{
impl->m_WorkingMutex.unlock();
}
void VariableController::waitForFinish()
{
QMutexLocker locker{&impl->m_WorkingMutex};
}
perrinel
Add code of ProvideNotInCacheRange in VC controller
 r529
perrinel
Implementation of V5 acquisition
 r539 AcquisitionZoomType VariableController::getZoomType(const SqpRange &range, const SqpRange &oldRange)
{
// t1.m_TStart <= t2.m_TStart && t2.m_TEnd <= t1.m_TEnd
auto zoomType = AcquisitionZoomType::Unknown;
if (range.m_TStart <= oldRange.m_TStart && oldRange.m_TEnd <= range.m_TEnd) {
zoomType = AcquisitionZoomType::ZoomOut;
}
else if (range.m_TStart > oldRange.m_TStart && range.m_TEnd > oldRange.m_TEnd) {
zoomType = AcquisitionZoomType::PanRight;
}
else if (range.m_TStart < oldRange.m_TStart && range.m_TEnd < oldRange.m_TEnd) {
zoomType = AcquisitionZoomType::PanLeft;
}
else if (range.m_TStart > oldRange.m_TStart && oldRange.m_TEnd > range.m_TEnd) {
zoomType = AcquisitionZoomType::ZoomIn;
}
else {
qCCritical(LOG_VariableController()) << "getZoomType: Unknown type detected";
}
return zoomType;
}
perrinel
Add code of ProvideNotInCacheRange in VC controller
 r529
perrinel
Implementation of V5 acquisition
 r539 void VariableController::VariableControllerPrivate::processRequest(std::shared_ptr<Variable> var,
const SqpRange &rangeRequested)
perrinel
Add code of ProvideNotInCacheRange in VC controller
 r529 {
perrinel
Implementation of V5 acquisition
 r539 auto varRangesRequested
= m_VariableCacheStrategy->computeCacheRange(var->range(), rangeRequested);
auto notInCacheRangeList = var->provideNotInCacheRangeList(varRangesRequested.second);
if (!notInCacheRangeList.empty()) {
auto identifier = m_VariableToIdentifierMap.at(var);
auto varProvider = m_VariableToProviderMap.at(var);
if (varProvider != nullptr) {
m_VariableAcquisitionWorker->pushVariableRequest(
identifier, varRangesRequested.first, varRangesRequested.second,
DataProviderParameters{std::move(notInCacheRangeList), var->metadata()},
varProvider);
perrinel
Add code of ProvideNotInCacheRange in VC controller
 r529 }
else {
perrinel
Implementation of V5 acquisition
 r539 qCCritical(LOG_VariableController())
<< "Impossible to provide data with a null provider";
perrinel
Add code of ProvideNotInCacheRange in VC controller
 r529 }
}
perrinel
Implementation of V5 acquisition
 r539 else {
var->setRange(rangeRequested);
var->setCacheRange(varRangesRequested.second);
var->setDataSeries(var->dataSeries()->subData(varRangesRequested.second));
emit var->updated();
}
}
std::shared_ptr<Variable>
VariableController::VariableControllerPrivate::findVariable(QUuid vIdentifier)
{
std::shared_ptr<Variable> var;
auto findReply = [vIdentifier](const auto &entry) { return vIdentifier == entry.second; };
auto end = m_VariableToIdentifierMap.cend();
auto it = std::find_if(m_VariableToIdentifierMap.cbegin(), end, findReply);
if (it != end) {
var = it->first;
}
else {
qCCritical(LOG_VariableController())
<< tr("Impossible to find the variable with the identifier: ") << vIdentifier;
}
perrinel
Add code of ProvideNotInCacheRange in VC controller
 r529
perrinel
Implementation of V5 acquisition
 r539 return var;
}
std::shared_ptr<IDataSeries> VariableController::VariableControllerPrivate::retrieveDataSeries(
const QVector<AcquisitionDataPacket> acqDataPacketVector)
{
perrinel
The dataSeries of a variable is now shared istead of uniq to avoid...
 r542 qCDebug(LOG_VariableController()) << tr("TORM: retrieveDataSeries acqDataPacketVector size")
<< acqDataPacketVector.size();
perrinel
Implementation of V5 acquisition
 r539 std::shared_ptr<IDataSeries> dataSeries;
if (!acqDataPacketVector.isEmpty()) {
dataSeries = acqDataPacketVector[0].m_DateSeries;
for (int i = 1; i < acqDataPacketVector.size(); ++i) {
dataSeries->merge(acqDataPacketVector[i].m_DateSeries.get());
}
}
perrinel
The dataSeries of a variable is now shared istead of uniq to avoid...
 r542 qCDebug(LOG_VariableController()) << tr("TORM: retrieveDataSeries acqDataPacketVector size END")
<< acqDataPacketVector.size();
perrinel
Implementation of V5 acquisition
 r539 return dataSeries;
}
void VariableController::VariableControllerPrivate::registerProvider(
std::shared_ptr<IDataProvider> provider)
{
if (m_ProviderSet.find(provider) == m_ProviderSet.end()) {
perrinel
The dataSeries of a variable is now shared istead of uniq to avoid...
 r542 qCDebug(LOG_VariableController()) << tr("Registering of a new provider")
<< provider->objectName();
perrinel
Implementation of V5 acquisition
 r539 m_ProviderSet.insert(provider);
connect(provider.get(), &IDataProvider::dataProvided, m_VariableAcquisitionWorker.get(),
&VariableAcquisitionWorker::onVariableDataAcquired);
connect(provider.get(), &IDataProvider::dataProvidedProgress,
m_VariableAcquisitionWorker.get(),
&VariableAcquisitionWorker::onVariableRetrieveDataInProgress);
}
else {
perrinel
Add synchronization part of v5 acquisition
 r540 qCDebug(LOG_VariableController()) << tr("Cannot register provider, it already exists ");
perrinel
Implementation of V5 acquisition
 r539 }
perrinel
Add code of ProvideNotInCacheRange in VC controller
 r529 }