HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r721:ba7f1665a341

Merge pull request from SCIQLOP-Initialisation develop...

leroux -

r721:ba7f1665a341

parent child

Context file:

r721:ba7f1665a341

Collapse all files

core/include/Data/ArrayData.h +7 0

             #ifndef SCIQLOP_ARRAYDATA_H
             #define SCIQLOP_ARRAYDATA_H
             #include "Data/ArrayDataIterator.h"
             #include <Common/SortUtils.h>
             #include <QReadLocker>
             #include <QReadWriteLock>
             #include <QVector>
             #include <memory>
             template <int Dim>
             class ArrayData;
             using DataContainer = std::vector<double>;
             namespace arraydata_detail {
             /// Struct used to sort ArrayData
             template <int Dim>
             struct Sort {
                 static std::shared_ptr<ArrayData<Dim> > sort(const DataContainer &data, int nbComponents,
                                                              const std::vector<int> &sortPermutation)
                 {
                     return std::make_shared<ArrayData<Dim> >(
                         SortUtils::sort(data, nbComponents, sortPermutation), nbComponents);
                 }
             };
             /// Specialization for uni-dimensional ArrayData
             template <>
             struct Sort<1> {
                 static std::shared_ptr<ArrayData<1> > sort(const DataContainer &data, int nbComponents,
                                                            const std::vector<int> &sortPermutation)
                 {
                     Q_UNUSED(nbComponents)
                     return std::make_shared<ArrayData<1> >(SortUtils::sort(data, 1, sortPermutation));
                 }
             };
             template <int Dim, bool IsConst>
             class IteratorValue;
             template <int Dim, bool IsConst>
             struct IteratorValueBuilder {
             };
             template <int Dim>
             struct IteratorValueBuilder<Dim, true> {
                 using DataContainerIterator = DataContainer::const_iterator;
                 static void swap(IteratorValue<Dim, true> &o1, IteratorValue<Dim, true> &o2) {}
             };
             template <int Dim>
             struct IteratorValueBuilder<Dim, false> {
                 using DataContainerIterator = DataContainer::iterator;
                 static void swap(IteratorValue<Dim, false> &o1, IteratorValue<Dim, false> &o2)
                 {
                     for (auto i = 0; i < o1.m_NbComponents; ++i) {
                         std::iter_swap(o1.m_It + i, o2.m_It + i);
                     }
                 }
             };
             template <int Dim, bool IsConst>
             class IteratorValue : public ArrayDataIteratorValue::Impl {
             public:
                 friend class ArrayData<Dim>;
                 friend class IteratorValueBuilder<Dim, IsConst>;
                 using DataContainerIterator =
                     typename IteratorValueBuilder<Dim, IsConst>::DataContainerIterator;
                 template <bool IC = IsConst, typename = std::enable_if_t<IC == true> >
                 explicit IteratorValue(const DataContainer &container, int nbComponents, bool begin)
                         : m_It{begin ? container.cbegin() : container.cend()}, m_NbComponents{nbComponents}
                 {
                 }
                 template <bool IC = IsConst, typename = std::enable_if_t<IC == false> >
                 explicit IteratorValue(DataContainer &container, int nbComponents, bool begin)
                         : m_It{begin ? container.begin() : container.end()}, m_NbComponents{nbComponents}
                 {
                 }
                 IteratorValue(const IteratorValue &other) = default;
                 std::unique_ptr<ArrayDataIteratorValue::Impl> clone() const override
                 {
                     return std::make_unique<IteratorValue<Dim, IsConst> >(*this);
                 }
                 int distance(const ArrayDataIteratorValue::Impl &other) const override try {
                     /// @todo ALX : validate
                     const auto &otherImpl = dynamic_cast<const IteratorValue &>(other);
                     return std::distance(otherImpl.m_It, m_It) / m_NbComponents;
                 }
                 catch (const std::bad_cast &) {
                     return 0;
                 }
                 bool equals(const ArrayDataIteratorValue::Impl &other) const override try {
                     const auto &otherImpl = dynamic_cast<const IteratorValue &>(other);
                     return std::tie(m_It, m_NbComponents) == std::tie(otherImpl.m_It, otherImpl.m_NbComponents);
                 }
                 catch (const std::bad_cast &) {
                     return false;
                 }
                 bool lowerThan(const ArrayDataIteratorValue::Impl &other) const override try {
                     const auto &otherImpl = dynamic_cast<const IteratorValue &>(other);
                     return m_It < otherImpl.m_It;
                 }
                 catch (const std::bad_cast &) {
                     return false;
                 }
                 std::unique_ptr<ArrayDataIteratorValue::Impl> advance(int offset) const override
                 {
                     auto result = clone();
                     result->next(offset);
                     return result;
                 }
                 void next(int offset) override { std::advance(m_It, offset * m_NbComponents); }
                 void prev() override { std::advance(m_It, -m_NbComponents); }
                 double at(int componentIndex) const override { return *(m_It + componentIndex); }
                 double first() const override { return *m_It; }
                 double min() const override
                 {
                     auto values = this->values();
                     auto end = values.cend();
                     auto it = std::min_element(values.cbegin(), end, [](const auto &v1, const auto &v2) {
                         return SortUtils::minCompareWithNaN(v1, v2);
                     });
                     return it != end ? *it : std::numeric_limits<double>::quiet_NaN();
                 }
                 double max() const override
                 {
                     auto values = this->values();
                     auto end = values.cend();
                     auto it = std::max_element(values.cbegin(), end, [](const auto &v1, const auto &v2) {
                         return SortUtils::maxCompareWithNaN(v1, v2);
                     });
                     return it != end ? *it : std::numeric_limits<double>::quiet_NaN();
                 }
                 QVector<double> values() const override
                 {
                     auto result = QVector<double>{};
                     for (auto i = 0; i < m_NbComponents; ++i) {
                         result.push_back(*(m_It + i));
                     }
                     return result;
                 }
                 void swap(ArrayDataIteratorValue::Impl &other) override
                 {
                     auto &otherImpl = dynamic_cast<IteratorValue &>(other);
                     IteratorValueBuilder<Dim, IsConst>::swap(*this, otherImpl);
                 }
             private:
                 DataContainerIterator m_It;
                 int m_NbComponents;
             };
             } // namespace arraydata_detail
             /**
              * @brief The ArrayData class represents a dataset for a data series.
              *
              * A dataset can be unidimensional or two-dimensional. This property is determined by the Dim
              * template-parameter. In a case of a two-dimensional dataset, each dataset component has the same
              * number of values
              *
              * @tparam Dim the dimension of the ArrayData (one or two)
              * @sa IDataSeries
              */
             template <int Dim>
             class ArrayData {
             public:
                 // ///// //
                 // Ctors //
                 // ///// //
                 /**
                  * Ctor for a unidimensional ArrayData
                  * @param data the data the ArrayData will hold
                  */
                 template <int D = Dim, typename = std::enable_if_t<D == 1> >
                 explicit ArrayData(DataContainer data) : m_Data{std::move(data)}, m_NbComponents{1}
                 {
                 }
                 /**
                  * Ctor for a two-dimensional ArrayData. The number of components (number of lines) must be
                  * greater than 2 and must be a divisor of the total number of data in the vector
                  * @param data the data the ArrayData will hold
                  * @param nbComponents the number of components
                  * @throws std::invalid_argument if the number of components is less than 2 or is not a divisor
                  * of the size of the data
                  */
                 template <int D = Dim, typename = std::enable_if_t<D == 2> >
                 explicit ArrayData(DataContainer data, int nbComponents)
                         : m_Data{std::move(data)}, m_NbComponents{nbComponents}
                 {
                     if (nbComponents < 2) {
                         throw std::invalid_argument{
                             QString{"A multidimensional ArrayData must have at least 2 components (found: %1)"}
                                 .arg(nbComponents)
                                 .toStdString()};
                     }
                     if (m_Data.size() % m_NbComponents != 0) {
                         throw std::invalid_argument{QString{
                             "The number of components (%1) is inconsistent with the total number of data (%2)"}
                                                         .arg(m_Data.size(), nbComponents)
                                                         .toStdString()};
                     }
                 }
                 /// Copy ctor
                 explicit ArrayData(const ArrayData &other)
                 {
                     QReadLocker otherLocker{&other.m_Lock};
                     m_Data = other.m_Data;
                     m_NbComponents = other.m_NbComponents;
                 }
                 // /////////////// //
                 // General methods //
                 // /////////////// //
                 /**
                  * Merges into the array data an other array data. The two array datas must have the same number
                  * of components so the merge can be done
                  * @param other the array data to merge with
                  * @param prepend if true, the other array data is inserted at the beginning, otherwise it is
                  * inserted at the end
                  */
                 void add(const ArrayData<Dim> &other, bool prepend = false)
                 {
                     QWriteLocker locker{&m_Lock};
                     QReadLocker otherLocker{&other.m_Lock};
                     if (m_NbComponents != other.componentCount()) {
                         return;
                     }
                     insert(other.cbegin(), other.cend(), prepend);
                 }
                 void clear()
                 {
                     QWriteLocker locker{&m_Lock};
                     m_Data.clear();
                 }
                 int componentCount() const noexcept { return m_NbComponents; }
                 /// @return the size (i.e. number of values) of a single component
                 /// @remarks in a case of a two-dimensional ArrayData, each component has the same size
                 int size() const
                 {
                     QReadLocker locker{&m_Lock};
                     return m_Data.size() / m_NbComponents;
                 }
+                /// @return the total size (i.e. number of values) of the array data
+                int totalSize() const
+                {
+                    QReadLocker locker{&m_Lock};
+                    return m_Data.size();
+                }
                 std::shared_ptr<ArrayData<Dim> > sort(const std::vector<int> &sortPermutation)
                 {
                     QReadLocker locker{&m_Lock};
                     return arraydata_detail::Sort<Dim>::sort(m_Data, m_NbComponents, sortPermutation);
                 }
                 // ///////// //
                 // Iterators //
                 // ///////// //
                 ArrayDataIterator begin()
                 {
                     return ArrayDataIterator{
                         ArrayDataIteratorValue{std::make_unique<arraydata_detail::IteratorValue<Dim, false> >(
                             m_Data, m_NbComponents, true)}};
                 }
                 ArrayDataIterator end()
                 {
                     return ArrayDataIterator{
                         ArrayDataIteratorValue{std::make_unique<arraydata_detail::IteratorValue<Dim, false> >(
                             m_Data, m_NbComponents, false)}};
                 }
                 ArrayDataIterator cbegin() const
                 {
                     return ArrayDataIterator{
                         ArrayDataIteratorValue{std::make_unique<arraydata_detail::IteratorValue<Dim, true> >(
                             m_Data, m_NbComponents, true)}};
                 }
                 ArrayDataIterator cend() const
                 {
                     return ArrayDataIterator{
                         ArrayDataIteratorValue{std::make_unique<arraydata_detail::IteratorValue<Dim, true> >(
                             m_Data, m_NbComponents, false)}};
                 }
                 void erase(ArrayDataIterator first, ArrayDataIterator last)
                 {
                     auto firstImpl = dynamic_cast<arraydata_detail::IteratorValue<Dim, false> *>(first->impl());
                     auto lastImpl = dynamic_cast<arraydata_detail::IteratorValue<Dim, false> *>(last->impl());
                     if (firstImpl && lastImpl) {
                         m_Data.erase(firstImpl->m_It, lastImpl->m_It);
                     }
                 }
                 void insert(ArrayDataIterator first, ArrayDataIterator last, bool prepend = false)
                 {
                     auto firstImpl = dynamic_cast<arraydata_detail::IteratorValue<Dim, true> *>(first->impl());
                     auto lastImpl = dynamic_cast<arraydata_detail::IteratorValue<Dim, true> *>(last->impl());
                     if (firstImpl && lastImpl) {
                         auto insertIt = prepend ? m_Data.begin() : m_Data.end();
                         m_Data.insert(insertIt, firstImpl->m_It, lastImpl->m_It);
                     }
                 }
                 /**
                  * @return the data at a specified index
                  * @remarks index must be a valid position
                  */
                 double at(int index) const noexcept
                 {
                     QReadLocker locker{&m_Lock};
                     return m_Data.at(index);
                 }
                 // ///////////// //
                 // 1-dim methods //
                 // ///////////// //
                 /**
                  * @return the data as a vector, as a const reference
                  * @remarks this method is only available for a unidimensional ArrayData
                  */
                 template <int D = Dim, typename = std::enable_if_t<D == 1> >
                 DataContainer cdata() const noexcept
                 {
                     return m_Data;
                 }
             private:
                 DataContainer m_Data;
                 /// Number of components (lines). Is always 1 in a 1-dim ArrayData
                 int m_NbComponents;
                 mutable QReadWriteLock m_Lock;
             };
             #endif // SCIQLOP_ARRAYDATA_H

