HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r806:a502cf5c12a9

Merge pull request from SciQLop-fork develop...

perrinel -

r806:a502cf5c12a9

parent child

Context file:

r806:a502cf5c12a9

core/include/Data/DataSeries.h 0 -9

             #ifndef SCIQLOP_DATASERIES_H
             #define SCIQLOP_DATASERIES_H
             #include "CoreGlobal.h"
             #include <Common/SortUtils.h>
             #include <Data/ArrayData.h>
             #include <Data/DataSeriesMergeHelper.h>
             #include <Data/IDataSeries.h>
             #include <QLoggingCategory>
             #include <QReadLocker>
             #include <QReadWriteLock>
             #include <memory>
             // We don't use the Qt macro since the log is used in the header file, which causes multiple log
             // definitions with inheritance. Inline method is used instead
             inline const QLoggingCategory &LOG_DataSeries()
             {
                 static const QLoggingCategory category{"DataSeries"};
                 return category;
             }
             template <int Dim>
             class DataSeries;
             namespace dataseries_detail {
             template <int Dim, bool IsConst>
             class IteratorValue : public DataSeriesIteratorValue::Impl {
             public:
                 friend class DataSeries<Dim>;
                 template <bool IC = IsConst, typename = std::enable_if_t<IC == false> >
                 explicit IteratorValue(DataSeries<Dim> &dataSeries, bool begin)
                         : m_XIt(begin ? dataSeries.xAxisData()->begin() : dataSeries.xAxisData()->end()),
                           m_ValuesIt(begin ? dataSeries.valuesData()->begin() : dataSeries.valuesData()->end())
                 {
                 }
                 template <bool IC = IsConst, typename = std::enable_if_t<IC == true> >
                 explicit IteratorValue(const DataSeries<Dim> &dataSeries, bool begin)
                         : m_XIt(begin ? dataSeries.xAxisData()->cbegin() : dataSeries.xAxisData()->cend()),
                           m_ValuesIt(begin ? dataSeries.valuesData()->cbegin()
                                            : dataSeries.valuesData()->cend())
                 {
                 }
                 IteratorValue(const IteratorValue &other) = default;
                 std::unique_ptr<DataSeriesIteratorValue::Impl> clone() const override
                 {
                     return std::make_unique<IteratorValue<Dim, IsConst> >(*this);
                 }
                 int distance(const DataSeriesIteratorValue::Impl &other) const override try {
                     const auto &otherImpl = dynamic_cast<const IteratorValue &>(other);
                     return m_XIt->distance(*otherImpl.m_XIt);
                 }
                 catch (const std::bad_cast &) {
                     return 0;
                 }
                 bool equals(const DataSeriesIteratorValue::Impl &other) const override try {
                     const auto &otherImpl = dynamic_cast<const IteratorValue &>(other);
                     return std::tie(m_XIt, m_ValuesIt) == std::tie(otherImpl.m_XIt, otherImpl.m_ValuesIt);
                 }
                 catch (const std::bad_cast &) {
                     return false;
                 }
                 bool lowerThan(const DataSeriesIteratorValue::Impl &other) const override try {
                     const auto &otherImpl = dynamic_cast<const IteratorValue &>(other);
                     return m_XIt->lowerThan(*otherImpl.m_XIt);
                 }
                 catch (const std::bad_cast &) {
                     return false;
                 }
                 std::unique_ptr<DataSeriesIteratorValue::Impl> advance(int offset) const override
                 {
                     auto result = clone();
                     result->next(offset);
                     return result;
                 }
                 void next(int offset) override
                 {
                     m_XIt->next(offset);
                     m_ValuesIt->next(offset);
                 }
                 void prev() override
                 {
                     --m_XIt;
                     --m_ValuesIt;
                 }
                 double x() const override { return m_XIt->at(0); }
                 double value() const override { return m_ValuesIt->at(0); }
                 double value(int componentIndex) const override { return m_ValuesIt->at(componentIndex); }
                 double minValue() const override { return m_ValuesIt->min(); }
                 double maxValue() const override { return m_ValuesIt->max(); }
                 QVector<double> values() const override { return m_ValuesIt->values(); }
                 void swap(DataSeriesIteratorValue::Impl &other) override
                 {
                     auto &otherImpl = dynamic_cast<IteratorValue &>(other);
                     m_XIt->impl()->swap(*otherImpl.m_XIt->impl());
                     m_ValuesIt->impl()->swap(*otherImpl.m_ValuesIt->impl());
                 }
             private:
                 ArrayDataIterator m_XIt;
                 ArrayDataIterator m_ValuesIt;
             };
             } // namespace dataseries_detail
             /**
              * @brief The DataSeries class is the base (abstract) implementation of IDataSeries.
              *
              * It proposes to set a dimension for the values data.
              *
              * A DataSeries is always sorted on its x-axis data.
              *
              * @tparam Dim The dimension of the values data
              *
              */
             template <int Dim>
             class SCIQLOP_CORE_EXPORT DataSeries : public IDataSeries {
                 friend class DataSeriesMergeHelper;
             public:
                 /// @sa IDataSeries::xAxisData()
                 std::shared_ptr<ArrayData<1> > xAxisData() override { return m_XAxisData; }
                 const std::shared_ptr<ArrayData<1> > xAxisData() const { return m_XAxisData; }
                 /// @sa IDataSeries::xAxisUnit()
                 Unit xAxisUnit() const override { return m_XAxisUnit; }
                 /// @return the values dataset
                 std::shared_ptr<ArrayData<Dim> > valuesData() { return m_ValuesData; }
                 const std::shared_ptr<ArrayData<Dim> > valuesData() const { return m_ValuesData; }
                 /// @sa IDataSeries::valuesUnit()
                 Unit valuesUnit() const override { return m_ValuesUnit; }
                 int nbPoints() const override { return m_XAxisData->totalSize() + m_ValuesData->totalSize(); }
-                SqpRange range() const override
-                    if (!m_XAxisData->cdata().empty()) {
-                        return SqpRange{m_XAxisData->cdata().front(), m_XAxisData->cdata().back()};
-                    return SqpRange{};
                 void clear()
                 {
                     m_XAxisData->clear();
                     m_ValuesData->clear();
                 }
                 bool isEmpty() const noexcept { return m_XAxisData->size() == 0; }
                 /// Merges into the data series an other data series
                 /// @remarks the data series to merge with is cleared after the operation
                 void merge(IDataSeries *dataSeries) override
                 {
                     dataSeries->lockWrite();
                     lockWrite();
                     if (auto other = dynamic_cast<DataSeries<Dim> *>(dataSeries)) {
                         DataSeriesMergeHelper::merge(*other, *this);
                     }
                     else {
                         qCWarning(LOG_DataSeries())
                             << QObject::tr("Detection of a type of IDataSeries we cannot merge with !");
                     }
                     unlock();
                     dataSeries->unlock();
                 }
                 void purge(double min, double max) override
                 {
                     // Nothing to purge if series is empty
                     if (isEmpty()) {
                         return;
                     }
                     if (min > max) {
                         std::swap(min, max);
                     }
                     // Nothing to purge if series min/max are inside purge range
                     auto xMin = cbegin()->x();
                     auto xMax = (--cend())->x();
                     if (xMin >= min && xMax <= max) {
                         return;
                     }
                     auto lowerIt = std::lower_bound(
                         begin(), end(), min, [](const auto &it, const auto &val) { return it.x() < val; });
                     erase(begin(), lowerIt);
                     auto upperIt = std::upper_bound(
                         begin(), end(), max, [](const auto &val, const auto &it) { return val < it.x(); });
                     erase(upperIt, end());
                 }
                 // ///////// //
                 // Iterators //
                 // ///////// //
                 DataSeriesIterator begin() override
                 {
                     return DataSeriesIterator{DataSeriesIteratorValue{
                         std::make_unique<dataseries_detail::IteratorValue<Dim, false> >(*this, true)}};
                 }
                 DataSeriesIterator end() override
                 {
                     return DataSeriesIterator{DataSeriesIteratorValue{
                         std::make_unique<dataseries_detail::IteratorValue<Dim, false> >(*this, false)}};
                 }
                 DataSeriesIterator cbegin() const override
                 {
                     return DataSeriesIterator{DataSeriesIteratorValue{
                         std::make_unique<dataseries_detail::IteratorValue<Dim, true> >(*this, true)}};
                 }
                 DataSeriesIterator cend() const override
                 {
                     return DataSeriesIterator{DataSeriesIteratorValue{
                         std::make_unique<dataseries_detail::IteratorValue<Dim, true> >(*this, false)}};
                 }
                 void erase(DataSeriesIterator first, DataSeriesIterator last)
                 {
                     auto firstImpl
                         = dynamic_cast<dataseries_detail::IteratorValue<Dim, false> *>(first->impl());
                     auto lastImpl = dynamic_cast<dataseries_detail::IteratorValue<Dim, false> *>(last->impl());
                     if (firstImpl && lastImpl) {
                         m_XAxisData->erase(firstImpl->m_XIt, lastImpl->m_XIt);
                         m_ValuesData->erase(firstImpl->m_ValuesIt, lastImpl->m_ValuesIt);
                     }
                 }
                 void insert(DataSeriesIterator first, DataSeriesIterator last, bool prepend = false)
                 {
                     auto firstImpl = dynamic_cast<dataseries_detail::IteratorValue<Dim, true> *>(first->impl());
                     auto lastImpl = dynamic_cast<dataseries_detail::IteratorValue<Dim, true> *>(last->impl());
                     if (firstImpl && lastImpl) {
                         m_XAxisData->insert(firstImpl->m_XIt, lastImpl->m_XIt, prepend);
                         m_ValuesData->insert(firstImpl->m_ValuesIt, lastImpl->m_ValuesIt, prepend);
                     }
                 }
                 /// @sa IDataSeries::minXAxisData()
                 DataSeriesIterator minXAxisData(double minXAxisData) const override
                 {
                     return std::lower_bound(
                         cbegin(), cend(), minXAxisData,
                         [](const auto &itValue, const auto &value) { return itValue.x() < value; });
                 }
                 /// @sa IDataSeries::maxXAxisData()
                 DataSeriesIterator maxXAxisData(double maxXAxisData) const override
                 {
                     // Gets the first element that greater than max value
                     auto it = std::upper_bound(
                         cbegin(), cend(), maxXAxisData,
                         [](const auto &value, const auto &itValue) { return value < itValue.x(); });
                     return it == cbegin() ? cend() : --it;
                 }
                 std::pair<DataSeriesIterator, DataSeriesIterator> xAxisRange(double minXAxisData,
                                                                              double maxXAxisData) const override
                 {
                     if (minXAxisData > maxXAxisData) {
                         std::swap(minXAxisData, maxXAxisData);
                     }
                     auto begin = cbegin();
                     auto end = cend();
                     auto lowerIt = std::lower_bound(
                         begin, end, minXAxisData,
                         [](const auto &itValue, const auto &value) { return itValue.x() < value; });
                     auto upperIt = std::upper_bound(
                         lowerIt, end, maxXAxisData,
                         [](const auto &value, const auto &itValue) { return value < itValue.x(); });
                     return std::make_pair(lowerIt, upperIt);
                 }
                 std::pair<DataSeriesIterator, DataSeriesIterator>
                 valuesBounds(double minXAxisData, double maxXAxisData) const override
                 {
                     // Places iterators to the correct x-axis range
                     auto xAxisRangeIts = xAxisRange(minXAxisData, maxXAxisData);
                     // Returns end iterators if the range is empty
                     if (xAxisRangeIts.first == xAxisRangeIts.second) {
                         return std::make_pair(cend(), cend());
                     }
                     // Gets the iterator on the min of all values data
                     auto minIt = std::min_element(
                         xAxisRangeIts.first, xAxisRangeIts.second, [](const auto &it1, const auto &it2) {
                             return SortUtils::minCompareWithNaN(it1.minValue(), it2.minValue());
                         });
                     // Gets the iterator on the max of all values data
                     auto maxIt = std::max_element(
                         xAxisRangeIts.first, xAxisRangeIts.second, [](const auto &it1, const auto &it2) {
                             return SortUtils::maxCompareWithNaN(it1.maxValue(), it2.maxValue());
                         });
                     return std::make_pair(minIt, maxIt);
                 }
                 // /////// //
                 // Mutexes //
                 // /////// //
                 virtual void lockRead() { m_Lock.lockForRead(); }
                 virtual void lockWrite() { m_Lock.lockForWrite(); }
                 virtual void unlock() { m_Lock.unlock(); }
             protected:
                 /// Protected ctor (DataSeries is abstract). The vectors must have the same size, otherwise a
                 /// DataSeries with no values will be created.
                 /// @remarks data series is automatically sorted on its x-axis data
                 explicit DataSeries(std::shared_ptr<ArrayData<1> > xAxisData, const Unit &xAxisUnit,
                                     std::shared_ptr<ArrayData<Dim> > valuesData, const Unit &valuesUnit)
                         : m_XAxisData{xAxisData},
                           m_XAxisUnit{xAxisUnit},
                           m_ValuesData{valuesData},
                           m_ValuesUnit{valuesUnit}
                 {
                     if (m_XAxisData->size() != m_ValuesData->size()) {
                         clear();
                     }
                     // Sorts data if it's not the case
                     const auto &xAxisCData = m_XAxisData->cdata();
                     if (!std::is_sorted(xAxisCData.cbegin(), xAxisCData.cend())) {
                         sort();
                     }
                 }
                 /// Copy ctor
                 explicit DataSeries(const DataSeries<Dim> &other)
                         : m_XAxisData{std::make_shared<ArrayData<1> >(*other.m_XAxisData)},
                           m_XAxisUnit{other.m_XAxisUnit},
                           m_ValuesData{std::make_shared<ArrayData<Dim> >(*other.m_ValuesData)},
                           m_ValuesUnit{other.m_ValuesUnit}
                 {
                     // Since a series is ordered from its construction and is always ordered, it is not
                     // necessary to call the sort method here ('other' is sorted)
                 }
                 /// Assignment operator
                 template <int D>
                 DataSeries &operator=(DataSeries<D> other)
                 {
                     std::swap(m_XAxisData, other.m_XAxisData);
                     std::swap(m_XAxisUnit, other.m_XAxisUnit);
                     std::swap(m_ValuesData, other.m_ValuesData);
                     std::swap(m_ValuesUnit, other.m_ValuesUnit);
                     return *this;
                 }
             private:
                 /**
                  * Sorts data series on its x-axis data
                  */
                 void sort() noexcept
                 {
                     auto permutation = SortUtils::sortPermutation(*m_XAxisData, std::less<double>());
                     m_XAxisData = m_XAxisData->sort(permutation);
                     m_ValuesData = m_ValuesData->sort(permutation);
                 }
                 std::shared_ptr<ArrayData<1> > m_XAxisData;
                 Unit m_XAxisUnit;
                 std::shared_ptr<ArrayData<Dim> > m_ValuesData;
                 Unit m_ValuesUnit;
                 QReadWriteLock m_Lock;
             };
             #endif // SCIQLOP_DATASERIES_H

core/include/Data/IDataSeries.h 0 -2

             #ifndef SCIQLOP_IDATASERIES_H
             #define SCIQLOP_IDATASERIES_H
             #include <Common/MetaTypes.h>
             #include <Data/DataSeriesIterator.h>
             #include <Data/SqpRange.h>
             #include <memory>
             #include <QString>
             template <int Dim>
             class ArrayData;
             struct Unit {
                 explicit Unit(const QString &name = {}, bool timeUnit = false)
                         : m_Name{name}, m_TimeUnit{timeUnit}
                 {
                 }
                 inline bool operator==(const Unit &other) const
                 {
                     return std::tie(m_Name, m_TimeUnit) == std::tie(other.m_Name, other.m_TimeUnit);
                 }
                 inline bool operator!=(const Unit &other) const { return !(*this == other); }
                 QString m_Name;  ///< Unit name
                 bool m_TimeUnit; ///< The unit is a unit of time (UTC)
             };
             /**
              * @brief The IDataSeries aims to declare a data series.
              *
              * A data series is an entity that contains at least :
              * - one dataset representing the x-axis
              * - one dataset representing the values
              *
              * Each dataset is represented by an ArrayData, and is associated with a unit.
              *
              * An ArrayData can be unidimensional or two-dimensional, depending on the implementation of the
              * IDataSeries. The x-axis dataset is always unidimensional.
              *
              * @sa ArrayData
              */
             class IDataSeries {
             public:
                 virtual ~IDataSeries() noexcept = default;
                 /// Returns the x-axis dataset
                 virtual std::shared_ptr<ArrayData<1> > xAxisData() = 0;
                 /// Returns the x-axis dataset (as const)
                 virtual const std::shared_ptr<ArrayData<1> > xAxisData() const = 0;
                 virtual Unit xAxisUnit() const = 0;
                 virtual Unit valuesUnit() const = 0;
                 virtual void merge(IDataSeries *dataSeries) = 0;
                 /// Removes from data series all entries whose value on the x-axis is not between min and max
                 virtual void purge(double min, double max) = 0;
                 /// @todo Review the name and signature of this method
                 virtual std::shared_ptr<IDataSeries> subDataSeries(const SqpRange &range) = 0;
                 virtual std::unique_ptr<IDataSeries> clone() const = 0;
                 /// @return the total number of points contained in the data series
                 virtual int nbPoints() const = 0;
-                virtual SqpRange range() const = 0;
                 // ///////// //
                 // Iterators //
                 // ///////// //
                 virtual DataSeriesIterator cbegin() const = 0;
                 virtual DataSeriesIterator cend() const = 0;
                 virtual DataSeriesIterator begin() = 0;
                 virtual DataSeriesIterator end() = 0;
                 /// @return the iterator to the first entry of the data series whose x-axis data is greater than
                 /// or equal to the value passed in parameter, or the end iterator if there is no matching value
                 virtual DataSeriesIterator minXAxisData(double minXAxisData) const = 0;
                 /// @return the iterator to the last entry of the data series whose x-axis data is less than or
                 /// equal to the value passed in parameter, or the end iterator if there is no matching value
                 virtual DataSeriesIterator maxXAxisData(double maxXAxisData) const = 0;
                 /// @return the iterators pointing to the range of data whose x-axis values are between min and
                 /// max passed in parameters
                 virtual std::pair<DataSeriesIterator, DataSeriesIterator>
                 xAxisRange(double minXAxisData, double maxXAxisData) const = 0;
                 /// @return two iterators pointing to the data that have respectively the min and the max value
                 /// data of a data series' range. The search is performed for a given x-axis range.
                 /// @sa xAxisRange()
                 virtual std::pair<DataSeriesIterator, DataSeriesIterator>
                 valuesBounds(double minXAxisData, double maxXAxisData) const = 0;
                 // /////// //
                 // Mutexes //
                 // /////// //
                 virtual void lockRead() = 0;
                 virtual void lockWrite() = 0;
                 virtual void unlock() = 0;
             };
             // Required for using shared_ptr in signals/slots
             SCIQLOP_REGISTER_META_TYPE(IDATASERIES_PTR_REGISTRY, std::shared_ptr<IDataSeries>)
             #endif // SCIQLOP_IDATASERIES_H

core/src/Variable/VariableController.cpp +1 -3

             #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 deltaRight = graphRange.m_TEnd - oldGraphRange.m_TEnd;
                         varRangeRequested.m_TStart += deltaRight;
                         varRangeRequested.m_TEnd += deltaRight;
                         break;
                     }
                     case AcquisitionZoomType::PanLeft: {
                         auto deltaLeft = oldGraphRange.m_TStart - graphRange.m_TStart;
                         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;
             }
             }
             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);
                 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) {
                     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;
             }
             void VariableController::VariableControllerPrivate::processRequest(std::shared_ptr<Variable> var,
                                                                                const SqpRange &rangeRequested,
                                                                                QUuid varRequestId)
             {
                 // TODO: protect at
                 auto varRequest = VariableRequest{};
                 auto varId = m_VariableToIdentifierMap.at(var);
                 auto varStrategyRangesRequested
                     = m_VariableCacheStrategy->computeRange(var->range(), 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")
+                                qCDebug(LOG_VariableController()) << tr("3: onDataProvided");
-                                                                  << varRequest.m_DataSeries->range();
-                                qCDebug(LOG_VariableController()) << tr("4: 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;
                     }
                 }
             }

