GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r814:1fc2e26b3db5

Fix bug in synchro for operation (jump + rescaling)

perrinel -

r814:1fc2e26b3db5

parent child

Context file:

r814:1fc2e26b3db5

core/src/Variable/VariableController.cpp +8 -2

             #include <Variable/Variable.h>
             #include <Variable/VariableAcquisitionWorker.h>
             #include <Variable/VariableCacheStrategy.h>
             #include <Variable/VariableCacheStrategyFactory.h>
             #include <Variable/VariableController.h>
             #include <Variable/VariableModel.h>
             #include <Variable/VariableSynchronizationGroup.h>
             #include <Data/DataProviderParameters.h>
             #include <Data/IDataProvider.h>
             #include <Data/IDataSeries.h>
             #include <Data/VariableRequest.h>
             #include <Time/TimeController.h>
             #include <QMutex>
             #include <QThread>
             #include <QUuid>
             #include <QtCore/QItemSelectionModel>
             #include <deque>
             #include <set>
             #include <unordered_map>
             Q_LOGGING_CATEGORY(LOG_VariableController, "VariableController")
             namespace {
             SqpRange computeSynchroRangeRequested(const SqpRange &varRange, const SqpRange &graphRange,
                                                   const SqpRange &oldGraphRange)
             {
                 auto zoomType = VariableController::getZoomType(graphRange, oldGraphRange);
                 auto varRangeRequested = varRange;
                 switch (zoomType) {
                     case AcquisitionZoomType::ZoomIn: {
                         auto deltaLeft = graphRange.m_TStart - oldGraphRange.m_TStart;
                         auto deltaRight = oldGraphRange.m_TEnd - graphRange.m_TEnd;
                         varRangeRequested.m_TStart += deltaLeft;
                         varRangeRequested.m_TEnd -= deltaRight;
                         break;
                     }
                     case AcquisitionZoomType::ZoomOut: {
                         auto deltaLeft = oldGraphRange.m_TStart - graphRange.m_TStart;
                         auto deltaRight = graphRange.m_TEnd - oldGraphRange.m_TEnd;
                         varRangeRequested.m_TStart -= deltaLeft;
                         varRangeRequested.m_TEnd += deltaRight;
                         break;
                     }
                     case AcquisitionZoomType::PanRight: {
+                        auto deltaLeft = graphRange.m_TStart - oldGraphRange.m_TStart;
                         auto deltaRight = graphRange.m_TEnd - oldGraphRange.m_TEnd;
-                        varRangeRequested.m_TStart += deltaRight;
+                        varRangeRequested.m_TStart += deltaLeft;
                         varRangeRequested.m_TEnd += deltaRight;
                         break;
                     }
                     case AcquisitionZoomType::PanLeft: {
                         auto deltaLeft = oldGraphRange.m_TStart - graphRange.m_TStart;
+                        auto deltaRight = oldGraphRange.m_TEnd - graphRange.m_TEnd;
                         varRangeRequested.m_TStart -= deltaLeft;
-                        varRangeRequested.m_TEnd -= deltaLeft;
+                        varRangeRequested.m_TEnd -= deltaRight;
                         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;
             }
             }
             struct VariableController::VariableControllerPrivate {
                 explicit VariableControllerPrivate(VariableController *parent)
                         : m_WorkingMutex{},
                           m_VariableModel{new VariableModel{parent}},
                           m_VariableSelectionModel{new QItemSelectionModel{m_VariableModel, parent}},
                           // m_VariableCacheStrategy{std::make_unique<VariableCacheStrategy>()},
                           m_VariableCacheStrategy{VariableCacheStrategyFactory::createCacheStrategy(
                               CacheStrategy::SingleThreshold)},
                           m_VariableAcquisitionWorker{std::make_unique<VariableAcquisitionWorker>()},
                           q{parent}
                 {
                     m_VariableAcquisitionWorker->moveToThread(&m_VariableAcquisitionWorkerThread);
                     m_VariableAcquisitionWorkerThread.setObjectName("VariableAcquisitionWorkerThread");
                 }
                 virtual ~VariableControllerPrivate()
                 {
                     qCDebug(LOG_VariableController()) << tr("VariableControllerPrivate destruction");
                     m_VariableAcquisitionWorkerThread.quit();
                     m_VariableAcquisitionWorkerThread.wait();
                 }
                 void processRequest(std::shared_ptr<Variable> var, const SqpRange &rangeRequested,
                                     QUuid varRequestId);
                 QVector<SqpRange> provideNotInCacheDateTimeList(std::shared_ptr<Variable> variable,
                                                                 const SqpRange &dateTime);
                 std::shared_ptr<Variable> findVariable(QUuid vIdentifier);
                 std::shared_ptr<IDataSeries>
                 retrieveDataSeries(const QVector<AcquisitionDataPacket> acqDataPacketVector);
                 void registerProvider(std::shared_ptr<IDataProvider> provider);
                 void storeVariableRequest(QUuid varId, QUuid varRequestId, const VariableRequest &varRequest);
                 QUuid acceptVariableRequest(QUuid varId, std::shared_ptr<IDataSeries> dataSeries);
                 void updateVariableRequest(QUuid varRequestId);
                 void cancelVariableRequest(QUuid varRequestId);
                 SqpRange getLastRequestedRange(QUuid varId);
                 QMutex m_WorkingMutex;
                 /// Variable model. The VariableController has the ownership
                 VariableModel *m_VariableModel;
                 QItemSelectionModel *m_VariableSelectionModel;
                 TimeController *m_TimeController{nullptr};
                 std::unique_ptr<VariableCacheStrategy> m_VariableCacheStrategy;
                 std::unique_ptr<VariableAcquisitionWorker> m_VariableAcquisitionWorker;
                 QThread m_VariableAcquisitionWorkerThread;
                 std::unordered_map<std::shared_ptr<Variable>, std::shared_ptr<IDataProvider> >
                     m_VariableToProviderMap;
                 std::unordered_map<std::shared_ptr<Variable>, QUuid> m_VariableToIdentifierMap;
                 std::map<QUuid, std::shared_ptr<VariableSynchronizationGroup> >
                     m_GroupIdToVariableSynchronizationGroupMap;
                 std::map<QUuid, QUuid> m_VariableIdGroupIdMap;
                 std::set<std::shared_ptr<IDataProvider> > m_ProviderSet;
                 std::map<QUuid, std::map<QUuid, VariableRequest> > m_VarRequestIdToVarIdVarRequestMap;
                 std::map<QUuid, std::deque<QUuid> > m_VarIdToVarRequestIdQueueMap;
                 VariableController *q;
             };
             VariableController::VariableController(QObject *parent)
                     : QObject{parent}, impl{spimpl::make_unique_impl<VariableControllerPrivate>(this)}
             {
                 qCDebug(LOG_VariableController()) << tr("VariableController construction")
                                                   << QThread::currentThread();
                 connect(impl->m_VariableModel, &VariableModel::abortProgessRequested, this,
                         &VariableController::onAbortProgressRequested);
                 connect(impl->m_VariableAcquisitionWorker.get(),
                         &VariableAcquisitionWorker::variableCanceledRequested, this,
                         &VariableController::onAbortAcquisitionRequested);
                 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();
             }
             VariableController::~VariableController()
             {
                 qCDebug(LOG_VariableController()) << tr("VariableController destruction")
                                                   << QThread::currentThread();
                 this->waitForFinish();
             }
             VariableModel *VariableController::variableModel() noexcept
             {
                 return impl->m_VariableModel;
             }
             QItemSelectionModel *VariableController::variableSelectionModel() noexcept
             {
                 return impl->m_VariableSelectionModel;
             }
             void VariableController::setTimeController(TimeController *timeController) noexcept
             {
                 impl->m_TimeController = timeController;
             }
             std::shared_ptr<Variable>
             VariableController::cloneVariable(std::shared_ptr<Variable> variable) noexcept
             {
                 if (impl->m_VariableModel->containsVariable(variable)) {
                     // Clones variable
                     auto duplicate = variable->clone();
                     // Adds clone to model
                     impl->m_VariableModel->addVariable(duplicate);
                     // Generates clone identifier
                     impl->m_VariableToIdentifierMap[duplicate] = QUuid::createUuid();
                     // Registers provider
                     auto variableProvider = impl->m_VariableToProviderMap.at(variable);
                     auto duplicateProvider = variableProvider != nullptr ? variableProvider->clone() : nullptr;
                     impl->m_VariableToProviderMap[duplicate] = duplicateProvider;
                     if (duplicateProvider) {
                         impl->registerProvider(duplicateProvider);
                     }
                     return duplicate;
                 }
                 else {
                     qCCritical(LOG_VariableController())
                         << tr("Can't create duplicate of variable %1: variable not registered in the model")
                                .arg(variable->name());
                     return nullptr;
                 }
             }
             void VariableController::deleteVariable(std::shared_ptr<Variable> variable) noexcept
             {
                 if (!variable) {
                     qCCritical(LOG_VariableController()) << "Can't delete variable: variable is null";
                     return;
                 }
                 // Spreads in SciQlop that the variable will be deleted, so that potential receivers can
                 // make some treatments before the deletion
                 emit variableAboutToBeDeleted(variable);
                 // Deletes identifier
                 impl->m_VariableToIdentifierMap.erase(variable);
                 // 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));
                 // Deletes from model
                 impl->m_VariableModel->deleteVariable(variable);
             }
             void VariableController::deleteVariables(
                 const QVector<std::shared_ptr<Variable> > &variables) noexcept
             {
                 for (auto variable : qAsConst(variables)) {
                     deleteVariable(variable);
                 }
             }
             std::shared_ptr<Variable>
             VariableController::createVariable(const QString &name, const QVariantHash &metadata,
                                                std::shared_ptr<IDataProvider> provider) noexcept
             {
                 if (!impl->m_TimeController) {
                     qCCritical(LOG_VariableController())
                         << tr("Impossible to create variable: The time controller is null");
                     return nullptr;
                 }
                 auto range = impl->m_TimeController->dateTime();
                 if (auto newVariable = impl->m_VariableModel->createVariable(name, metadata)) {
                     auto identifier = QUuid::createUuid();
                     // store the provider
                     impl->registerProvider(provider);
                     // Associate the provider
                     impl->m_VariableToProviderMap[newVariable] = provider;
                     qCInfo(LOG_VariableController()) << "createVariable: " << identifier;
                     impl->m_VariableToIdentifierMap[newVariable] = identifier;
                     auto varRequestId = QUuid::createUuid();
                     impl->processRequest(newVariable, range, varRequestId);
                     impl->updateVariableRequest(varRequestId);
                     return newVariable;
                 }
             }
             void VariableController::onDateTimeOnSelection(const SqpRange &dateTime)
             {
                 // TODO check synchronisation and Rescale
                 qCDebug(LOG_VariableController()) << "VariableController::onDateTimeOnSelection"
                                                   << QThread::currentThread()->objectName();
                 auto selectedRows = impl->m_VariableSelectionModel->selectedRows();
                 auto varRequestId = QUuid::createUuid();
                 for (const auto &selectedRow : qAsConst(selectedRows)) {
                     if (auto selectedVariable = impl->m_VariableModel->variable(selectedRow.row())) {
                         selectedVariable->setRange(dateTime);
                         impl->processRequest(selectedVariable, dateTime, varRequestId);
                         // notify that rescale operation has to be done
                         emit rangeChanged(selectedVariable, dateTime);
                     }
                 }
                 impl->updateVariableRequest(varRequestId);
             }
             void VariableController::onDataProvided(QUuid vIdentifier, const SqpRange &rangeRequested,
                                                     const SqpRange &cacheRangeRequested,
                                                     QVector<AcquisitionDataPacket> dataAcquired)
             {
                 auto retrievedDataSeries = impl->retrieveDataSeries(dataAcquired);
                 auto varRequestId = impl->acceptVariableRequest(vIdentifier, retrievedDataSeries);
                 if (!varRequestId.isNull()) {
                     impl->updateVariableRequest(varRequestId);
                 }
             }
             void VariableController::onVariableRetrieveDataInProgress(QUuid identifier, double progress)
             {
                 qCDebug(LOG_VariableController())
                     << "TORM: variableController::onVariableRetrieveDataInProgress"
                     << QThread::currentThread()->objectName() << progress;
                 if (auto var = impl->findVariable(identifier)) {
                     impl->m_VariableModel->setDataProgress(var, progress);
                 }
                 else {
                     qCCritical(LOG_VariableController())
                         << tr("Impossible to notify progression of a null variable");
                 }
             }
             void VariableController::onAbortProgressRequested(std::shared_ptr<Variable> variable)
             {
                 auto it = impl->m_VariableToIdentifierMap.find(variable);
                 if (it != impl->m_VariableToIdentifierMap.cend()) {
                     impl->m_VariableAcquisitionWorker->abortProgressRequested(it->second);
                     QUuid varRequestId;
                     auto varIdToVarRequestIdQueueMapIt = impl->m_VarIdToVarRequestIdQueueMap.find(it->second);
                     if (varIdToVarRequestIdQueueMapIt != impl->m_VarIdToVarRequestIdQueueMap.cend()) {
                         auto &varRequestIdQueue = varIdToVarRequestIdQueueMapIt->second;
                         varRequestId = varRequestIdQueue.front();
                         impl->cancelVariableRequest(varRequestId);
                         // Finish the progression for the request
                         impl->m_VariableModel->setDataProgress(variable, 0.0);
                     }
                     else {
                         qCWarning(LOG_VariableController())
                             << tr("Aborting progression of inexistant variable request detected !!!")
                             << QThread::currentThread()->objectName();
                     }
                 }
                 else {
                     qCWarning(LOG_VariableController())
                         << tr("Aborting progression of inexistant variable detected !!!")
                         << QThread::currentThread()->objectName();
                 }
             }
             void VariableController::onAbortAcquisitionRequested(QUuid vIdentifier)
             {
                 qCDebug(LOG_VariableController()) << "TORM: variableController::onAbortAcquisitionRequested"
                                                   << QThread::currentThread()->objectName() << vIdentifier;
                 if (auto var = impl->findVariable(vIdentifier)) {
                     this->onAbortProgressRequested(var);
                 }
                 else {
                     qCCritical(LOG_VariableController())
                         << tr("Impossible to abort Acquisition Requestof a null variable");
                 }
             }
             void VariableController::onAddSynchronizationGroupId(QUuid synchronizationGroupId)
             {
                 qCDebug(LOG_VariableController()) << "TORM: VariableController::onAddSynchronizationGroupId"
                                                   << QThread::currentThread()->objectName()
                                                   << synchronizationGroupId;
                 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);
             }
             void VariableController::onAddSynchronized(std::shared_ptr<Variable> variable,
                                                        QUuid synchronizationGroupId)
             {
                 qCDebug(LOG_VariableController()) << "TORM: VariableController::onAddSynchronized"
                                                   << synchronizationGroupId;
                 auto varToVarIdIt = impl->m_VariableToIdentifierMap.find(variable);
                 if (varToVarIdIt != impl->m_VariableToIdentifierMap.cend()) {
                     auto groupIdToVSGIt
                         = impl->m_GroupIdToVariableSynchronizationGroupMap.find(synchronizationGroupId);
                     if (groupIdToVSGIt != impl->m_GroupIdToVariableSynchronizationGroupMap.cend()) {
                         impl->m_VariableIdGroupIdMap.insert(
                             std::make_pair(varToVarIdIt->second, synchronizationGroupId));
                         groupIdToVSGIt->second->addVariableId(varToVarIdIt->second);
                     }
                     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();
                 }
             }
             void VariableController::desynchronize(std::shared_ptr<Variable> variable,
                                                    QUuid synchronizationGroupId)
             {
                 // Gets variable id
                 auto variableIt = impl->m_VariableToIdentifierMap.find(variable);
                 if (variableIt == impl->m_VariableToIdentifierMap.cend()) {
                     qCCritical(LOG_VariableController())
                         << tr("Can't desynchronize variable %1: variable identifier not found")
                                .arg(variable->name());
                     return;
                 }
                 // Gets synchronization group
                 auto groupIt = impl->m_GroupIdToVariableSynchronizationGroupMap.find(synchronizationGroupId);
                 if (groupIt == impl->m_GroupIdToVariableSynchronizationGroupMap.cend()) {
                     qCCritical(LOG_VariableController())
                         << tr("Can't desynchronize variable %1: unknown synchronization group")
                                .arg(variable->name());
                     return;
                 }
                 auto variableId = variableIt->second;
                 // Removes variable from synchronization group
                 auto synchronizationGroup = groupIt->second;
                 synchronizationGroup->removeVariableId(variableId);
                 // Removes link between variable and synchronization group
                 impl->m_VariableIdGroupIdMap.erase(variableId);
             }
             void VariableController::onRequestDataLoading(QVector<std::shared_ptr<Variable> > variables,
                                                           const SqpRange &range, const SqpRange &oldRange,
                                                           bool synchronise)
             {
                 // NOTE: oldRange isn't really necessary since oldRange == variable->range().
                 // 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.
                 auto varRequestId = QUuid::createUuid();
                 qCDebug(LOG_VariableController()) << "VariableController::onRequestDataLoading"
                                                   << QThread::currentThread()->objectName() << varRequestId;
                 for (const auto &var : variables) {
                     qCDebug(LOG_VariableController()) << "processRequest for" << var->name() << varRequestId;
                     impl->processRequest(var, range, varRequestId);
                 }
                 if (synchronise) {
                     // Get the group ids
                     qCDebug(LOG_VariableController())
                         << "TORM VariableController::onRequestDataLoading for synchro var ENABLE";
                     auto groupIds = std::set<QUuid>{};
                     auto groupIdToOldRangeMap = std::map<QUuid, SqpRange>{};
                     for (const auto &var : variables) {
                         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;
                                 groupIdToOldRangeMap.insert(std::make_pair(gId, var->range()));
                                 if (groupIds.find(gId) == groupIds.cend()) {
                                     qCDebug(LOG_VariableController()) << "Synchro detect group " << gId;
                                     groupIds.insert(gId);
                                 }
                             }
                         }
                     }
                     // We assume here all group ids exist
                     for (const auto &gId : groupIds) {
                         auto vSynchronizationGroup = impl->m_GroupIdToVariableSynchronizationGroupMap.at(gId);
                         auto vSyncIds = vSynchronizationGroup->getIds();
                         qCDebug(LOG_VariableController()) << "Var in synchro group ";
                         for (auto vId : vSyncIds) {
                             auto var = impl->findVariable(vId);
                             // 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, groupIdToOldRangeMap.at(gId));
                                     qCDebug(LOG_VariableController()) << "synchro RR" << vSyncRangeRequested;
                                     impl->processRequest(var, vSyncRangeRequested, varRequestId);
                                 }
                                 else {
                                     qCCritical(LOG_VariableController())
                                         << tr("Impossible to synchronize a null variable");
                                 }
                             }
                         }
                     }
                 }
                 impl->updateVariableRequest(varRequestId);
             }
             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};
             }
             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) {
+                    qCCritical(LOG_VariableController()) << "zoomtype: ZoomOut";
                     zoomType = AcquisitionZoomType::ZoomOut;
                 }
                 else if (range.m_TStart > oldRange.m_TStart && range.m_TEnd > oldRange.m_TEnd) {
+                    qCCritical(LOG_VariableController()) << "zoomtype: PanRight";
                     zoomType = AcquisitionZoomType::PanRight;
                 }
                 else if (range.m_TStart < oldRange.m_TStart && range.m_TEnd < oldRange.m_TEnd) {
+                    qCCritical(LOG_VariableController()) << "zoomtype: PanLeft";
                     zoomType = AcquisitionZoomType::PanLeft;
                 }
                 else if (range.m_TStart > oldRange.m_TStart && oldRange.m_TEnd > range.m_TEnd) {
+                    qCCritical(LOG_VariableController()) << "zoomtype: ZoomIn";
                     zoomType = AcquisitionZoomType::ZoomIn;
                 }
                 else {
                     qCCritical(LOG_VariableController()) << "getZoomType: Unknown type detected";
                 }
                 return zoomType;
             }
             void VariableController::VariableControllerPrivate::processRequest(std::shared_ptr<Variable> var,
                                                                                const SqpRange &rangeRequested,
                                                                                QUuid varRequestId)
             {
                 auto varRequest = VariableRequest{};
                 auto it = m_VariableToIdentifierMap.find(var);
                 if (it != m_VariableToIdentifierMap.cend()) {
                     auto varId = it->second;
                     auto oldRange = getLastRequestedRange(varId);
                     // check for update oldRange to the last request range.
                     if (oldRange == INVALID_RANGE) {
                         oldRange = var->range();
                     }
                     auto varStrategyRangesRequested
                         = m_VariableCacheStrategy->computeRange(oldRange, rangeRequested);
                     auto notInCacheRangeList = QVector<SqpRange>{varStrategyRangesRequested.second};
                     auto inCacheRangeList = QVector<SqpRange>{};
                     if (m_VarIdToVarRequestIdQueueMap.find(varId) == m_VarIdToVarRequestIdQueueMap.cend()) {
                         notInCacheRangeList
                             = var->provideNotInCacheRangeList(varStrategyRangesRequested.second);
                         inCacheRangeList = var->provideInCacheRangeList(varStrategyRangesRequested.second);
                     }
                     if (!notInCacheRangeList.empty()) {
                         varRequest.m_RangeRequested = varStrategyRangesRequested.first;
                         varRequest.m_CacheRangeRequested = varStrategyRangesRequested.second;
                         // store VarRequest
                         storeVariableRequest(varId, varRequestId, varRequest);
                         auto varProvider = m_VariableToProviderMap.at(var);
                         if (varProvider != nullptr) {
                             auto varRequestIdCanceled = m_VariableAcquisitionWorker->pushVariableRequest(
                                 varRequestId, varId, varStrategyRangesRequested.first,
                                 varStrategyRangesRequested.second,
                                 DataProviderParameters{std::move(notInCacheRangeList), var->metadata()},
                                 varProvider);
                             if (!varRequestIdCanceled.isNull()) {
                                 qCDebug(LOG_VariableAcquisitionWorker()) << tr("vsarRequestIdCanceled: ")
                                                                          << varRequestIdCanceled;
                                 cancelVariableRequest(varRequestIdCanceled);
                             }
                         }
                         else {
                             qCCritical(LOG_VariableController())
                                 << "Impossible to provide data with a null provider";
                         }
                         if (!inCacheRangeList.empty()) {
                             emit q->updateVarDisplaying(var, inCacheRangeList.first());
                         }
                     }
                     else {
                         varRequest.m_RangeRequested = varStrategyRangesRequested.first;
                         varRequest.m_CacheRangeRequested = varStrategyRangesRequested.second;
                         // store VarRequest
                         storeVariableRequest(varId, varRequestId, varRequest);
                         acceptVariableRequest(
                             varId, var->dataSeries()->subDataSeries(varStrategyRangesRequested.second));
                     }
                 }
             }
             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;
                 }
                 return var;
             }
             std::shared_ptr<IDataSeries> VariableController::VariableControllerPrivate::retrieveDataSeries(
                 const QVector<AcquisitionDataPacket> acqDataPacketVector)
             {
                 qCDebug(LOG_VariableController()) << tr("TORM: retrieveDataSeries acqDataPacketVector size")
                                                   << acqDataPacketVector.size();
                 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());
                     }
                 }
                 qCDebug(LOG_VariableController()) << tr("TORM: retrieveDataSeries acqDataPacketVector size END")
                                                   << acqDataPacketVector.size();
                 return dataSeries;
             }
             void VariableController::VariableControllerPrivate::registerProvider(
                 std::shared_ptr<IDataProvider> provider)
             {
                 if (m_ProviderSet.find(provider) == m_ProviderSet.end()) {
                     qCDebug(LOG_VariableController()) << tr("Registering of a new provider")
                                                       << provider->objectName();
                     m_ProviderSet.insert(provider);
                     connect(provider.get(), &IDataProvider::dataProvided, m_VariableAcquisitionWorker.get(),
                             &VariableAcquisitionWorker::onVariableDataAcquired);
                     connect(provider.get(), &IDataProvider::dataProvidedProgress,
                             m_VariableAcquisitionWorker.get(),
                             &VariableAcquisitionWorker::onVariableRetrieveDataInProgress);
                     connect(provider.get(), &IDataProvider::dataProvidedFailed,
                             m_VariableAcquisitionWorker.get(),
                             &VariableAcquisitionWorker::onVariableAcquisitionFailed);
                 }
                 else {
                     qCDebug(LOG_VariableController()) << tr("Cannot register provider, it already exists ");
                 }
             }
             void VariableController::VariableControllerPrivate::storeVariableRequest(
                 QUuid varId, QUuid varRequestId, const VariableRequest &varRequest)
             {
                 // First request for the variable. we can create an entry for it
                 auto varIdToVarRequestIdQueueMapIt = m_VarIdToVarRequestIdQueueMap.find(varId);
                 if (varIdToVarRequestIdQueueMapIt == m_VarIdToVarRequestIdQueueMap.cend()) {
                     auto varRequestIdQueue = std::deque<QUuid>{};
                     qCDebug(LOG_VariableController()) << tr("Store REQUEST in  QUEUE");
                     varRequestIdQueue.push_back(varRequestId);
                     m_VarIdToVarRequestIdQueueMap.insert(std::make_pair(varId, std::move(varRequestIdQueue)));
                 }
                 else {
                     qCDebug(LOG_VariableController()) << tr("Store REQUEST in EXISTING QUEUE");
                     auto &varRequestIdQueue = varIdToVarRequestIdQueueMapIt->second;
                     varRequestIdQueue.push_back(varRequestId);
                 }
                 auto varRequestIdToVarIdVarRequestMapIt = m_VarRequestIdToVarIdVarRequestMap.find(varRequestId);
                 if (varRequestIdToVarIdVarRequestMapIt == m_VarRequestIdToVarIdVarRequestMap.cend()) {
                     auto varIdToVarRequestMap = std::map<QUuid, VariableRequest>{};
                     varIdToVarRequestMap.insert(std::make_pair(varId, varRequest));
                     qCDebug(LOG_VariableController()) << tr("Store REQUESTID in MAP");
                     m_VarRequestIdToVarIdVarRequestMap.insert(
                         std::make_pair(varRequestId, std::move(varIdToVarRequestMap)));
                 }
                 else {
                     auto &varIdToVarRequestMap = varRequestIdToVarIdVarRequestMapIt->second;
                     qCDebug(LOG_VariableController()) << tr("Store REQUESTID in EXISTING MAP");
                     varIdToVarRequestMap.insert(std::make_pair(varId, varRequest));
                 }
             }
             QUuid VariableController::VariableControllerPrivate::acceptVariableRequest(
                 QUuid varId, std::shared_ptr<IDataSeries> dataSeries)
             {
                 QUuid varRequestId;
                 auto varIdToVarRequestIdQueueMapIt = m_VarIdToVarRequestIdQueueMap.find(varId);
                 if (varIdToVarRequestIdQueueMapIt != m_VarIdToVarRequestIdQueueMap.cend()) {
                     auto &varRequestIdQueue = varIdToVarRequestIdQueueMapIt->second;
                     varRequestId = varRequestIdQueue.front();
                     auto varRequestIdToVarIdVarRequestMapIt
                         = m_VarRequestIdToVarIdVarRequestMap.find(varRequestId);
                     if (varRequestIdToVarIdVarRequestMapIt != m_VarRequestIdToVarIdVarRequestMap.cend()) {
                         auto &varIdToVarRequestMap = varRequestIdToVarIdVarRequestMapIt->second;
                         auto varIdToVarRequestMapIt = varIdToVarRequestMap.find(varId);
                         if (varIdToVarRequestMapIt != varIdToVarRequestMap.cend()) {
                             qCDebug(LOG_VariableController()) << tr("acceptVariableRequest");
                             auto &varRequest = varIdToVarRequestMapIt->second;
                             varRequest.m_DataSeries = dataSeries;
                             varRequest.m_CanUpdate = true;
                         }
                         else {
                             qCDebug(LOG_VariableController())
                                 << tr("Impossible to acceptVariableRequest of a unknown variable id attached "
                                       "to a variableRequestId")
                                 << varRequestId << varId;
                         }
                     }
                     else {
                         qCCritical(LOG_VariableController())
                             << tr("Impossible to acceptVariableRequest of a unknown variableRequestId")
                             << varRequestId;
                     }
                     varRequestIdQueue.pop_front();
                     if (varRequestIdQueue.empty()) {
                         qCDebug(LOG_VariableController())
                             << tr("TORM Erase REQUEST because it has been accepted") << varId;
                         m_VarIdToVarRequestIdQueueMap.erase(varId);
                     }
                 }
                 else {
                     qCCritical(LOG_VariableController())
                         << tr("Impossible to acceptVariableRequest of a unknown variable id") << varId;
                 }
                 return varRequestId;
             }
             void VariableController::VariableControllerPrivate::updateVariableRequest(QUuid varRequestId)
             {
                 auto varRequestIdToVarIdVarRequestMapIt = m_VarRequestIdToVarIdVarRequestMap.find(varRequestId);
                 if (varRequestIdToVarIdVarRequestMapIt != m_VarRequestIdToVarIdVarRequestMap.cend()) {
                     bool processVariableUpdate = true;
                     auto &varIdToVarRequestMap = varRequestIdToVarIdVarRequestMapIt->second;
                     for (auto varIdToVarRequestMapIt = varIdToVarRequestMap.cbegin();
                          (varIdToVarRequestMapIt != varIdToVarRequestMap.cend()) && processVariableUpdate;
                          ++varIdToVarRequestMapIt) {
                         processVariableUpdate &= varIdToVarRequestMapIt->second.m_CanUpdate;
                         qCDebug(LOG_VariableController()) << tr("updateVariableRequest")
                                                           << processVariableUpdate;
                     }
                     if (processVariableUpdate) {
                         for (auto varIdToVarRequestMapIt = varIdToVarRequestMap.cbegin();
                              varIdToVarRequestMapIt != varIdToVarRequestMap.cend(); ++varIdToVarRequestMapIt) {
                             if (auto var = findVariable(varIdToVarRequestMapIt->first)) {
                                 auto &varRequest = varIdToVarRequestMapIt->second;
                                 var->setRange(varRequest.m_RangeRequested);
                                 var->setCacheRange(varRequest.m_CacheRangeRequested);
                                 qCDebug(LOG_VariableController()) << tr("1: onDataProvided")
                                                                   << varRequest.m_RangeRequested;
                                 qCDebug(LOG_VariableController()) << tr("2: onDataProvided")
                                                                   << varRequest.m_CacheRangeRequested;
                                 var->mergeDataSeries(varRequest.m_DataSeries);
                                 qCDebug(LOG_VariableController()) << tr("3: onDataProvided");
                                 /// @todo MPL: confirm
                                 // Variable update is notified only if there is no pending request for it
                                 //                    if
                                 //                    (m_VarIdToVarRequestIdQueueMap.count(varIdToVarRequestMapIt->first)
                                 //                    == 0) {
                                 emit var->updated();
                                 //                    }
                             }
                             else {
                                 qCCritical(LOG_VariableController())
                                     << tr("Impossible to update data to a null variable");
                             }
                         }
                         // cleaning varRequestId
                         qCDebug(LOG_VariableController()) << tr("0: erase REQUEST in  MAP ?")
                                                           << m_VarRequestIdToVarIdVarRequestMap.size();
                         m_VarRequestIdToVarIdVarRequestMap.erase(varRequestId);
                         qCDebug(LOG_VariableController()) << tr("1: erase REQUEST in  MAP ?")
                                                           << m_VarRequestIdToVarIdVarRequestMap.size();
                     }
                 }
                 else {
                     qCCritical(LOG_VariableController())
                         << tr("Cannot updateVariableRequest for a unknow varRequestId") << varRequestId;
                 }
             }
             void VariableController::VariableControllerPrivate::cancelVariableRequest(QUuid varRequestId)
             {
                 // cleaning varRequestId
                 m_VarRequestIdToVarIdVarRequestMap.erase(varRequestId);
                 for (auto varIdToVarRequestIdQueueMapIt = m_VarIdToVarRequestIdQueueMap.begin();
                      varIdToVarRequestIdQueueMapIt != m_VarIdToVarRequestIdQueueMap.end();) {
                     auto &varRequestIdQueue = varIdToVarRequestIdQueueMapIt->second;
                     varRequestIdQueue.erase(
                         std::remove(varRequestIdQueue.begin(), varRequestIdQueue.end(), varRequestId),
                         varRequestIdQueue.end());
                     if (varRequestIdQueue.empty()) {
                         varIdToVarRequestIdQueueMapIt
                             = m_VarIdToVarRequestIdQueueMap.erase(varIdToVarRequestIdQueueMapIt);
                     }
                     else {
                         ++varIdToVarRequestIdQueueMapIt;
                     }
                 }
             }
             SqpRange VariableController::VariableControllerPrivate::getLastRequestedRange(QUuid varId)
             {
                 auto lastRangeRequested = SqpRange{INVALID_RANGE};
                 auto varIdToVarRequestIdQueueMapIt = m_VarIdToVarRequestIdQueueMap.find(varId);
                 if (varIdToVarRequestIdQueueMapIt != m_VarIdToVarRequestIdQueueMap.cend()) {
                     auto &varRequestIdQueue = varIdToVarRequestIdQueueMapIt->second;
                     auto varRequestId = varRequestIdQueue.back();
                     auto varRequestIdToVarIdVarRequestMapIt
                         = m_VarRequestIdToVarIdVarRequestMap.find(varRequestId);
                     if (varRequestIdToVarIdVarRequestMapIt != m_VarRequestIdToVarIdVarRequestMap.cend()) {
                         auto &varIdToVarRequestMap = varRequestIdToVarIdVarRequestMapIt->second;
                         auto varIdToVarRequestMapIt = varIdToVarRequestMap.find(varId);
                         if (varIdToVarRequestMapIt != varIdToVarRequestMap.cend()) {
                             auto &varRequest = varIdToVarRequestMapIt->second;
                             lastRangeRequested = varRequest.m_RangeRequested;
                         }
                         else {
                             qCDebug(LOG_VariableController())
                                 << tr("Impossible to getLastRequestedRange of a unknown variable id attached "
                                       "to a variableRequestId")
                                 << varRequestId << varId;
                         }
                     }
                     else {
                         qCCritical(LOG_VariableController())
                             << tr("Impossible to getLastRequestedRange of a unknown variableRequestId")
                             << varRequestId;
                     }
                 }
                 else {
                     qDebug(LOG_VariableController())
                         << tr("Impossible to getLastRequestedRange of a unknown variable id") << varId;
                 }
                 return lastRangeRequested;
             }