core/include/Data/DataSeries.h +1 0

             #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 +4 0

             #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/include/Variable/Variable.h +4 0

             #ifndef SCIQLOP_VARIABLE_H
             #define SCIQLOP_VARIABLE_H
             #include "CoreGlobal.h"
             #include <Data/DataSeriesIterator.h>
             #include <Data/SqpRange.h>
             #include <QLoggingCategory>
             #include <QObject>
             #include <Common/MetaTypes.h>
             #include <Common/spimpl.h>
             Q_DECLARE_LOGGING_CATEGORY(LOG_Variable)
             class IDataSeries;
             class QString;
             /**
              * @brief The Variable class represents a variable in SciQlop.
              */
             class SCIQLOP_CORE_EXPORT Variable : public QObject {
                 Q_OBJECT
             public:
                 explicit Variable(const QString &name, const SqpRange &dateTime,
                                   const QVariantHash &metadata = {});
                 /// Copy ctor
                 explicit Variable(const Variable &other);
                 std::shared_ptr<Variable> clone() const;
                 QString name() const noexcept;
                 void setName(const QString &name) noexcept;
                 SqpRange range() const noexcept;
                 void setRange(const SqpRange &range) noexcept;
                 SqpRange cacheRange() const noexcept;
                 void setCacheRange(const SqpRange &cacheRange) noexcept;
+                /// @return the number of points hold by the variable. The number of points is updated each time
+                /// the data series changes
+                int nbPoints() const noexcept;
                 /// Returns the real range of the variable, i.e. the min and max x-axis values of the data
                 /// series between the range of the variable. The real range is updated each time the variable
                 /// range or the data series changed
                 /// @return the real range, invalid range if the data series is null or empty
                 /// @sa setDataSeries()
                 /// @sa setRange()
                 SqpRange realRange() const noexcept;
                 /// @return the data of the variable, nullptr if there is no data
                 std::shared_ptr<IDataSeries> dataSeries() const noexcept;
                 QVariantHash metadata() const noexcept;
                 bool contains(const SqpRange &range) const noexcept;
                 bool intersect(const SqpRange &range) const noexcept;
                 bool isInside(const SqpRange &range) const noexcept;
                 bool cacheContains(const SqpRange &range) const noexcept;
                 bool cacheIntersect(const SqpRange &range) const noexcept;
                 bool cacheIsInside(const SqpRange &range) const noexcept;
                 QVector<SqpRange> provideNotInCacheRangeList(const SqpRange &range) const noexcept;
                 QVector<SqpRange> provideInCacheRangeList(const SqpRange &range) const noexcept;
                 void mergeDataSeries(std::shared_ptr<IDataSeries> dataSeries) noexcept;
             signals:
                 void updated();
             private:
                 class VariablePrivate;
                 spimpl::unique_impl_ptr<VariablePrivate> impl;
             };
             // Required for using shared_ptr in signals/slots
             SCIQLOP_REGISTER_META_TYPE(VARIABLE_PTR_REGISTRY, std::shared_ptr<Variable>)
             SCIQLOP_REGISTER_META_TYPE(VARIABLE_PTR_VECTOR_REGISTRY, QVector<std::shared_ptr<Variable> >)
             #endif // SCIQLOP_VARIABLE_H