core/tests/Data/TestDataSeries.cpp +75 -4

             #include "Data/DataSeries.h"
             #include "Data/ScalarSeries.h"
             #include "Data/VectorSeries.h"
             #include <cmath>
             #include <QObject>
             #include <QtTest>
             Q_DECLARE_METATYPE(std::shared_ptr<ScalarSeries>)
             Q_DECLARE_METATYPE(std::shared_ptr<VectorSeries>)
             namespace {
             using DataContainer = std::vector<double>;
             void validateRange(DataSeriesIterator first, DataSeriesIterator last, const DataContainer &xData,
                                const DataContainer &valuesData)
             {
                 QVERIFY(std::equal(first, last, xData.cbegin(), xData.cend(),
                                    [](const auto &it, const auto &expectedX) { return it.x() == expectedX; }));
                 QVERIFY(std::equal(
                     first, last, valuesData.cbegin(), valuesData.cend(),
                     [](const auto &it, const auto &expectedVal) { return it.value() == expectedVal; }));
             }
             void validateRange(DataSeriesIterator first, DataSeriesIterator last, const DataContainer &xData,
                                const std::vector<DataContainer> &valuesData)
             {
                 QVERIFY(std::equal(first, last, xData.cbegin(), xData.cend(),
                                    [](const auto &it, const auto &expectedX) { return it.x() == expectedX; }));
                 for (auto i = 0; i < valuesData.size(); ++i) {
                     auto componentData = valuesData.at(i);
                     QVERIFY(std::equal(
                         first, last, componentData.cbegin(), componentData.cend(),
                         [i](const auto &it, const auto &expectedVal) { return it.value(i) == expectedVal; }));
                 }
             }
             } // namespace
             class TestDataSeries : public QObject {
                 Q_OBJECT
             private:
                 template <typename T>
                 void testValuesBoundsStructure()
                 {
                     // ////////////// //
                     // Test structure //
                     // ////////////// //
                     // Data series to get values bounds
                     QTest::addColumn<std::shared_ptr<T> >("dataSeries");
                     // x-axis range
                     QTest::addColumn<double>("minXAxis");
                     QTest::addColumn<double>("maxXAxis");
                     // Expected results
                     QTest::addColumn<bool>(
                         "expectedOK"); // Test is expected to be ok (i.e. method doesn't return end iterators)
                     QTest::addColumn<double>("expectedMinValue");
                     QTest::addColumn<double>("expectedMaxValue");
                 }
                 template <typename T>
                 void testValuesBounds()
                 {
                     QFETCH(std::shared_ptr<T>, dataSeries);
                     QFETCH(double, minXAxis);
                     QFETCH(double, maxXAxis);
                     QFETCH(bool, expectedOK);
                     QFETCH(double, expectedMinValue);
                     QFETCH(double, expectedMaxValue);
                     auto minMaxIts = dataSeries->valuesBounds(minXAxis, maxXAxis);
                     auto end = dataSeries->cend();
                     // Checks iterators with expected result
                     QCOMPARE(expectedOK, minMaxIts.first != end && minMaxIts.second != end);
                     if (expectedOK) {
                         auto compare = [](const auto &v1, const auto &v2) {
                             return (std::isnan(v1) && std::isnan(v2)) || v1 == v2;
                         };
                         QVERIFY(compare(expectedMinValue, minMaxIts.first->minValue()));
                         QVERIFY(compare(expectedMaxValue, minMaxIts.second->maxValue()));
                     }
                 }
                 template <typename T>
                 void testPurgeStructure()
                 {
                     // ////////////// //
                     // Test structure //
                     // ////////////// //
                     // Data series to purge
                     QTest::addColumn<std::shared_ptr<T> >("dataSeries");
                     QTest::addColumn<double>("min");
                     QTest::addColumn<double>("max");
                     // Expected values after purge
                     QTest::addColumn<DataContainer>("expectedXAxisData");
                     QTest::addColumn<std::vector<DataContainer> >("expectedValuesData");
                 }
                 template <typename T>
                 void testPurge()
                 {
                     QFETCH(std::shared_ptr<T>, dataSeries);
                     QFETCH(double, min);
                     QFETCH(double, max);
                     dataSeries->purge(min, max);
                     // Validates results
                     QFETCH(DataContainer, expectedXAxisData);
                     QFETCH(std::vector<DataContainer>, expectedValuesData);
                     validateRange(dataSeries->cbegin(), dataSeries->cend(), expectedXAxisData,
                                   expectedValuesData);
                 }
+                template <typename SourceType, typename DestType>
+                void testMergeDifferentTypesStructure()
+                {
+                    // ////////////// //
+                    // Test structure //
+                    // ////////////// //
+                    // Data series to merge
+                    QTest::addColumn<std::shared_ptr<DestType> >("dest");
+                    QTest::addColumn<std::shared_ptr<SourceType> >("source");
+                    // Expected values in the dest data series after merge
+                    QTest::addColumn<DataContainer>("expectedXAxisData");
+                    QTest::addColumn<DataContainer>("expectedValuesData");
+                }
+                template <typename SourceType, typename DestType>
+                void testMergeDifferentTypes()
+                {
+                    // Merges series
+                    QFETCH(std::shared_ptr<SourceType>, source);
+                    QFETCH(std::shared_ptr<DestType>, dest);
+                    dest->merge(source.get());
+                    // Validates results : we check that the merge is valid and the data series is sorted on its
+                    // x-axis data
+                    QFETCH(DataContainer, expectedXAxisData);
+                    QFETCH(DataContainer, expectedValuesData);
+                    validateRange(dest->cbegin(), dest->cend(), expectedXAxisData, expectedValuesData);
+                }
             private slots:
                 /// Input test data
                 /// @sa testCtor()
                 void testCtor_data();
                 /// Tests construction of a data series
                 void testCtor();
                 /// Input test data
                 /// @sa testMerge()
                 void testMerge_data();
                 /// Tests merge of two data series
                 void testMerge();
                 /// Input test data
+                /// @sa testMergeVectorInScalar()
+                void testMergeVectorInScalar_data();
+                /// Tests merge of vector series in scalar series
+                void testMergeVectorInScalar();
+                /// Input test data
                 /// @sa testPurgeScalar()
                 void testPurgeScalar_data();
                 /// Tests purge of a scalar series
                 void testPurgeScalar();
                 /// Input test data
                 /// @sa testPurgeVector()
                 void testPurgeVector_data();
                 /// Tests purge of a vector series
                 void testPurgeVector();
                 /// Input test data
                 /// @sa testMinXAxisData()
                 void testMinXAxisData_data();
                 /// Tests get min x-axis data of a data series
                 void testMinXAxisData();
                 /// Input test data
                 /// @sa testMaxXAxisData()
                 void testMaxXAxisData_data();
                 /// Tests get max x-axis data of a data series
                 void testMaxXAxisData();
                 /// Input test data
                 /// @sa testXAxisRange()
                 void testXAxisRange_data();
                 /// Tests get x-axis range of a data series
                 void testXAxisRange();
                 /// Input test data
                 /// @sa testValuesBoundsScalar()
                 void testValuesBoundsScalar_data();
                 /// Tests get values bounds of a scalar series
                 void testValuesBoundsScalar();
                 /// Input test data
                 /// @sa testValuesBoundsVector()
                 void testValuesBoundsVector_data();
                 /// Tests get values bounds of a vector series
                 void testValuesBoundsVector();
             };
             void TestDataSeries::testCtor_data()
             {
                 // ////////////// //
                 // Test structure //
                 // ////////////// //
                 // x-axis data
                 QTest::addColumn<DataContainer>("xAxisData");
                 // values data
                 QTest::addColumn<DataContainer>("valuesData");
                 // expected x-axis data
                 QTest::addColumn<DataContainer>("expectedXAxisData");
                 // expected values data
                 QTest::addColumn<DataContainer>("expectedValuesData");
                 // ////////// //
                 // Test cases //
                 // ////////// //
                 QTest::newRow("invalidData (different sizes of vectors)")
                     << DataContainer{1., 2., 3., 4., 5.} << DataContainer{100., 200., 300.} << DataContainer{}
                     << DataContainer{};
                 QTest::newRow("sortedData") << DataContainer{1., 2., 3., 4., 5.}
                                             << DataContainer{100., 200., 300., 400., 500.}
                                             << DataContainer{1., 2., 3., 4., 5.}
                                             << DataContainer{100., 200., 300., 400., 500.};
                 QTest::newRow("unsortedData") << DataContainer{5., 4., 3., 2., 1.}
                                               << DataContainer{100., 200., 300., 400., 500.}
                                               << DataContainer{1., 2., 3., 4., 5.}
                                               << DataContainer{500., 400., 300., 200., 100.};
                 QTest::newRow("unsortedData2")
                     << DataContainer{1., 4., 3., 5., 2.} << DataContainer{100., 200., 300., 400., 500.}
                     << DataContainer{1., 2., 3., 4., 5.} << DataContainer{100., 500., 300., 200., 400.};
             }
             void TestDataSeries::testCtor()
             {
                 // Creates series
                 QFETCH(DataContainer, xAxisData);
                 QFETCH(DataContainer, valuesData);
                 auto series = std::make_shared<ScalarSeries>(std::move(xAxisData), std::move(valuesData),
                                                              Unit{}, Unit{});
                 // Validates results : we check that the data series is sorted on its x-axis data
                 QFETCH(DataContainer, expectedXAxisData);
                 QFETCH(DataContainer, expectedValuesData);
                 validateRange(series->cbegin(), series->cend(), expectedXAxisData, expectedValuesData);
             }
             namespace {
             std::shared_ptr<ScalarSeries> createScalarSeries(DataContainer xAxisData, DataContainer valuesData)
             {
                 return std::make_shared<ScalarSeries>(std::move(xAxisData), std::move(valuesData), Unit{},
                                                       Unit{});
             }
             std::shared_ptr<VectorSeries> createVectorSeries(DataContainer xAxisData, DataContainer xValuesData,
                                                              DataContainer yValuesData,
                                                              DataContainer zValuesData)
             {
                 return std::make_shared<VectorSeries>(std::move(xAxisData), std::move(xValuesData),
                                                       std::move(yValuesData), std::move(zValuesData), Unit{},
                                                       Unit{});
             }
             } // namespace
             void TestDataSeries::testMerge_data()
             {
                 // ////////////// //
                 // Test structure //
                 // ////////////// //
                 // Data series to merge
                 QTest::addColumn<std::shared_ptr<ScalarSeries> >("dataSeries");
                 QTest::addColumn<std::shared_ptr<ScalarSeries> >("dataSeries2");
                 // Expected values in the first data series after merge
                 QTest::addColumn<DataContainer>("expectedXAxisData");
                 QTest::addColumn<DataContainer>("expectedValuesData");
                 // ////////// //
                 // Test cases //
                 // ////////// //
                 QTest::newRow("sortedMerge")
                     << createScalarSeries({1., 2., 3., 4., 5.}, {100., 200., 300., 400., 500.})
                     << createScalarSeries({6., 7., 8., 9., 10.}, {600., 700., 800., 900., 1000.})
                     << DataContainer{1., 2., 3., 4., 5., 6., 7., 8., 9., 10.}
                     << DataContainer{100., 200., 300., 400., 500., 600., 700., 800., 900., 1000.};
                 QTest::newRow("unsortedMerge")
                     << createScalarSeries({6., 7., 8., 9., 10.}, {600., 700., 800., 900., 1000.})
                     << createScalarSeries({1., 2., 3., 4., 5.}, {100., 200., 300., 400., 500.})
                     << DataContainer{1., 2., 3., 4., 5., 6., 7., 8., 9., 10.}
                     << DataContainer{100., 200., 300., 400., 500., 600., 700., 800., 900., 1000.};
                 QTest::newRow("unsortedMerge2 (merge not made because source is in the bounds of dest)")
                     << createScalarSeries({1., 2., 8., 9., 10}, {100., 200., 800., 900., 1000.})
                     << createScalarSeries({3., 4., 5., 6., 7.}, {300., 400., 500., 600., 700.})
                     << DataContainer{1., 2., 8., 9., 10.} << DataContainer{100., 200., 800., 900., 1000.};
                 QTest::newRow("unsortedMerge3")
                     << createScalarSeries({3., 4., 5., 7., 8}, {300., 400., 500., 700., 800.})
                     << createScalarSeries({1., 2., 3., 7., 10.}, {100., 200., 333., 777., 1000.})
                     << DataContainer{1., 2., 3., 4., 5., 7., 8., 10.}
                     << DataContainer{100., 200., 300., 400., 500., 700., 800., 1000.};
+                QTest::newRow("emptySource") << createScalarSeries({3., 4., 5., 7., 8},
+                                                                   {300., 400., 500., 700., 800.})
+                                             << createScalarSeries({}, {}) << DataContainer{3., 4., 5., 7., 8.}
+                                             << DataContainer{300., 400., 500., 700., 800.};
             }
             void TestDataSeries::testMerge()
             {
                 // Merges series
                 QFETCH(std::shared_ptr<ScalarSeries>, dataSeries);
                 QFETCH(std::shared_ptr<ScalarSeries>, dataSeries2);
                 dataSeries->merge(dataSeries2.get());
                 // Validates results : we check that the merge is valid and the data series is sorted on its
                 // x-axis data
                 QFETCH(DataContainer, expectedXAxisData);
                 QFETCH(DataContainer, expectedValuesData);
                 validateRange(dataSeries->cbegin(), dataSeries->cend(), expectedXAxisData, expectedValuesData);
             }