core/tests/Variable/TestVariableSync.cpp +104 -23

             #include <QObject>
             #include <QtTest>
             #include <memory>
             #include <Data/DataProviderParameters.h>
             #include <Data/IDataProvider.h>
             #include <Data/ScalarSeries.h>
             #include <Time/TimeController.h>
             #include <Variable/Variable.h>
             #include <Variable/VariableController.h>
             #include <Variable/VariableModel.h>
             namespace {
             /// Delay after each operation on the variable before validating it (in ms)
             const auto OPERATION_DELAY = 100;
             /**
              * Generates values according to a range. The value generated for a time t is the number of seconds
              * of difference between t and a reference value (which is midnight -> 00:00:00)
              *
              * Example: For a range between 00:00:10 and 00:00:20, the generated values are
              * {10,11,12,13,14,15,16,17,18,19,20}
              */
             std::vector<double> values(const SqpRange &range)
             {
                 QTime referenceTime{0, 0};
                 std::vector<double> result{};
                 for (auto i = range.m_TStart; i <= range.m_TEnd; ++i) {
                     auto time = DateUtils::dateTime(i).time();
                     result.push_back(referenceTime.secsTo(time));
                 }
                 return result;
             }
             /// Provider used for the tests
             class TestProvider : public IDataProvider {
                 std::shared_ptr<IDataProvider> clone() const { return std::make_shared<TestProvider>(); }
                 void requestDataLoading(QUuid acqIdentifier, const DataProviderParameters &parameters) override
                 {
                     const auto &ranges = parameters.m_Times;
                     for (const auto &range : ranges) {
                         // Generates data series
                         auto valuesData = values(range);
                         std::vector<double> xAxisData{};
                         for (auto i = range.m_TStart; i <= range.m_TEnd; ++i) {
                             xAxisData.push_back(i);
                         }
                         auto dataSeries = std::make_shared<ScalarSeries>(
                             std::move(xAxisData), std::move(valuesData), Unit{"t", true}, Unit{});
                         emit dataProvided(acqIdentifier, dataSeries, range);
                     }
                 }
                 void requestDataAborting(QUuid acqIdentifier) override
                 {
                     // Does nothing
                 }
             };
             /**
              * Interface representing an operation performed on a variable controller.
              * This interface is used in tests to apply a set of operations and check the status of the
              * controller after each operation
              */
             struct IOperation {
                 virtual ~IOperation() = default;
                 /// Executes the operation on the variable controller
                 virtual void exec(VariableController &variableController) const = 0;
             };
             /**
              *Variable creation operation in the controller
              */
             struct Create : public IOperation {
                 explicit Create(int index) : m_Index{index} {}
                 void exec(VariableController &variableController) const override
                 {
                     auto variable = variableController.createVariable(QString::number(m_Index), {},
                                                                       std::make_unique<TestProvider>());
                 }
                 int m_Index; ///< The index of the variable to create in the controller
             };
             /**
              * Variable move/shift operation in the controller
              */
             struct Move : public IOperation {
                 explicit Move(int index, const SqpRange &newRange, bool shift = false)
                         : m_Index{index}, m_NewRange{newRange}, m_Shift{shift}
                 {
                 }
                 void exec(VariableController &variableController) const override
                 {
                     if (auto variable = variableController.variableModel()->variable(m_Index)) {
                         variableController.onRequestDataLoading({variable}, m_NewRange, variable->range(),
                                                                 !m_Shift);
                     }
                 }
                 int m_Index;         ///< The index of the variable to move
                 SqpRange m_NewRange; ///< The new range of the variable
                 bool m_Shift;        ///< Performs a shift (
             };
             /**
              * Variable synchronization/desynchronization operation in the controller
              */
             struct Synchronize : public IOperation {
                 explicit Synchronize(int index, QUuid syncId, bool synchronize = true)
                         : m_Index{index}, m_SyncId{syncId}, m_Synchronize{synchronize}
                 {
                 }
                 void exec(VariableController &variableController) const override
                 {
                     if (auto variable = variableController.variableModel()->variable(m_Index)) {
                         if (m_Synchronize) {
                             variableController.onAddSynchronized(variable, m_SyncId);
                         }
                         else {
                             variableController.desynchronize(variable, m_SyncId);
                         }
                     }
                 }
                 int m_Index;        ///< The index of the variable to sync/desync
                 QUuid m_SyncId;     ///< The synchronization group of the variable
                 bool m_Synchronize; ///< Performs sync or desync operation
             };
             /**
              * Test Iteration
              *
              * A test iteration includes an operation to be performed, and a set of expected ranges after each
              * operation. Each range is tested after the operation to ensure that:
              * - the range of the variable is the expected range
              * - the data of the variable are those generated for the expected range
              */
             struct Iteration {
                 std::shared_ptr<IOperation> m_Operation;  ///< Operation to perform
                 std::map<int, SqpRange> m_ExpectedRanges; ///< Expected ranges (by variable index)
             };
             using Iterations = std::vector<Iteration>;
             } // namespace
             Q_DECLARE_METATYPE(Iterations)
             class TestVariableSync : public QObject {
                 Q_OBJECT
             private slots:
                 /// Input data for @sa testSync()
                 void testSync_data();
                 /// Tests synchronization between variables through several operations
                 void testSync();
             };