core/src/Variable/Variable.cpp +13 -2

             #include "Variable/Variable.h"
             #include <Data/IDataSeries.h>
             #include <Data/SqpRange.h>
             #include <QMutex>
             #include <QReadWriteLock>
             #include <QThread>
             Q_LOGGING_CATEGORY(LOG_Variable, "Variable")
             struct Variable::VariablePrivate {
                 explicit VariablePrivate(const QString &name, const SqpRange &dateTime,
                                          const QVariantHash &metadata)
                         : m_Name{name},
                           m_Range{dateTime},
                           m_Metadata{metadata},
                           m_DataSeries{nullptr},
-                          m_RealRange{INVALID_RANGE}
+                          m_RealRange{INVALID_RANGE},
+                          m_NbPoints{0}
                 {
                 }
                 VariablePrivate(const VariablePrivate &other)
                         : m_Name{other.m_Name},
                           m_Range{other.m_Range},
                           m_Metadata{other.m_Metadata},
                           m_DataSeries{other.m_DataSeries != nullptr ? other.m_DataSeries->clone() : nullptr},
-                          m_RealRange{other.m_RealRange}
+                          m_RealRange{other.m_RealRange},
+                          m_NbPoints{other.m_NbPoints}
                 {
                 }
                 void lockRead() { m_Lock.lockForRead(); }
                 void lockWrite() { m_Lock.lockForWrite(); }
                 void unlock() { m_Lock.unlock(); }
                 void purgeDataSeries()
                 {
                     if (m_DataSeries) {
                         m_DataSeries->purge(m_CacheRange.m_TStart, m_CacheRange.m_TEnd);
                     }
                     updateRealRange();
+                    updateNbPoints();
                 }
+                void updateNbPoints() { m_NbPoints = m_DataSeries ? m_DataSeries->nbPoints() : 0; }
                 /// Updates real range according to current variable range and data series
                 void updateRealRange()
                 {
                     if (m_DataSeries) {
                         m_DataSeries->lockRead();
                         auto end = m_DataSeries->cend();
                         auto minXAxisIt = m_DataSeries->minXAxisData(m_Range.m_TStart);
                         auto maxXAxisIt = m_DataSeries->maxXAxisData(m_Range.m_TEnd);
                         m_RealRange = (minXAxisIt != end && maxXAxisIt != end)
                                           ? SqpRange{minXAxisIt->x(), maxXAxisIt->x()}
                                           : INVALID_RANGE;
                         m_DataSeries->unlock();
                     }
                     else {
                         m_RealRange = INVALID_RANGE;
                     }
                 }
                 QString m_Name;
                 SqpRange m_Range;
                 SqpRange m_CacheRange;
                 QVariantHash m_Metadata;
                 std::shared_ptr<IDataSeries> m_DataSeries;
                 SqpRange m_RealRange;
+                int m_NbPoints;
                 QReadWriteLock m_Lock;
             };
             Variable::Variable(const QString &name, const SqpRange &dateTime, const QVariantHash &metadata)
                     : impl{spimpl::make_unique_impl<VariablePrivate>(name, dateTime, metadata)}
             {
             }
             Variable::Variable(const Variable &other)
                     : impl{spimpl::make_unique_impl<VariablePrivate>(*other.impl)}
             {
             }
             std::shared_ptr<Variable> Variable::clone() const
             {
                 return std::make_shared<Variable>(*this);
             }
             QString Variable::name() const noexcept
             {
                 impl->lockRead();
                 auto name = impl->m_Name;
                 impl->unlock();
                 return name;
             }
             void Variable::setName(const QString &name) noexcept
             {
                 impl->lockWrite();
                 impl->m_Name = name;
                 impl->unlock();
             }
             SqpRange Variable::range() const noexcept
             {
                 impl->lockRead();
                 auto range = impl->m_Range;
                 impl->unlock();
                 return range;
             }
             void Variable::setRange(const SqpRange &range) noexcept
             {
                 impl->lockWrite();
                 impl->m_Range = range;
                 impl->updateRealRange();
                 impl->unlock();
             }
             SqpRange Variable::cacheRange() const noexcept
             {
                 impl->lockRead();
                 auto cacheRange = impl->m_CacheRange;
                 impl->unlock();
                 return cacheRange;
             }
             void Variable::setCacheRange(const SqpRange &cacheRange) noexcept
             {
                 impl->lockWrite();
                 if (cacheRange != impl->m_CacheRange) {
                     impl->m_CacheRange = cacheRange;
                     impl->purgeDataSeries();
                 }
                 impl->unlock();
             }