+            void TestDataSeries::testMergeVectorInScalar_data()
+            {
+                testMergeDifferentTypesStructure<VectorSeries, ScalarSeries>();
+                // ////////// //
+                // Test cases //
+                // ////////// //
+                QTest::newRow("purgeVectorInScalar")
+                    << createScalarSeries({1., 2., 3., 4., 5.}, {100., 200., 300., 400., 500.})
+                    << createVectorSeries({6., 7., 8., 9., 10.}, {600., 700., 800., 900., 1000.},
+                                          {610., 710., 810., 910., 1010.}, {620., 720., 820., 920., 1020.})
+                    << DataContainer{1., 2., 3., 4., 5.} << DataContainer{100., 200., 300., 400., 500.};
+            }
+            void TestDataSeries::testMergeVectorInScalar()
+            {
+                testMergeDifferentTypes<VectorSeries, ScalarSeries>();
+            }
             void TestDataSeries::testPurgeScalar_data()
             {
                 testPurgeStructure<ScalarSeries>();
                 // ////////// //
                 // Test cases //
                 // ////////// //
                 QTest::newRow("purgeScalar") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                    {100., 200., 300., 400., 500.})
                                              << 2. << 4. << DataContainer{2., 3., 4.}
                                              << std::vector<DataContainer>{{200., 300., 400.}};
