GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r177:4c64b786fec1

Replaces QString unit by a new struct...

Alexandre Leroux -

r177:4c64b786fec1

parent child

Context file:

r177:4c64b786fec1

Collapse all files

core/include/Data/DataSeries.h +8 -8

             #ifndef SCIQLOP_DATASERIES_H
             #define SCIQLOP_DATASERIES_H
             #include <Data/ArrayData.h>
             #include <Data/IDataSeries.h>
             #include <memory>
             /**
              * @brief The DataSeries class is the base (abstract) implementation of IDataSeries.
              *
              * It proposes to set a dimension for the values data
              *
              * @tparam Dim The dimension of the values data
              *
              */
             template <int Dim>
             class DataSeries : public IDataSeries {
             public:
                 /// @sa IDataSeries::xAxisData()
                 std::shared_ptr<ArrayData<1> > xAxisData() override { return m_XAxisData; }
                 /// @sa IDataSeries::xAxisUnit()
-                QString xAxisUnit() const override { return m_XAxisUnit; }
+                Unit xAxisUnit() const override { return m_XAxisUnit; }
                 /// @return the values dataset
                 std::shared_ptr<ArrayData<Dim> > valuesData() const { return m_ValuesData; }
                 /// @sa IDataSeries::valuesUnit()
-                QString valuesUnit() const override { return m_ValuesUnit; }
+                Unit valuesUnit() const override { return m_ValuesUnit; }
             protected:
                 /// Protected ctor (DataSeries is abstract)
-                explicit DataSeries(std::shared_ptr<ArrayData<1> > xAxisData, const QString &xAxisUnit,
+                explicit DataSeries(std::shared_ptr<ArrayData<1> > xAxisData, Unit xAxisUnit,
-                                    std::shared_ptr<ArrayData<Dim> > valuesData, const QString &valuesUnit)
+                                    std::shared_ptr<ArrayData<Dim> > valuesData, Unit valuesUnit)
                         : m_XAxisData{xAxisData},
-                          m_XAxisUnit{xAxisUnit},
+                          m_XAxisUnit{std::move(xAxisUnit)},
                           m_ValuesData{valuesData},
-                          m_ValuesUnit{valuesUnit}
+                          m_ValuesUnit{std::move(valuesUnit)}
                 {
                 }
             private:
                 std::shared_ptr<ArrayData<1> > m_XAxisData;
-                QString m_XAxisUnit;
+                Unit m_XAxisUnit;
                 std::shared_ptr<ArrayData<Dim> > m_ValuesData;
-                QString m_ValuesUnit;
+                Unit m_ValuesUnit;
             };
             #endif // SCIQLOP_DATASERIES_H

core/include/Data/IDataSeries.h +12 -2

             #ifndef SCIQLOP_IDATASERIES_H
             #define SCIQLOP_IDATASERIES_H
             #include <QString>
             #include <memory>
             template <int Dim>
             class ArrayData;
+            struct Unit {
+                explicit Unit(const QString &name = {}, bool timeUnit = false)
+                        : m_Name{name}, m_TimeUnit{timeUnit}
+                {
+                }
+                QString m_Name;  ///< Unit name
+                bool m_TimeUnit; ///< The unit is a unit of time
+            };
             /**
              * @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;
-                virtual QString xAxisUnit() const = 0;
+                virtual Unit xAxisUnit() const = 0;
-                virtual QString valuesUnit() const = 0;
+                virtual Unit valuesUnit() const = 0;
             };
             #endif // SCIQLOP_IDATASERIES_H

core/include/Data/ScalarSeries.h +1 -1

             #ifndef SCIQLOP_SCALARSERIES_H
             #define SCIQLOP_SCALARSERIES_H
             #include <Data/DataSeries.h>
             /**
              * @brief The ScalarSeries class is the implementation for a data series representing a scalar.
              */
             class ScalarSeries : public DataSeries<1> {
             public:
                 /**
                  * Ctor
                  * @param size the number of data the series will hold
                  * @param xAxisUnit x-axis unit
                  * @param valuesUnit values unit
                  */
-                explicit ScalarSeries(int size, const QString &xAxisUnit, const QString &valuesUnit);
+                explicit ScalarSeries(int size, Unit xAxisUnit, Unit valuesUnit);
                 /**
                  * Sets data for a specific index. The index has to be valid to be effective
                  * @param index the index to which the data will be set
                  * @param x the x-axis data
                  * @param value the value data
                  */
                 void setData(int index, double x, double value) noexcept;
             };
             #endif // SCIQLOP_SCALARSERIES_H

core/src/Data/ScalarSeries.cpp +3 -3

             #include <Data/ScalarSeries.h>
-            ScalarSeries::ScalarSeries(int size, const QString &xAxisUnit, const QString &valuesUnit)
+            ScalarSeries::ScalarSeries(int size, Unit xAxisUnit, Unit valuesUnit)
-                    : DataSeries{std::make_shared<ArrayData<1> >(size), xAxisUnit,
+                    : DataSeries{std::make_shared<ArrayData<1> >(size), std::move(xAxisUnit),
-                                 std::make_shared<ArrayData<1> >(size), valuesUnit}
+                                 std::make_shared<ArrayData<1> >(size), std::move(valuesUnit)}
             {
             }
             void ScalarSeries::setData(int index, double x, double value) noexcept
             {
                 xAxisData()->setData(index, x);
                 valuesData()->setData(index, value);
             }

plugins/mockplugin/src/CosinusProvider.cpp +1 -1

             #include "CosinusProvider.h"
             #include <Data/DataProviderParameters.h>
             #include <Data/ScalarSeries.h>
             #include <cmath>
             std::unique_ptr<IDataSeries>
             CosinusProvider::retrieveData(const DataProviderParameters &parameters) const
             {
                 // Gets the timerange from the parameters
                 auto start = parameters.m_TStart;
                 auto end = parameters.m_TEnd;
                 // We assure that timerange is valid
                 if (end < start) {
                     std::swap(start, end);
                 }
                 // Generates scalar series containing cosinus values (one value per second)
                 auto scalarSeries
-                    = std::make_unique<ScalarSeries>(end - start, QStringLiteral("t"), QStringLiteral(""));
+                    = std::make_unique<ScalarSeries>(end - start, Unit{QStringLiteral("t"), true}, Unit{});
                 auto dataIndex = 0;
                 for (auto time = start; time < end; ++time, ++dataIndex) {
                     scalarSeries->setData(dataIndex, time, std::cos(time));
                 }
                 return scalarSeries;
             }

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