+            int Variable::nbPoints() const noexcept
+            {
+                return impl->m_NbPoints;
+            }
             SqpRange Variable::realRange() const noexcept
             {
                 return impl->m_RealRange;
             }
             void Variable::mergeDataSeries(std::shared_ptr<IDataSeries> dataSeries) noexcept
             {
                 qCDebug(LOG_Variable()) << "TORM Variable::mergeDataSeries"
                                         << QThread::currentThread()->objectName();
                 if (!dataSeries) {
                     /// @todo ALX : log
                     return;
                 }
                 // Add or merge the data
                 impl->lockWrite();
                 if (!impl->m_DataSeries) {
                     impl->m_DataSeries = dataSeries->clone();
                 }
                 else {
                     impl->m_DataSeries->merge(dataSeries.get());
                 }
                 impl->purgeDataSeries();
                 impl->unlock();
             }
             std::shared_ptr<IDataSeries> Variable::dataSeries() const noexcept
             {
                 impl->lockRead();
                 auto dataSeries = impl->m_DataSeries;
                 impl->unlock();
                 return dataSeries;
             }
             QVariantHash Variable::metadata() const noexcept
             {
                 impl->lockRead();
                 auto metadata = impl->m_Metadata;
                 impl->unlock();
                 return metadata;
             }
             bool Variable::contains(const SqpRange &range) const noexcept
             {
                 impl->lockRead();
                 auto res = impl->m_Range.contains(range);
                 impl->unlock();
                 return res;
             }
             bool Variable::intersect(const SqpRange &range) const noexcept
             {
                 impl->lockRead();
                 auto res = impl->m_Range.intersect(range);
                 impl->unlock();
                 return res;
             }
             bool Variable::isInside(const SqpRange &range) const noexcept
             {
                 impl->lockRead();
                 auto res = range.contains(SqpRange{impl->m_Range.m_TStart, impl->m_Range.m_TEnd});
                 impl->unlock();
                 return res;
             }
             bool Variable::cacheContains(const SqpRange &range) const noexcept
             {
                 impl->lockRead();
                 auto res = impl->m_CacheRange.contains(range);
                 impl->unlock();
                 return res;
             }
             bool Variable::cacheIntersect(const SqpRange &range) const noexcept
             {
                 impl->lockRead();
                 auto res = impl->m_CacheRange.intersect(range);
                 impl->unlock();
                 return res;
             }
             bool Variable::cacheIsInside(const SqpRange &range) const noexcept
             {
                 impl->lockRead();
                 auto res = range.contains(SqpRange{impl->m_CacheRange.m_TStart, impl->m_CacheRange.m_TEnd});
                 impl->unlock();
                 return res;
             }
             QVector<SqpRange> Variable::provideNotInCacheRangeList(const SqpRange &range) const noexcept
             {
                 // This code assume that cach in contigue. Can return 0, 1 or 2 SqpRange
                 auto notInCache = QVector<SqpRange>{};
                 if (!this->cacheContains(range)) {
                     if (range.m_TEnd <= impl->m_CacheRange.m_TStart
                         || range.m_TStart >= impl->m_CacheRange.m_TEnd) {
                         notInCache << range;
                     }
                     else if (range.m_TStart < impl->m_CacheRange.m_TStart
                              && range.m_TEnd <= impl->m_CacheRange.m_TEnd) {
                         notInCache << SqpRange{range.m_TStart, impl->m_CacheRange.m_TStart};
                     }
                     else if (range.m_TStart < impl->m_CacheRange.m_TStart
                              && range.m_TEnd > impl->m_CacheRange.m_TEnd) {
                         notInCache << SqpRange{range.m_TStart, impl->m_CacheRange.m_TStart}
                                    << SqpRange{impl->m_CacheRange.m_TEnd, range.m_TEnd};
                     }
                     else if (range.m_TStart < impl->m_CacheRange.m_TEnd) {
                         notInCache << SqpRange{impl->m_CacheRange.m_TEnd, range.m_TEnd};
                     }
                     else {
                         qCCritical(LOG_Variable()) << tr("Detection of unknown case.")
                                                    << QThread::currentThread();
                     }
                 }
                 return notInCache;
             }
             QVector<SqpRange> Variable::provideInCacheRangeList(const SqpRange &range) const noexcept
             {
                 // This code assume that cach in contigue. Can return 0 or 1 SqpRange
                 auto inCache = QVector<SqpRange>{};
                 if (this->intersect(range)) {
                     if (range.m_TStart <= impl->m_CacheRange.m_TStart
                         && range.m_TEnd >= impl->m_CacheRange.m_TStart
                         && range.m_TEnd < impl->m_CacheRange.m_TEnd) {
                         inCache << SqpRange{impl->m_CacheRange.m_TStart, range.m_TEnd};
                     }
                     else if (range.m_TStart >= impl->m_CacheRange.m_TStart
                              && range.m_TEnd <= impl->m_CacheRange.m_TEnd) {
                         inCache << range;
                     }
                     else if (range.m_TStart > impl->m_CacheRange.m_TStart
                              && range.m_TEnd > impl->m_CacheRange.m_TEnd) {
                         inCache << SqpRange{range.m_TStart, impl->m_CacheRange.m_TEnd};
                     }
                     else if (range.m_TStart <= impl->m_CacheRange.m_TStart
                              && range.m_TEnd >= impl->m_CacheRange.m_TEnd) {
                         inCache << impl->m_CacheRange;
                     }
                     else {
                         qCCritical(LOG_Variable()) << tr("Detection of unknown case.")
                                                    << QThread::currentThread();
                     }
                 }
                 return inCache;
             }