+                QTest::newRow("purgeScalar1 (min/max swap)")
+                    << createScalarSeries({1., 2., 3., 4., 5.}, {100., 200., 300., 400., 500.}) << 4. << 2.
+                    << DataContainer{2., 3., 4.} << std::vector<DataContainer>{{200., 300., 400.}};
                 QTest::newRow("purgeScalar2") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                     {100., 200., 300., 400., 500.})
                                               << 0. << 2.5 << DataContainer{1., 2.}
                                               << std::vector<DataContainer>{{100., 200.}};
                 QTest::newRow("purgeScalar3") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                     {100., 200., 300., 400., 500.})
                                               << 3.5 << 7. << DataContainer{4., 5.}
                                               << std::vector<DataContainer>{{400., 500.}};
                 QTest::newRow("purgeScalar4") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                     {100., 200., 300., 400., 500.})
                                               << 0. << 7. << DataContainer{1., 2., 3., 4., 5.}
                                               << std::vector<DataContainer>{{100., 200., 300., 400., 500.}};
                 QTest::newRow("purgeScalar5") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                     {100., 200., 300., 400., 500.})
                                               << 5.5 << 7. << DataContainer{} << std::vector<DataContainer>{{}};
             }
             void TestDataSeries::testPurgeScalar()
             {
                 testPurge<ScalarSeries>();
             }
             void TestDataSeries::testPurgeVector_data()
             {
                 testPurgeStructure<VectorSeries>();
                 // ////////// //
                 // Test cases //
                 // ////////// //
                 QTest::newRow("purgeVector") << createVectorSeries({1., 2., 3., 4., 5.}, {6., 7., 8., 9., 10.},
                                                                    {11., 12., 13., 14., 15.},
                                                                    {16., 17., 18., 19., 20.})
                                              << 2. << 4. << DataContainer{2., 3., 4.}
                                              << std::vector<DataContainer>{
                                                     {7., 8., 9.}, {12., 13., 14.}, {17., 18., 19.}};
             }
             void TestDataSeries::testPurgeVector()
             {
                 testPurge<VectorSeries>();
             }
             void TestDataSeries::testMinXAxisData_data()
             {
                 // ////////////// //
                 // Test structure //
                 // ////////////// //
                 // Data series to get min data
                 QTest::addColumn<std::shared_ptr<ScalarSeries> >("dataSeries");
                 // Min data
                 QTest::addColumn<double>("min");
                 // Expected results
                 QTest::addColumn<bool>(
                     "expectedOK"); // if true, expects to have a result (i.e. the iterator != end iterator)
                 QTest::addColumn<double>(
                     "expectedMin"); // Expected value when method doesn't return end iterator
                 // ////////// //
                 // Test cases //
                 // ////////// //
                 QTest::newRow("minData1") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                 {100., 200., 300., 400., 500.})
                                           << 0. << true << 1.;
                 QTest::newRow("minData2") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                 {100., 200., 300., 400., 500.})
                                           << 1. << true << 1.;
                 QTest::newRow("minData3") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                 {100., 200., 300., 400., 500.})
                                           << 1.1 << true << 2.;
                 QTest::newRow("minData4") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                 {100., 200., 300., 400., 500.})
                                           << 5. << true << 5.;
                 QTest::newRow("minData5") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                 {100., 200., 300., 400., 500.})
                                           << 5.1 << false << std::numeric_limits<double>::quiet_NaN();
                 QTest::newRow("minData6") << createScalarSeries({}, {}) << 1.1 << false
                                           << std::numeric_limits<double>::quiet_NaN();
             }
             void TestDataSeries::testMinXAxisData()
             {
                 QFETCH(std::shared_ptr<ScalarSeries>, dataSeries);
                 QFETCH(double, min);
                 QFETCH(bool, expectedOK);
                 QFETCH(double, expectedMin);
                 auto it = dataSeries->minXAxisData(min);
                 QCOMPARE(expectedOK, it != dataSeries->cend());
                 // If the method doesn't return a end iterator, checks with expected value
                 if (expectedOK) {
                     QCOMPARE(expectedMin, it->x());
                 }
             }
             void TestDataSeries::testMaxXAxisData_data()
             {
                 // ////////////// //
                 // Test structure //
                 // ////////////// //
                 // Data series to get max data
                 QTest::addColumn<std::shared_ptr<ScalarSeries> >("dataSeries");
                 // Max data
                 QTest::addColumn<double>("max");
                 // Expected results
                 QTest::addColumn<bool>(
                     "expectedOK"); // if true, expects to have a result (i.e. the iterator != end iterator)
                 QTest::addColumn<double>(
                     "expectedMax"); // Expected value when method doesn't return end iterator
                 // ////////// //
                 // Test cases //
                 // ////////// //
                 QTest::newRow("maxData1") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                 {100., 200., 300., 400., 500.})
                                           << 6. << true << 5.;
                 QTest::newRow("maxData2") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                 {100., 200., 300., 400., 500.})
                                           << 5. << true << 5.;
                 QTest::newRow("maxData3") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                 {100., 200., 300., 400., 500.})
                                           << 4.9 << true << 4.;
                 QTest::newRow("maxData4") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                 {100., 200., 300., 400., 500.})
                                           << 1.1 << true << 1.;
                 QTest::newRow("maxData5") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                 {100., 200., 300., 400., 500.})
                                           << 1. << true << 1.;
                 QTest::newRow("maxData6") << createScalarSeries({}, {}) << 1.1 << false
                                           << std::numeric_limits<double>::quiet_NaN();
             }
             void TestDataSeries::testMaxXAxisData()
             {
                 QFETCH(std::shared_ptr<ScalarSeries>, dataSeries);
                 QFETCH(double, max);
                 QFETCH(bool, expectedOK);
                 QFETCH(double, expectedMax);
                 auto it = dataSeries->maxXAxisData(max);
                 QCOMPARE(expectedOK, it != dataSeries->cend());
                 // If the method doesn't return a end iterator, checks with expected value
                 if (expectedOK) {
                     QCOMPARE(expectedMax, it->x());
                 }
             }
             void TestDataSeries::testXAxisRange_data()
             {
                 // ////////////// //
                 // Test structure //
                 // ////////////// //
                 // Data series to get x-axis range
                 QTest::addColumn<std::shared_ptr<ScalarSeries> >("dataSeries");
                 // Min/max values
                 QTest::addColumn<double>("min");
                 QTest::addColumn<double>("max");
                 // Expected values
                 QTest::addColumn<DataContainer>("expectedXAxisData");
                 QTest::addColumn<DataContainer>("expectedValuesData");
                 // ////////// //
                 // Test cases //
                 // ////////// //
-                QTest::newRow("xAxisRange1") << createScalarSeries({1., 2., 3., 4., 5.},
+                QTest::newRow("xAxisRange") << createScalarSeries({1., 2., 3., 4., 5.},
-                                                                   {100., 200., 300., 400., 500.})
+                                                                  {100., 200., 300., 400., 500.})
-                                             << -1. << 3.2 << DataContainer{1., 2., 3.}
+                                            << -1. << 3.2 << DataContainer{1., 2., 3.}
-                                             << DataContainer{100., 200., 300.};
+                                            << DataContainer{100., 200., 300.};
+                QTest::newRow("xAxisRange1 (min/max swap)")
+                    << createScalarSeries({1., 2., 3., 4., 5.}, {100., 200., 300., 400., 500.}) << 3.2 << -1.
+                    << DataContainer{1., 2., 3.} << DataContainer{100., 200., 300.};
                 QTest::newRow("xAxisRange2") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                    {100., 200., 300., 400., 500.})
                                              << 1. << 4. << DataContainer{1., 2., 3., 4.}
                                              << DataContainer{100., 200., 300., 400.};
                 QTest::newRow("xAxisRange3") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                    {100., 200., 300., 400., 500.})
                                              << 1. << 3.9 << DataContainer{1., 2., 3.}
                                              << DataContainer{100., 200., 300.};
                 QTest::newRow("xAxisRange4") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                    {100., 200., 300., 400., 500.})
                                              << 0. << 0.9 << DataContainer{} << DataContainer{};
                 QTest::newRow("xAxisRange5") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                    {100., 200., 300., 400., 500.})
                                              << 0. << 1. << DataContainer{1.} << DataContainer{100.};
                 QTest::newRow("xAxisRange6") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                    {100., 200., 300., 400., 500.})
                                              << 2.1 << 6. << DataContainer{3., 4., 5.}
                                              << DataContainer{300., 400., 500.};
                 QTest::newRow("xAxisRange7") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                    {100., 200., 300., 400., 500.})
                                              << 6. << 9. << DataContainer{} << DataContainer{};
                 QTest::newRow("xAxisRange8") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                    {100., 200., 300., 400., 500.})
                                              << 5. << 9. << DataContainer{5.} << DataContainer{500.};
             }
             void TestDataSeries::testXAxisRange()
             {
                 QFETCH(std::shared_ptr<ScalarSeries>, dataSeries);
                 QFETCH(double, min);
                 QFETCH(double, max);
                 QFETCH(DataContainer, expectedXAxisData);
                 QFETCH(DataContainer, expectedValuesData);
                 auto bounds = dataSeries->xAxisRange(min, max);
                 validateRange(bounds.first, bounds.second, expectedXAxisData, expectedValuesData);
             }
             void TestDataSeries::testValuesBoundsScalar_data()
             {
                 testValuesBoundsStructure<ScalarSeries>();
                 // ////////// //
                 // Test cases //
                 // ////////// //
                 auto nan = std::numeric_limits<double>::quiet_NaN();
                 QTest::newRow("scalarBounds1")
                     << createScalarSeries({1., 2., 3., 4., 5.}, {100., 200., 300., 400., 500.}) << 0. << 6.
                     << true << 100. << 500.;
                 QTest::newRow("scalarBounds2")
                     << createScalarSeries({1., 2., 3., 4., 5.}, {100., 200., 300., 400., 500.}) << 2. << 4.
                     << true << 200. << 400.;
                 QTest::newRow("scalarBounds3")
                     << createScalarSeries({1., 2., 3., 4., 5.}, {100., 200., 300., 400., 500.}) << 0. << 0.5
                     << false << nan << nan;
                 QTest::newRow("scalarBounds4")
                     << createScalarSeries({1., 2., 3., 4., 5.}, {100., 200., 300., 400., 500.}) << 5.1 << 6.
                     << false << nan << nan;
                 QTest::newRow("scalarBounds5") << createScalarSeries({1.}, {100.}) << 0. << 2. << true << 100.
                                                << 100.;
                 QTest::newRow("scalarBounds6") << createScalarSeries({}, {}) << 0. << 2. << false << nan << nan;
                 // Tests with NaN values: NaN values are not included in min/max search
                 QTest::newRow("scalarBounds7")
                     << createScalarSeries({1., 2., 3., 4., 5.}, {nan, 200., 300., 400., nan}) << 0. << 6.
                     << true << 200. << 400.;
                 QTest::newRow("scalarBounds8")
                     << createScalarSeries({1., 2., 3., 4., 5.}, {nan, nan, nan, nan, nan}) << 0. << 6. << true
                     << std::numeric_limits<double>::quiet_NaN() << std::numeric_limits<double>::quiet_NaN();
             }
             void TestDataSeries::testValuesBoundsScalar()
             {
                 testValuesBounds<ScalarSeries>();
             }
             void TestDataSeries::testValuesBoundsVector_data()
             {
                 testValuesBoundsStructure<VectorSeries>();
                 // ////////// //
                 // Test cases //
                 // ////////// //
                 auto nan = std::numeric_limits<double>::quiet_NaN();
                 QTest::newRow("vectorBounds1")
                     << createVectorSeries({1., 2., 3., 4., 5.}, {10., 15., 20., 13., 12.},
                                           {35., 24., 10., 9., 0.3}, {13., 14., 12., 9., 24.})
                     << 0. << 6. << true << 0.3 << 35.; // min/max in same component
                 QTest::newRow("vectorBounds2")
                     << createVectorSeries({1., 2., 3., 4., 5.}, {2.3, 15., 20., 13., 12.},
                                           {35., 24., 10., 9., 4.}, {13., 14., 12., 9., 24.})
                     << 0. << 6. << true << 2.3 << 35.; // min/max in same entry
                 QTest::newRow("vectorBounds3")
                     << createVectorSeries({1., 2., 3., 4., 5.}, {2.3, 15., 20., 13., 12.},
                                           {35., 24., 10., 9., 4.}, {13., 14., 12., 9., 24.})
                     << 2. << 3. << true << 10. << 24.;
                 // Tests with NaN values: NaN values are not included in min/max search
                 QTest::newRow("vectorBounds4")
                     << createVectorSeries({1., 2.}, {nan, nan}, {nan, nan}, {nan, nan}) << 0. << 6. << true
                     << nan << nan;
             }
             void TestDataSeries::testValuesBoundsVector()
             {
                 testValuesBounds<VectorSeries>();
             }
             QTEST_MAIN(TestDataSeries)
             #include "TestDataSeries.moc"