-            void TestVariableSync::testSync_data()
+            namespace {
-                // ////////////// //
-                // Test structure //
-                // ////////////// //
-                QTest::addColumn<QUuid>("syncId");
-                QTest::addColumn<SqpRange>("initialRange");
-                QTest::addColumn<Iterations>("iterations");
-                // ////////// //
-                // Test cases //
-                // ////////// //
+            void testSyncCase1()
+            {
                 // Id used to synchronize variables in the controller
                 auto syncId = QUuid::createUuid();
                 /// Generates a range according to a start time and a end time (the date is the same)
                 auto range = [](const QTime &startTime, const QTime &endTime) {
                     return SqpRange{DateUtils::secondsSinceEpoch(QDateTime{{2017, 1, 1}, startTime, Qt::UTC}),
                                     DateUtils::secondsSinceEpoch(QDateTime{{2017, 1, 1}, endTime, Qt::UTC})};
                 };
                 auto initialRange = range({12, 0}, {13, 0});
                 Iterations iterations{};
                 // Creates variables var0, var1 and var2
                 iterations.push_back({std::make_shared<Create>(0), {{0, initialRange}}});
                 iterations.push_back({std::make_shared<Create>(1), {{0, initialRange}, {1, initialRange}}});
                 iterations.push_back(
                     {std::make_shared<Create>(2), {{0, initialRange}, {1, initialRange}, {2, initialRange}}});
                 // Adds variables into the sync group (ranges don't need to be tested here)
                 iterations.push_back({std::make_shared<Synchronize>(0, syncId)});
                 iterations.push_back({std::make_shared<Synchronize>(1, syncId)});
                 iterations.push_back({std::make_shared<Synchronize>(2, syncId)});
                 // Moves var0: ranges of var0, var1 and var2 change
                 auto newRange = range({12, 30}, {13, 30});
                 iterations.push_back(
                     {std::make_shared<Move>(0, newRange), {{0, newRange}, {1, newRange}, {2, newRange}}});
                 // Moves var1: ranges of var0, var1 and var2 change
                 newRange = range({13, 0}, {14, 0});
                 iterations.push_back(
                     {std::make_shared<Move>(0, newRange), {{0, newRange}, {1, newRange}, {2, newRange}}});
                 // Moves var2: ranges of var0, var1 and var2 change
                 newRange = range({13, 30}, {14, 30});
                 iterations.push_back(
                     {std::make_shared<Move>(0, newRange), {{0, newRange}, {1, newRange}, {2, newRange}}});
                 // Desyncs var2 and moves var0:
                 // - ranges of var0 and var1 change
                 // - range of var2 doesn't change anymore
                 auto var2Range = newRange;
                 newRange = range({13, 45}, {14, 45});
                 iterations.push_back({std::make_shared<Synchronize>(2, syncId, false)});
                 iterations.push_back(
                     {std::make_shared<Move>(0, newRange), {{0, newRange}, {1, newRange}, {2, var2Range}}});
                 // Shifts var0: although var1 is synchronized with var0, its range doesn't change
                 auto var1Range = newRange;
                 newRange = range({14, 45}, {15, 45});
                 iterations.push_back({std::make_shared<Move>(0, newRange, true),
                                       {{0, newRange}, {1, var1Range}, {2, var2Range}}});
                 // Moves var0 through several operations:
                 // - range of var0 changes
                 // - range or var1 changes according to the previous shift (one hour)
                 auto moveVar0 = [&iterations](const auto &var0NewRange, const auto &var1ExpectedRange) {
                     iterations.push_back(
                         {std::make_shared<Move>(0, var0NewRange), {{0, var0NewRange}, {1, var1ExpectedRange}}});
                 };
                 // Pan left
                 moveVar0(range({14, 30}, {15, 30}), range({13, 30}, {14, 30}));
                 // Pan right
                 moveVar0(range({16, 0}, {17, 0}), range({15, 0}, {16, 0}));
                 // Zoom in
                 moveVar0(range({16, 30}, {16, 45}), range({15, 30}, {15, 45}));
                 // Zoom out
                 moveVar0(range({12, 0}, {18, 0}), range({11, 0}, {17, 0}));
-                QTest::newRow("sync1") << syncId << initialRange << std::move(iterations);
+                QTest::newRow("sync1") << syncId << initialRange << std::move(iterations) << 200;
+            }
+            void testSyncCase2()
+            {
+                // Id used to synchronize variables in the controller
+                auto syncId = QUuid::createUuid();
+                /// Generates a range according to a start time and a end time (the date is the same)
+                auto dateTime = [](int year, int month, int day, int hours, int minutes, int seconds) {
+                    return DateUtils::secondsSinceEpoch(
+                        QDateTime{{year, month, day}, QTime{hours, minutes, seconds}, Qt::UTC});
+                };
+                auto initialRange = SqpRange{dateTime(2017, 1, 1, 12, 0, 0), dateTime(2017, 1, 1, 13, 0, 0)};
+                Iterations iterations{};
+                // Creates variables var0 and var1
+                iterations.push_back({std::make_shared<Create>(0), {{0, initialRange}}});
+                iterations.push_back({std::make_shared<Create>(1), {{0, initialRange}, {1, initialRange}}});
+                // Adds variables into the sync group (ranges don't need to be tested here)
+                iterations.push_back({std::make_shared<Synchronize>(0, syncId)});
+                iterations.push_back({std::make_shared<Synchronize>(1, syncId)});
+                // Moves var0 through several operations:
+                // - range of var0 changes
+                // - range or var1 changes according to the previous shift (one hour)
+                auto moveVar0 = [&iterations](const auto &var0NewRange) {
+                    iterations.push_back(
+                        {std::make_shared<Move>(0, var0NewRange), {{0, var0NewRange}, {1, var0NewRange}}});
+                };
+                moveVar0(SqpRange{dateTime(2017, 1, 1, 12, 0, 0), dateTime(2017, 1, 1, 13, 0, 0)});
+                moveVar0(SqpRange{dateTime(2017, 1, 1, 14, 0, 0), dateTime(2017, 1, 1, 15, 0, 0)});
+                moveVar0(SqpRange{dateTime(2017, 1, 1, 8, 0, 0), dateTime(2017, 1, 1, 9, 0, 0)});
+                //    moveVar0(SqpRange{dateTime(2017, 1, 1, 7, 30, 0), dateTime(2017, 1, 1, 9, 30, 0)});
+                moveVar0(SqpRange{dateTime(2017, 1, 1, 2, 0, 0), dateTime(2017, 1, 1, 4, 0, 0)});
+                moveVar0(SqpRange{dateTime(2017, 1, 1, 6, 0, 0), dateTime(2017, 1, 1, 8, 0, 0)});
+                moveVar0(SqpRange{dateTime(2017, 1, 10, 6, 0, 0), dateTime(2017, 1, 15, 8, 0, 0)});
+                moveVar0(SqpRange{dateTime(2017, 1, 17, 6, 0, 0), dateTime(2017, 1, 25, 8, 0, 0)});
+                moveVar0(SqpRange{dateTime(2017, 1, 2, 6, 0, 0), dateTime(2017, 1, 8, 8, 0, 0)});
+                moveVar0(SqpRange{dateTime(2017, 4, 10, 6, 0, 0), dateTime(2017, 6, 15, 8, 0, 0)});
+                moveVar0(SqpRange{dateTime(2017, 1, 17, 6, 0, 0), dateTime(2017, 2, 25, 8, 0, 0)});
+                moveVar0(SqpRange{dateTime(2017, 7, 2, 6, 0, 0), dateTime(2017, 10, 8, 8, 0, 0)});
+                moveVar0(SqpRange{dateTime(2017, 4, 10, 6, 0, 0), dateTime(2017, 6, 15, 8, 0, 0)});
+                moveVar0(SqpRange{dateTime(2017, 1, 17, 6, 0, 0), dateTime(2017, 2, 25, 8, 0, 0)});
+                moveVar0(SqpRange{dateTime(2017, 7, 2, 6, 0, 0), dateTime(2017, 10, 8, 8, 0, 0)});
+                moveVar0(SqpRange{dateTime(2017, 4, 10, 6, 0, 0), dateTime(2017, 6, 15, 8, 0, 0)});
+                moveVar0(SqpRange{dateTime(2017, 1, 17, 6, 0, 0), dateTime(2017, 2, 25, 8, 0, 0)});
+                moveVar0(SqpRange{dateTime(2017, 7, 2, 6, 0, 0), dateTime(2017, 10, 8, 8, 0, 0)});
+                moveVar0(SqpRange{dateTime(2017, 4, 10, 6, 0, 0), dateTime(2017, 6, 15, 8, 0, 0)});
+                moveVar0(SqpRange{dateTime(2017, 1, 17, 6, 0, 0), dateTime(2017, 2, 25, 8, 0, 0)});
+                moveVar0(SqpRange{dateTime(2017, 7, 2, 6, 0, 0), dateTime(2017, 10, 8, 8, 0, 0)});
+                QTest::newRow("sync2") << syncId << initialRange << iterations << 4000;
+                //    QTest::newRow("sync3") << syncId << initialRange << iterations << 5000;
+            }
+            }
+            void TestVariableSync::testSync_data()
+            {
+                // ////////////// //
+                // Test structure //
+                // ////////////// //
+                QTest::addColumn<QUuid>("syncId");
+                QTest::addColumn<SqpRange>("initialRange");
+                QTest::addColumn<Iterations>("iterations");
+                QTest::addColumn<int>("operationDelay");
+                // ////////// //
+                // Test cases //
+                // ////////// //
+                testSyncCase1();
+                testSyncCase2();
             }
             void TestVariableSync::testSync()
             {
                 // Inits controllers
                 TimeController timeController{};
                 VariableController variableController{};
                 variableController.setTimeController(&timeController);
                 QFETCH(QUuid, syncId);
                 QFETCH(SqpRange, initialRange);
                 timeController.onTimeToUpdate(initialRange);
                 // Synchronization group used
                 variableController.onAddSynchronizationGroupId(syncId);
-                // For each iteration:
+                auto validateRanges = [&variableController](const auto &expectedRanges) {
-                // - execute operation
+                    for (const auto &expectedRangeEntry : expectedRanges) {
-                // - compare the variables' state to the expected states
-                QFETCH(Iterations, iterations);
-                for (const auto &iteration : iterations) {
-                    iteration.m_Operation->exec(variableController);
-                    QTest::qWait(OPERATION_DELAY);
-                    for (const auto &expectedRangeEntry : iteration.m_ExpectedRanges) {
                         auto variableIndex = expectedRangeEntry.first;
                         auto expectedRange = expectedRangeEntry.second;
                         // Gets the variable in the controller
                         auto variable = variableController.variableModel()->variable(variableIndex);
                         // Compares variable's range to the expected range
                         QVERIFY(variable != nullptr);
                         auto range = variable->range();
                         QCOMPARE(range, expectedRange);
                         // Compares variable's data with values expected for its range
                         auto dataSeries = variable->dataSeries();
                         QVERIFY(dataSeries != nullptr);
                         auto it = dataSeries->xAxisRange(range.m_TStart, range.m_TEnd);
                         auto expectedValues = values(range);
+                        qInfo() << std::distance(it.first, it.second) << expectedValues.size();
                         QVERIFY(std::equal(it.first, it.second, expectedValues.cbegin(), expectedValues.cend(),
                                            [](const auto &dataSeriesIt, const auto &expectedValue) {
                                                return dataSeriesIt.value() == expectedValue;
                                            }));
                     }
+                };
+                // For each iteration:
+                // - execute operation
+                // - compare the variables' state to the expected states
+                QFETCH(Iterations, iterations);
+                QFETCH(int, operationDelay);
+                for (const auto &iteration : iterations) {
+                    iteration.m_Operation->exec(variableController);
+                    QTest::qWait(operationDelay);
+                    validateRanges(iteration.m_ExpectedRanges);
+                }
+                for (const auto &iteration : iterations) {
+                    iteration.m_Operation->exec(variableController);
                 }
+                QTest::qWait(operationDelay);
+                validateRanges(iterations.back().m_ExpectedRanges);
             }
             QTEST_MAIN(TestVariableSync)
             #include "TestVariableSync.moc"

gui/src/Visualization/VisualizationZoneWidget.cpp +4 -2

             #include "Visualization/VisualizationZoneWidget.h"
             #include "Visualization/IVisualizationWidgetVisitor.h"
             #include "Visualization/QCustomPlotSynchronizer.h"
             #include "Visualization/VisualizationGraphWidget.h"
             #include "ui_VisualizationZoneWidget.h"
             #include <Data/SqpRange.h>
             #include <Variable/Variable.h>
             #include <Variable/VariableController.h>
             #include <QUuid>
             #include <SqpApplication.h>
             #include <cmath>
             Q_LOGGING_CATEGORY(LOG_VisualizationZoneWidget, "VisualizationZoneWidget")
             namespace {
             /// Minimum height for graph added in zones (in pixels)
             const auto GRAPH_MINIMUM_HEIGHT = 300;
             /// Generates a default name for a new graph, according to the number of graphs already displayed in
             /// the zone
             QString defaultGraphName(const QLayout &layout)
             {
                 auto count = 0;
                 for (auto i = 0; i < layout.count(); ++i) {
                     if (dynamic_cast<VisualizationGraphWidget *>(layout.itemAt(i)->widget())) {
                         count++;
                     }
                 }
                 return QObject::tr("Graph %1").arg(count + 1);
             }
             /**
              * Applies a function to all graphs of the zone represented by its layout
              * @param layout the layout that contains graphs
              * @param fun the function to apply to each graph
              */
             template <typename Fun>
             void processGraphs(QLayout &layout, Fun fun)
             {
                 for (auto i = 0; i < layout.count(); ++i) {
                     if (auto item = layout.itemAt(i)) {
                         if (auto visualizationGraphWidget
                             = dynamic_cast<VisualizationGraphWidget *>(item->widget())) {
                             fun(*visualizationGraphWidget);
                         }
                     }
                 }
             }
             } // namespace
             struct VisualizationZoneWidget::VisualizationZoneWidgetPrivate {
                 explicit VisualizationZoneWidgetPrivate()
                         : m_SynchronisationGroupId{QUuid::createUuid()},
                           m_Synchronizer{std::make_unique<QCustomPlotSynchronizer>()}
                 {
                 }
                 QUuid m_SynchronisationGroupId;
                 std::unique_ptr<IGraphSynchronizer> m_Synchronizer;
             };
             VisualizationZoneWidget::VisualizationZoneWidget(const QString &name, QWidget *parent)
                     : QWidget{parent},
                       ui{new Ui::VisualizationZoneWidget},
                       impl{spimpl::make_unique_impl<VisualizationZoneWidgetPrivate>()}
             {
                 ui->setupUi(this);
                 ui->zoneNameLabel->setText(name);
                 // 'Close' options : widget is deleted when closed
                 setAttribute(Qt::WA_DeleteOnClose);
                 connect(ui->closeButton, &QToolButton::clicked, this, &VisualizationZoneWidget::close);
                 ui->closeButton->setIcon(sqpApp->style()->standardIcon(QStyle::SP_TitleBarCloseButton));
                 // Synchronisation id
                 QMetaObject::invokeMethod(&sqpApp->variableController(), "onAddSynchronizationGroupId",
                                           Qt::QueuedConnection, Q_ARG(QUuid, impl->m_SynchronisationGroupId));
             }
             VisualizationZoneWidget::~VisualizationZoneWidget()
             {
                 delete ui;
             }
             void VisualizationZoneWidget::addGraph(VisualizationGraphWidget *graphWidget)
             {
                 // Synchronize new graph with others in the zone
                 impl->m_Synchronizer->addGraph(*graphWidget);
                 ui->visualizationZoneFrame->layout()->addWidget(graphWidget);
             }
             VisualizationGraphWidget *VisualizationZoneWidget::createGraph(std::shared_ptr<Variable> variable)
             {
                 auto graphWidget = new VisualizationGraphWidget{
                     defaultGraphName(*ui->visualizationZoneFrame->layout()), this};
                 // Set graph properties
                 graphWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding);
                 graphWidget->setMinimumHeight(GRAPH_MINIMUM_HEIGHT);
                 // Lambda to synchronize zone widget
                 auto synchronizeZoneWidget = [this, graphWidget](const SqpRange &graphRange,
                                                                  const SqpRange &oldGraphRange) {
                     auto zoomType = VariableController::getZoomType(graphRange, oldGraphRange);
                     auto frameLayout = ui->visualizationZoneFrame->layout();
                     for (auto i = 0; i < frameLayout->count(); ++i) {
                         auto graphChild
                             = dynamic_cast<VisualizationGraphWidget *>(frameLayout->itemAt(i)->widget());
                         if (graphChild && (graphChild != graphWidget)) {
                             auto graphChildRange = graphChild->graphRange();
                             switch (zoomType) {
                                 case AcquisitionZoomType::ZoomIn: {
                                     auto deltaLeft = graphRange.m_TStart - oldGraphRange.m_TStart;
                                     auto deltaRight = oldGraphRange.m_TEnd - graphRange.m_TEnd;
                                     graphChildRange.m_TStart += deltaLeft;
                                     graphChildRange.m_TEnd -= deltaRight;
                                     qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: ZoomIn");
                                     qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: deltaLeft")
                                                                            << deltaLeft;
                                     qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: deltaRight")
                                                                            << deltaRight;
                                     qCDebug(LOG_VisualizationZoneWidget())
                                         << tr("TORM: dt") << graphRange.m_TEnd - graphRange.m_TStart;
                                     break;
                                 }
                                 case AcquisitionZoomType::ZoomOut: {
                                     qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: ZoomOut");
                                     auto deltaLeft = oldGraphRange.m_TStart - graphRange.m_TStart;
                                     auto deltaRight = graphRange.m_TEnd - oldGraphRange.m_TEnd;
                                     qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: deltaLeft")
                                                                            << deltaLeft;
                                     qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: deltaRight")
                                                                            << deltaRight;
                                     qCDebug(LOG_VisualizationZoneWidget())
                                         << tr("TORM: dt") << graphRange.m_TEnd - graphRange.m_TStart;
                                     graphChildRange.m_TStart -= deltaLeft;
                                     graphChildRange.m_TEnd += deltaRight;
                                     break;
                                 }
                                 case AcquisitionZoomType::PanRight: {
                                     qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: PanRight");
+                                    auto deltaLeft = graphRange.m_TStart - oldGraphRange.m_TStart;
                                     auto deltaRight = graphRange.m_TEnd - oldGraphRange.m_TEnd;
-                                    graphChildRange.m_TStart += deltaRight;
+                                    graphChildRange.m_TStart += deltaLeft;
                                     graphChildRange.m_TEnd += deltaRight;
                                     qCDebug(LOG_VisualizationZoneWidget())
                                         << tr("TORM: dt") << graphRange.m_TEnd - graphRange.m_TStart;
                                     break;
                                 }
                                 case AcquisitionZoomType::PanLeft: {
                                     qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: PanLeft");
                                     auto deltaLeft = oldGraphRange.m_TStart - graphRange.m_TStart;
+                                    auto deltaRight = oldGraphRange.m_TEnd - graphRange.m_TEnd;
                                     graphChildRange.m_TStart -= deltaLeft;
-                                    graphChildRange.m_TEnd -= deltaLeft;
+                                    graphChildRange.m_TEnd -= deltaRight;
                                     break;
                                 }
                                 case AcquisitionZoomType::Unknown: {
                                     qCDebug(LOG_VisualizationZoneWidget())
                                         << tr("Impossible to synchronize: zoom type unknown");
                                     break;
                                 }
                                 default:
                                     qCCritical(LOG_VisualizationZoneWidget())
                                         << tr("Impossible to synchronize: zoom type not take into account");
                                     // No action
                                     break;
                             }
                             graphChild->enableAcquisition(false);
                             qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: Range before: ")
                                                                    << graphChild->graphRange();
                             qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: Range after : ")
                                                                    << graphChildRange;
                             qCDebug(LOG_VisualizationZoneWidget())
                                 << tr("TORM: child dt") << graphChildRange.m_TEnd - graphChildRange.m_TStart;
                             graphChild->setGraphRange(graphChildRange);
                             graphChild->enableAcquisition(true);
                         }
                     }
                 };
                 // connection for synchronization
                 connect(graphWidget, &VisualizationGraphWidget::synchronize, synchronizeZoneWidget);
                 connect(graphWidget, &VisualizationGraphWidget::variableAdded, this,
                         &VisualizationZoneWidget::onVariableAdded);
                 connect(graphWidget, &VisualizationGraphWidget::variableAboutToBeRemoved, this,
                         &VisualizationZoneWidget::onVariableAboutToBeRemoved);
                 auto range = SqpRange{};
                 // Apply visitor to graph children
                 auto layout = ui->visualizationZoneFrame->layout();
                 if (layout->count() > 0) {
                     // Case of a new graph in a existant zone
                     if (auto visualizationGraphWidget
                         = dynamic_cast<VisualizationGraphWidget *>(layout->itemAt(0)->widget())) {
                         range = visualizationGraphWidget->graphRange();
                     }
                 }
                 else {
                     // Case of a new graph as the first of the zone
                     range = variable->range();
                 }
                 this->addGraph(graphWidget);
                 graphWidget->addVariable(variable, range);
                 // get y using variable range
                 if (auto dataSeries = variable->dataSeries()) {
                     dataSeries->lockRead();
                     auto valuesBounds
                         = dataSeries->valuesBounds(variable->range().m_TStart, variable->range().m_TEnd);
                     auto end = dataSeries->cend();
                     if (valuesBounds.first != end && valuesBounds.second != end) {
                         auto rangeValue = [](const auto &value) { return std::isnan(value) ? 0. : value; };
                         auto minValue = rangeValue(valuesBounds.first->minValue());
                         auto maxValue = rangeValue(valuesBounds.second->maxValue());
                         graphWidget->setYRange(SqpRange{minValue, maxValue});
                     }
                     dataSeries->unlock();
                 }
                 return graphWidget;
             }
             void VisualizationZoneWidget::accept(IVisualizationWidgetVisitor *visitor)
             {
                 if (visitor) {
                     visitor->visitEnter(this);
                     // Apply visitor to graph children: widgets different from graphs are not visited (no
                     // action)
                     processGraphs(
                         *ui->visualizationZoneFrame->layout(),
                         [visitor](VisualizationGraphWidget &graphWidget) { graphWidget.accept(visitor); });
                     visitor->visitLeave(this);
                 }
                 else {
                     qCCritical(LOG_VisualizationZoneWidget()) << tr("Can't visit widget : the visitor is null");
                 }
             }
             bool VisualizationZoneWidget::canDrop(const Variable &variable) const
             {
                 // A tab can always accomodate a variable
                 Q_UNUSED(variable);
                 return true;
             }
             bool VisualizationZoneWidget::contains(const Variable &variable) const
             {
                 Q_UNUSED(variable);
                 return false;
             }
             QString VisualizationZoneWidget::name() const
             {
                 return ui->zoneNameLabel->text();
             }
             void VisualizationZoneWidget::closeEvent(QCloseEvent *event)
             {
                 // Closes graphs in the zone
                 processGraphs(*ui->visualizationZoneFrame->layout(),
                               [](VisualizationGraphWidget &graphWidget) { graphWidget.close(); });
                 // Delete synchronization group from variable controller
                 QMetaObject::invokeMethod(&sqpApp->variableController(), "onRemoveSynchronizationGroupId",
                                           Qt::QueuedConnection, Q_ARG(QUuid, impl->m_SynchronisationGroupId));
                 QWidget::closeEvent(event);
             }
             void VisualizationZoneWidget::onVariableAdded(std::shared_ptr<Variable> variable)
             {
                 QMetaObject::invokeMethod(&sqpApp->variableController(), "onAddSynchronized",
                                           Qt::QueuedConnection, Q_ARG(std::shared_ptr<Variable>, variable),
                                           Q_ARG(QUuid, impl->m_SynchronisationGroupId));
             }
             void VisualizationZoneWidget::onVariableAboutToBeRemoved(std::shared_ptr<Variable> variable)
             {
                 QMetaObject::invokeMethod(&sqpApp->variableController(), "desynchronize", Qt::QueuedConnection,
                                           Q_ARG(std::shared_ptr<Variable>, variable),
                                           Q_ARG(QUuid, impl->m_SynchronisationGroupId));
             }

General Comments 3

perrinel

|

Auto status change to "Under Review"

perrinel

|

Status change > Approved

Write
Preview

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

	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