core/src/Variable/VariableModel.cpp +10 -6

             #include <Variable/Variable.h>
             #include <Variable/VariableModel.h>
             #include <Common/DateUtils.h>
             #include <Common/StringUtils.h>
             #include <Data/IDataSeries.h>
             #include <QSize>
             #include <unordered_map>
             Q_LOGGING_CATEGORY(LOG_VariableModel, "VariableModel")
             namespace {
             // Column indexes
             const auto NAME_COLUMN = 0;
             const auto TSTART_COLUMN = 1;
             const auto TEND_COLUMN = 2;
-            const auto UNIT_COLUMN = 3;
+            const auto NBPOINTS_COLUMN = 3;
-            const auto MISSION_COLUMN = 4;
+            const auto UNIT_COLUMN = 4;
-            const auto PLUGIN_COLUMN = 5;
+            const auto MISSION_COLUMN = 5;
-            const auto NB_COLUMNS = 6;
+            const auto PLUGIN_COLUMN = 6;
+            const auto NB_COLUMNS = 7;
             // Column properties
             const auto DEFAULT_HEIGHT = 25;
             const auto DEFAULT_WIDTH = 100;
             struct ColumnProperties {
                 ColumnProperties(const QString &name = {}, int width = DEFAULT_WIDTH,
                                  int height = DEFAULT_HEIGHT)
                         : m_Name{name}, m_Width{width}, m_Height{height}
                 {
                 }
                 QString m_Name;
                 int m_Width;
                 int m_Height;
             };
             const auto COLUMN_PROPERTIES = QHash<int, ColumnProperties>{
                 {NAME_COLUMN, {QObject::tr("Name")}},      {TSTART_COLUMN, {QObject::tr("tStart"), 180}},
-                {TEND_COLUMN, {QObject::tr("tEnd"), 180}},  {UNIT_COLUMN, {QObject::tr("Unit")}},
+                {TEND_COLUMN, {QObject::tr("tEnd"), 180}}, {NBPOINTS_COLUMN, {QObject::tr("Nb points")}},
-                {MISSION_COLUMN, {QObject::tr("Mission")}}, {PLUGIN_COLUMN, {QObject::tr("Plugin")}}};
+                {UNIT_COLUMN, {QObject::tr("Unit")}},      {MISSION_COLUMN, {QObject::tr("Mission")}},
+                {PLUGIN_COLUMN, {QObject::tr("Plugin")}}};
             /// Format for datetimes
             const auto DATETIME_FORMAT = QStringLiteral("dd/MM/yyyy \nhh:mm:ss:zzz");
             QString uniqueName(const QString &defaultName,
                                const std::vector<std::shared_ptr<Variable> > &variables)
             {
                 auto forbiddenNames = std::vector<QString>(variables.size());
                 std::transform(variables.cbegin(), variables.cend(), forbiddenNames.begin(),
                                [](const auto &variable) { return variable->name(); });
                 auto uniqueName = StringUtils::uniqueName(defaultName, forbiddenNames);
                 Q_ASSERT(!uniqueName.isEmpty());
                 return uniqueName;
             }
             } // namespace
             struct VariableModel::VariableModelPrivate {
                 /// Variables created in SciQlop
                 std::vector<std::shared_ptr<Variable> > m_Variables;
                 std::unordered_map<std::shared_ptr<Variable>, double> m_VariableToProgress;
                 /// Return the row index of the variable. -1 if it's not found
                 int indexOfVariable(Variable *variable) const noexcept;
             };
             VariableModel::VariableModel(QObject *parent)
                     : QAbstractTableModel{parent}, impl{spimpl::make_unique_impl<VariableModelPrivate>()}
             {
             }
             void VariableModel::addVariable(std::shared_ptr<Variable> variable) noexcept
             {
                 auto insertIndex = rowCount();
                 beginInsertRows({}, insertIndex, insertIndex);
                 // Generates unique name for the variable
                 variable->setName(uniqueName(variable->name(), impl->m_Variables));
                 impl->m_Variables.push_back(variable);
                 connect(variable.get(), &Variable::updated, this, &VariableModel::onVariableUpdated);
                 endInsertRows();
             }
             bool VariableModel::containsVariable(std::shared_ptr<Variable> variable) const noexcept
             {
                 auto end = impl->m_Variables.cend();
                 return std::find(impl->m_Variables.cbegin(), end, variable) != end;
             }
             std::shared_ptr<Variable> VariableModel::createVariable(const QString &name,
                                                                     const SqpRange &dateTime,
                                                                     const QVariantHash &metadata) noexcept
             {
                 auto variable = std::make_shared<Variable>(name, dateTime, metadata);
                 addVariable(variable);
                 return variable;
             }
             void VariableModel::deleteVariable(std::shared_ptr<Variable> variable) noexcept
             {
                 if (!variable) {
                     qCCritical(LOG_Variable()) << "Can't delete a null variable from the model";
                     return;
                 }
                 // Finds variable in the model
                 auto begin = impl->m_Variables.cbegin();
                 auto end = impl->m_Variables.cend();
                 auto it = std::find(begin, end, variable);
                 if (it != end) {
                     auto removeIndex = std::distance(begin, it);
                     // Deletes variable
                     beginRemoveRows({}, removeIndex, removeIndex);
                     impl->m_Variables.erase(it);
                     endRemoveRows();
                 }
                 else {
                     qCritical(LOG_VariableModel())
                         << tr("Can't delete variable %1 from the model: the variable is not in the model")
                                .arg(variable->name());
                 }
                 // Removes variable from progress map
                 impl->m_VariableToProgress.erase(variable);
             }
             std::shared_ptr<Variable> VariableModel::variable(int index) const
             {
                 return (index >= 0 && index < impl->m_Variables.size()) ? impl->m_Variables[index] : nullptr;
             }
             std::vector<std::shared_ptr<Variable> > VariableModel::variables() const
             {
                 return impl->m_Variables;
             }
             void VariableModel::setDataProgress(std::shared_ptr<Variable> variable, double progress)
             {
                 if (progress > 0.0) {
                     impl->m_VariableToProgress[variable] = progress;
                 }
                 else {
                     impl->m_VariableToProgress.erase(variable);
                 }
                 auto modelIndex = createIndex(impl->indexOfVariable(variable.get()), NAME_COLUMN);
                 emit dataChanged(modelIndex, modelIndex);
             }
             int VariableModel::columnCount(const QModelIndex &parent) const
             {
                 Q_UNUSED(parent);
                 return NB_COLUMNS;
             }
             int VariableModel::rowCount(const QModelIndex &parent) const
             {
                 Q_UNUSED(parent);
                 return impl->m_Variables.size();
             }
             QVariant VariableModel::data(const QModelIndex &index, int role) const
             {
                 if (!index.isValid()) {
                     return QVariant{};
                 }
                 if (index.row() < 0 || index.row() >= rowCount()) {
                     return QVariant{};
                 }
                 if (role == Qt::DisplayRole) {
                     if (auto variable = impl->m_Variables.at(index.row()).get()) {
                         switch (index.column()) {
                             case NAME_COLUMN:
                                 return variable->name();
                             case TSTART_COLUMN: {
                                 auto range = variable->realRange();
                                 return range != INVALID_RANGE
                                            ? DateUtils::dateTime(range.m_TStart).toString(DATETIME_FORMAT)
                                            : QVariant{};
                             }
                             case TEND_COLUMN: {
                                 auto range = variable->realRange();
                                 return range != INVALID_RANGE
                                            ? DateUtils::dateTime(range.m_TEnd).toString(DATETIME_FORMAT)
                                            : QVariant{};
                             }
+                            case NBPOINTS_COLUMN:
+                                return variable->nbPoints();
                             case UNIT_COLUMN:
                                 return variable->metadata().value(QStringLiteral("units"));
                             case MISSION_COLUMN:
                                 return variable->metadata().value(QStringLiteral("mission"));
                             case PLUGIN_COLUMN:
                                 return variable->metadata().value(QStringLiteral("plugin"));
                             default:
                                 // No action
                                 break;
                         }
                         qWarning(LOG_VariableModel())
                             << tr("Can't get data (unknown column %1)").arg(index.column());
                     }
                     else {
                         qWarning(LOG_VariableModel()) << tr("Can't get data (no variable)");
                     }
                 }
                 else if (role == VariableRoles::ProgressRole) {
                     if (auto variable = impl->m_Variables.at(index.row())) {
                         auto it = impl->m_VariableToProgress.find(variable);
                         if (it != impl->m_VariableToProgress.cend()) {
                             return it->second;
                         }
                     }
                 }
                 return QVariant{};
             }
             QVariant VariableModel::headerData(int section, Qt::Orientation orientation, int role) const
             {
                 if (role != Qt::DisplayRole && role != Qt::SizeHintRole) {
                     return QVariant{};
                 }
                 if (orientation == Qt::Horizontal) {
                     auto propertiesIt = COLUMN_PROPERTIES.find(section);
                     if (propertiesIt != COLUMN_PROPERTIES.cend()) {
                         // Role is either DisplayRole or SizeHintRole
                         return (role == Qt::DisplayRole)
                                    ? QVariant{propertiesIt->m_Name}
                                    : QVariant{QSize{propertiesIt->m_Width, propertiesIt->m_Height}};
                     }
                     else {
                         qWarning(LOG_VariableModel())
                             << tr("Can't get header data (unknown column %1)").arg(section);
                     }
                 }
                 return QVariant{};
             }
             void VariableModel::abortProgress(const QModelIndex &index)
             {
                 if (auto variable = impl->m_Variables.at(index.row())) {
                     emit abortProgessRequested(variable);
                 }
             }
             void VariableModel::onVariableUpdated() noexcept
             {
                 // Finds variable that has been updated in the model
                 if (auto updatedVariable = dynamic_cast<Variable *>(sender())) {
                     auto updatedVariableIndex = impl->indexOfVariable(updatedVariable);
                     if (updatedVariableIndex > -1) {
                         emit dataChanged(createIndex(updatedVariableIndex, 0),
                                          createIndex(updatedVariableIndex, columnCount() - 1));
                     }
                 }
             }
             int VariableModel::VariableModelPrivate::indexOfVariable(Variable *variable) const noexcept
             {
                 auto begin = std::cbegin(m_Variables);
                 auto end = std::cend(m_Variables);
                 auto it
                     = std::find_if(begin, end, [variable](const auto &var) { return var.get() == variable; });
                 if (it != end) {
                     // Gets the index of the variable in the model: we assume here that views have the same
                     // order as the model
                     return std::distance(begin, it);
                 }
                 else {
                     return -1;
                 }
             }

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