core/tests/Variable/TestVariable.cpp +233 -1

             #include <Variable/Variable.h>
+            #include <Data/ScalarSeries.h>
             #include <QObject>
             #include <QtTest>
             #include <memory>
+            namespace {
+            /// Generates a date in double
+            auto date = [](int year, int month, int day, int hours, int minutes, int seconds) {
+                return DateUtils::secondsSinceEpoch(
+                    QDateTime{{year, month, day}, {hours, minutes, seconds}, Qt::UTC});
+            };
+            /// Generates a series of test data for a range
+            std::shared_ptr<ScalarSeries> dataSeries(const SqpRange &range)
+            {
+                auto xAxisData = std::vector<double>{};
+                auto valuesData = std::vector<double>{};
+                auto value = 0;
+                for (auto x = range.m_TStart; x <= range.m_TEnd; ++x, ++value) {
+                    xAxisData.push_back(x);
+                    valuesData.push_back(value);
+                }
+                return std::make_shared<ScalarSeries>(std::move(xAxisData), std::move(valuesData), Unit{},
+                                                      Unit{});
+            }
+            } // namespace
+            Q_DECLARE_METATYPE(std::shared_ptr<ScalarSeries>)
             class TestVariable : public QObject {
                 Q_OBJECT
             private slots:
-                void testNotInCacheRangeList();
+                void testClone_data();
+                void testClone();
+                void testNotInCacheRangeList();
                 void testInCacheRangeList();
+                void testNbPoints_data();
+                void testNbPoints();
+                void testRealRange_data();
+                void testRealRange();
             };
+            void TestVariable::testClone_data()
+            {
+                // ////////////// //
+                // Test structure //
+                // ////////////// //
+                QTest::addColumn<QString>("name");
+                QTest::addColumn<QVariantHash>("metadata");
+                QTest::addColumn<SqpRange>("range");
+                QTest::addColumn<SqpRange>("cacheRange");
+                QTest::addColumn<std::shared_ptr<ScalarSeries> >("dataSeries");
+                // ////////// //
+                // Test cases //
+                // ////////// //
+                auto cacheRange = SqpRange{date(2017, 1, 1, 12, 0, 0), date(2017, 1, 1, 13, 0, 0)};
+                QTest::newRow("clone1") << QStringLiteral("var1")
+                                        << QVariantHash{{"data1", 1}, {"data2", "abc"}}
+                                        << SqpRange{date(2017, 1, 1, 12, 30, 0), (date(2017, 1, 1, 12, 45, 0))}
+                                        << cacheRange << dataSeries(cacheRange);
+            }
+            void TestVariable::testClone()
+            {
+                // Creates variable
+                QFETCH(QString, name);
+                QFETCH(QVariantHash, metadata);
+                QFETCH(SqpRange, range);
+                QFETCH(SqpRange, cacheRange);
+                QFETCH(std::shared_ptr<ScalarSeries>, dataSeries);
+                Variable variable{name, metadata};
+                variable.setRange(range);
+                variable.setCacheRange(cacheRange);
+                variable.mergeDataSeries(dataSeries);
+                // Clones variable
+                auto clone = variable.clone();
+                // Checks cloned variable's state
+                QCOMPARE(clone->name(), name);
+                QCOMPARE(clone->metadata(), metadata);
+                QCOMPARE(clone->range(), range);
+                QCOMPARE(clone->cacheRange(), cacheRange);
+                // Compares data series
+                if (dataSeries != nullptr) {
+                    QVERIFY(clone->dataSeries() != nullptr);
+                    QVERIFY(std::equal(dataSeries->cbegin(), dataSeries->cend(), clone->dataSeries()->cbegin(),
+                                       clone->dataSeries()->cend(), [](const auto &it1, const auto &it2) {
+                                           return it1.x() == it2.x() && it1.value() == it2.value();
+                                       }));
+                }
+                else {
+                    QVERIFY(clone->dataSeries() == nullptr);
+                }
+            }
             void TestVariable::testNotInCacheRangeList()
             {
                 auto varRS = QDateTime{QDate{2017, 01, 01}, QTime{2, 3, 20, 0}};
                 auto varRE = QDateTime{QDate{2017, 01, 01}, QTime{2, 3, 40, 0}};
                 auto sqpR = SqpRange{DateUtils::secondsSinceEpoch(varRS), DateUtils::secondsSinceEpoch(varRE)};
                 auto varCRS = QDateTime{QDate{2017, 01, 01}, QTime{2, 3, 0, 0}};
                 auto varCRE = QDateTime{QDate{2017, 01, 01}, QTime{2, 4, 0, 0}};
                 auto sqpCR
                     = SqpRange{DateUtils::secondsSinceEpoch(varCRS), DateUtils::secondsSinceEpoch(varCRE)};
                 Variable var{"Var test"};
                 var.setRange(sqpR);
                 var.setCacheRange(sqpCR);
                 // 1: [ts,te] < varTS
                 auto ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 0, 0, 0}};
                 auto te = QDateTime{QDate{2017, 01, 01}, QTime{2, 1, 0, 0}};
                 auto sqp = SqpRange{DateUtils::secondsSinceEpoch(ts), DateUtils::secondsSinceEpoch(te)};
                 auto notInCach = var.provideNotInCacheRangeList(sqp);
                 QCOMPARE(notInCach.size(), 1);
                 auto notInCachRange = notInCach.first();
                 QCOMPARE(notInCachRange.m_TStart, DateUtils::secondsSinceEpoch(ts));
                 QCOMPARE(notInCachRange.m_TEnd, DateUtils::secondsSinceEpoch(te));
                 // 2: ts < varTS < te < varTE
                 ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 0, 0, 0}};
                 te = QDateTime{QDate{2017, 01, 01}, QTime{2, 3, 30, 0}};
                 sqp = SqpRange{DateUtils::secondsSinceEpoch(ts), DateUtils::secondsSinceEpoch(te)};
                 notInCach = var.provideNotInCacheRangeList(sqp);
                 QCOMPARE(notInCach.size(), 1);
                 notInCachRange = notInCach.first();
                 QCOMPARE(notInCachRange.m_TStart, DateUtils::secondsSinceEpoch(ts));
                 QCOMPARE(notInCachRange.m_TEnd, DateUtils::secondsSinceEpoch(varCRS));
                 // 3: varTS < ts < te < varTE
                 ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 3, 20, 0}};
                 te = QDateTime{QDate{2017, 01, 01}, QTime{2, 3, 30, 0}};
                 sqp = SqpRange{DateUtils::secondsSinceEpoch(ts), DateUtils::secondsSinceEpoch(te)};
                 notInCach = var.provideNotInCacheRangeList(sqp);
                 QCOMPARE(notInCach.size(), 0);
                 // 4: varTS < ts < varTE < te
                 ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 3, 20, 0}};
                 te = QDateTime{QDate{2017, 01, 01}, QTime{2, 5, 0, 0}};
                 sqp = SqpRange{DateUtils::secondsSinceEpoch(ts), DateUtils::secondsSinceEpoch(te)};
                 notInCach = var.provideNotInCacheRangeList(sqp);
                 QCOMPARE(notInCach.size(), 1);
                 notInCachRange = notInCach.first();
                 QCOMPARE(notInCachRange.m_TStart, DateUtils::secondsSinceEpoch(varCRE));
                 QCOMPARE(notInCachRange.m_TEnd, DateUtils::secondsSinceEpoch(te));
                 // 5: varTS < varTE < ts < te
                 ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 4, 20, 0}};
                 te = QDateTime{QDate{2017, 01, 01}, QTime{2, 5, 0, 0}};
                 sqp = SqpRange{DateUtils::secondsSinceEpoch(ts), DateUtils::secondsSinceEpoch(te)};
                 notInCach = var.provideNotInCacheRangeList(sqp);
                 QCOMPARE(notInCach.size(), 1);
                 notInCachRange = notInCach.first();
                 QCOMPARE(notInCachRange.m_TStart, DateUtils::secondsSinceEpoch(ts));
                 QCOMPARE(notInCachRange.m_TEnd, DateUtils::secondsSinceEpoch(te));
                 // 6: ts <varTS < varTE < te
                 ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 1, 0, 0}};
                 te = QDateTime{QDate{2017, 01, 01}, QTime{2, 5, 0, 0}};
                 sqp = SqpRange{DateUtils::secondsSinceEpoch(ts), DateUtils::secondsSinceEpoch(te)};
                 notInCach = var.provideNotInCacheRangeList(sqp);
                 QCOMPARE(notInCach.size(), 2);
                 notInCachRange = notInCach.first();
                 QCOMPARE(notInCachRange.m_TStart, DateUtils::secondsSinceEpoch(ts));
                 QCOMPARE(notInCachRange.m_TEnd, DateUtils::secondsSinceEpoch(varCRS));
                 notInCachRange = notInCach[1];
                 QCOMPARE(notInCachRange.m_TStart, DateUtils::secondsSinceEpoch(varCRE));
                 QCOMPARE(notInCachRange.m_TEnd, DateUtils::secondsSinceEpoch(te));
             }
             void TestVariable::testInCacheRangeList()
             {
                 auto varRS = QDateTime{QDate{2017, 01, 01}, QTime{2, 3, 20, 0}};
                 auto varRE = QDateTime{QDate{2017, 01, 01}, QTime{2, 3, 40, 0}};
                 auto sqpR = SqpRange{DateUtils::secondsSinceEpoch(varRS), DateUtils::secondsSinceEpoch(varRE)};
                 auto varCRS = QDateTime{QDate{2017, 01, 01}, QTime{2, 3, 0, 0}};
                 auto varCRE = QDateTime{QDate{2017, 01, 01}, QTime{2, 4, 0, 0}};
                 auto sqpCR
                     = SqpRange{DateUtils::secondsSinceEpoch(varCRS), DateUtils::secondsSinceEpoch(varCRE)};
                 Variable var{"Var test"};
                 var.setRange(sqpR);
                 var.setCacheRange(sqpCR);
                 // 1: [ts,te] < varTS
                 auto ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 0, 0, 0}};
                 auto te = QDateTime{QDate{2017, 01, 01}, QTime{2, 1, 0, 0}};
                 auto sqp = SqpRange{DateUtils::secondsSinceEpoch(ts), DateUtils::secondsSinceEpoch(te)};
                 auto notInCach = var.provideInCacheRangeList(sqp);
                 QCOMPARE(notInCach.size(), 0);
                 // 2: ts < varTS < te < varTE
                 ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 0, 0, 0}};
                 te = QDateTime{QDate{2017, 01, 01}, QTime{2, 3, 30, 0}};
                 sqp = SqpRange{DateUtils::secondsSinceEpoch(ts), DateUtils::secondsSinceEpoch(te)};
                 notInCach = var.provideInCacheRangeList(sqp);
                 QCOMPARE(notInCach.size(), 1);
                 auto notInCachRange = notInCach.first();
                 QCOMPARE(notInCachRange.m_TStart, DateUtils::secondsSinceEpoch(varCRS));
                 QCOMPARE(notInCachRange.m_TEnd, DateUtils::secondsSinceEpoch(te));
                 // 3: varTS < ts < te < varTE
                 ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 3, 20, 0}};
                 te = QDateTime{QDate{2017, 01, 01}, QTime{2, 3, 30, 0}};
                 sqp = SqpRange{DateUtils::secondsSinceEpoch(ts), DateUtils::secondsSinceEpoch(te)};
                 notInCach = var.provideInCacheRangeList(sqp);
                 QCOMPARE(notInCach.size(), 1);
                 notInCachRange = notInCach.first();
                 QCOMPARE(notInCachRange.m_TStart, DateUtils::secondsSinceEpoch(ts));
                 QCOMPARE(notInCachRange.m_TEnd, DateUtils::secondsSinceEpoch(te));
                 // 4: varTS < ts < varTE < te
                 ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 3, 20, 0}};
                 te = QDateTime{QDate{2017, 01, 01}, QTime{2, 5, 0, 0}};
                 sqp = SqpRange{DateUtils::secondsSinceEpoch(ts), DateUtils::secondsSinceEpoch(te)};
                 notInCach = var.provideInCacheRangeList(sqp);
                 QCOMPARE(notInCach.size(), 1);
                 notInCachRange = notInCach.first();
                 QCOMPARE(notInCachRange.m_TStart, DateUtils::secondsSinceEpoch(ts));
                 QCOMPARE(notInCachRange.m_TEnd, DateUtils::secondsSinceEpoch(varCRE));
                 // 5: varTS < varTE < ts < te
                 ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 4, 20, 0}};
                 te = QDateTime{QDate{2017, 01, 01}, QTime{2, 5, 0, 0}};
                 sqp = SqpRange{DateUtils::secondsSinceEpoch(ts), DateUtils::secondsSinceEpoch(te)};
                 notInCach = var.provideInCacheRangeList(sqp);
                 QCOMPARE(notInCach.size(), 0);
                 // 6: ts <varTS < varTE < te
                 ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 1, 0, 0}};
                 te = QDateTime{QDate{2017, 01, 01}, QTime{2, 5, 0, 0}};
                 sqp = SqpRange{DateUtils::secondsSinceEpoch(ts), DateUtils::secondsSinceEpoch(te)};
                 notInCach = var.provideInCacheRangeList(sqp);
                 QCOMPARE(notInCach.size(), 1);
                 notInCachRange = notInCach.first();
                 QCOMPARE(notInCachRange.m_TStart, DateUtils::secondsSinceEpoch(varCRS));
                 QCOMPARE(notInCachRange.m_TEnd, DateUtils::secondsSinceEpoch(varCRE));
             }
+            namespace {
+            /// Struct used to represent an operation for @sa TestVariable::testNbPoints()
+            struct NbPointsOperation {
+                SqpRange m_CacheRange;                      /// Range to set for the variable
+                std::shared_ptr<ScalarSeries> m_DataSeries; /// Series to merge in the variable
+                int m_ExpectedNbPoints; /// Number of points in the variable expected after operation
+            };
+            using NbPointsOperations = std::vector<NbPointsOperation>;
+            } // namespace
+            Q_DECLARE_METATYPE(NbPointsOperations)
+            void TestVariable::testNbPoints_data()
+            {
+                // ////////////// //
+                // Test structure //
+                // ////////////// //
+                QTest::addColumn<NbPointsOperations>("operations");
+                // ////////// //
+                // Test cases //
+                // ////////// //
+                NbPointsOperations operations{};
+                // Sets cache range (expected nb points = series xAxis data + series values data)
+                auto cacheRange = SqpRange{date(2017, 1, 1, 12, 0, 0), date(2017, 1, 1, 12, 0, 9)};
+                operations.push_back({cacheRange, dataSeries(cacheRange), 20});
+                // Doubles cache but don't add data series (expected nb points don't change)
+                cacheRange = SqpRange{date(2017, 1, 1, 12, 0, 0), date(2017, 1, 1, 12, 0, 19)};
+                operations.push_back({cacheRange, nullptr, 20});
+                // Doubles cache and data series (expected nb points change)
+                cacheRange = SqpRange{date(2017, 1, 1, 12, 0, 0), date(2017, 1, 1, 12, 0, 19)};
+                operations.push_back({cacheRange, dataSeries(cacheRange), 40});
+                // Decreases cache (expected nb points decreases as the series is purged)
+                cacheRange = SqpRange{date(2017, 1, 1, 12, 0, 5), date(2017, 1, 1, 12, 0, 9)};
+                operations.push_back({cacheRange, nullptr, 10});
+                QTest::newRow("nbPoints1") << operations;
+            }
+            void TestVariable::testNbPoints()
+            {
+                // Creates variable
+                Variable variable{"var"};
+                QCOMPARE(variable.nbPoints(), 0);
+                QFETCH(NbPointsOperations, operations);
+                for (const auto &operation : operations) {
+                    // Sets cache range and merge data series
+                    variable.setCacheRange(operation.m_CacheRange);
+                    if (operation.m_DataSeries != nullptr) {
+                        variable.mergeDataSeries(operation.m_DataSeries);
+                    }
+                    // Checks nb points
+                    QCOMPARE(variable.nbPoints(), operation.m_ExpectedNbPoints);
+                }
+            }
+            namespace {
+            /// Struct used to represent a range operation on a variable
+            /// @sa TestVariable::testRealRange()
+            struct RangeOperation {
+                SqpRange m_CacheRange;                      /// Range to set for the variable
+                std::shared_ptr<ScalarSeries> m_DataSeries; /// Series to merge in the variable
+                SqpRange m_ExpectedRealRange; /// Real Range expected after operation on the variable
+            };
+            using RangeOperations = std::vector<RangeOperation>;
+            } // namespace
+            Q_DECLARE_METATYPE(RangeOperations)
+            void TestVariable::testRealRange_data()
+            {
+                // ////////////// //
+                // Test structure //
+                // ////////////// //
+                QTest::addColumn<RangeOperations>("operations");
+                // ////////// //
+                // Test cases //
+                // ////////// //
+                RangeOperations operations{};
+                // Inits cache range and data series (expected real range = cache range)
+                auto cacheRange = SqpRange{date(2017, 1, 1, 12, 0, 0), date(2017, 1, 1, 13, 0, 0)};
+                operations.push_back({cacheRange, dataSeries(cacheRange), cacheRange});
+                // Changes cache range and updates data series (expected real range = cache range)
+                cacheRange = SqpRange{date(2017, 1, 1, 14, 0, 0), date(2017, 1, 1, 15, 0, 0)};
+                operations.push_back({cacheRange, dataSeries(cacheRange), cacheRange});
+                // Changes cache range and update data series but with a lower range (expected real range =
+                // data series range)
+                cacheRange = SqpRange{date(2017, 1, 1, 12, 0, 0), date(2017, 1, 1, 16, 0, 0)};
+                auto dataSeriesRange = SqpRange{date(2017, 1, 1, 14, 0, 0), date(2017, 1, 1, 15, 0, 0)};
+                operations.push_back({cacheRange, dataSeries(dataSeriesRange), dataSeriesRange});
+                // Changes cache range but DON'T update data series (expected real range = cache range
+                // before operation)
+                cacheRange = SqpRange{date(2017, 1, 1, 10, 0, 0), date(2017, 1, 1, 17, 0, 0)};
+                operations.push_back({cacheRange, nullptr, dataSeriesRange});
+                QTest::newRow("realRange1") << operations;
+            }
+            void TestVariable::testRealRange()
+            {
+                // Creates variable (real range is invalid)
+                Variable variable{"var"};
+                QCOMPARE(variable.realRange(), INVALID_RANGE);
+                QFETCH(RangeOperations, operations);
+                for (const auto &operation : operations) {
+                    // Sets cache range and merge data series
+                    variable.setCacheRange(operation.m_CacheRange);
+                    if (operation.m_DataSeries != nullptr) {
+                        variable.mergeDataSeries(operation.m_DataSeries);
+                    }
+                    // Checks real range
+                    QCOMPARE(variable.realRange(), operation.m_ExpectedRealRange);
+                }
+            }
             QTEST_MAIN(TestVariable)
             #include "TestVariable.moc"

plugins/mockplugin/meson.build +1 0

             mockplugin_moc_headers = [
               'include/MockPlugin.h'
             ]
             mockplugin_sources = [
+              'src/MockDefs.cpp',
               'src/CosinusProvider.cpp',
               'src/MockPlugin.cpp'
             ]
             mockplugin_inc = include_directories(['include', '../../plugin/include'])
             gen = generator(moc,
                             output  : 'moc_@BASENAME@.cpp',
                             arguments : ['@INPUT@',
                              '-DPLUGIN_JSON_FILE_PATH="'+meson.source_root()+'/plugins/mockplugin/resources/mockplugin.json"',
                              '-I', meson.current_source_dir()+'/include',
                              '-I', meson.current_source_dir()+'/../../plugin/include',
                              '-o', '@OUTPUT@'])
             mockplugin_moc_files = gen.process(mockplugin_moc_headers)
             sciqlop_mockplugin = library('mockplugin',
                                    mockplugin_sources,
                                    mockplugin_moc_files,
                                    cpp_args : '-DMOCKPLUGIN_LIB',
                                    include_directories : [mockplugin_inc],
                                    dependencies : [sciqlop_core, sciqlop_gui],
                                    install : true
                                    )
             tests = [
               [['tests/TestCosinusAcquisition.cpp'],'test_cosinus_acquisition','Cosinus Acquisition test']
             ]
             foreach unit_test : tests
               test_moc_files = qt5.preprocess(moc_sources : unit_test[0])
               test_exe = executable(unit_test[1],unit_test[0] , test_moc_files,
                                       link_with : [sciqlop_mockplugin],
                                       include_directories : [mockplugin_inc],
                                       cpp_args : ['-DMOCKPLUGIN_TESTS_RESOURCES_DIR="'+meson.current_source_dir()+'/tests-resources"'],
                                       dependencies : [sciqlop_core, sciqlop_gui, qt5test])
               test(unit_test[2], test_exe, args: ['-teamcity', '-o', '@0@.teamcity.txt'.format(unit_test[1])], timeout: 3 * 60)
             endforeach

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages