GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r646:5cae61f2b3b8

Updates VectorSeries() to create a single QVector for ArrayData with three vectors in entry

Alexandre Leroux -

r646:5cae61f2b3b8

parent child

Context file:

r646:5cae61f2b3b8

Collapse all files

core/include/Data/VectorSeries.h +6 -2

             #ifndef SCIQLOP_VECTORSERIES_H
             #define SCIQLOP_VECTORSERIES_H
             #include "CoreGlobal.h"
             #include <Data/DataSeries.h>
             /**
              * @brief The VectorSeries class is the implementation for a data series representing a vector.
              */
             class SCIQLOP_CORE_EXPORT VectorSeries : public DataSeries<2> {
             public:
                 /**
-                 * Ctor. The vectors must have the same size, otherwise a ScalarSeries with no values will be
+                 * Ctor with three vectors (one per component). The vectors must have the same size, otherwise a
-                 * created.
+                 * ScalarSeries with no values will be created.
                  * @param xAxisData x-axis data
                  * @param xvaluesData x-values data
                  * @param yvaluesData y-values data
                  * @param zvaluesData z-values data
                  */
                 explicit VectorSeries(QVector<double> xAxisData, QVector<double> xValuesData,
                                       QVector<double> yValuesData, QVector<double> zValuesData,
                                       const Unit &xAxisUnit, const Unit &valuesUnit);
+                /// Default Ctor
+                explicit VectorSeries(QVector<double> xAxisData, QVector<double> valuesData,
+                                      const Unit &xAxisUnit, const Unit &valuesUnit);
                 std::unique_ptr<IDataSeries> clone() const;
                 std::shared_ptr<IDataSeries> subDataSeries(const SqpRange &range) override;
             };
             #endif // SCIQLOP_VECTORSERIES_H

core/src/Data/VectorSeries.cpp +47 -3

             #include "Data/VectorSeries.h"
+            namespace {
+            /**
+             * Flatten the three components of a vector to a single QVector that can be passed to an ArrayData
+             *
+             * Example:
+             * xValues = {1, 2, 3}
+             * yValues = {4, 5, 6}
+             * zValues = {7, 8, 9}
+             *
+             * result = {1, 4, 7, 2, 5, 8, 3, 6, 9}
+             *
+             * @param xValues the x-component values of the vector
+             * @param yValues the y-component values of the vector
+             * @param zValues the z-component values of the vector
+             * @return the single QVector
+             * @remarks the three components are consumed
+             * @sa ArrayData
+             */
+            QVector<double> flatten(QVector<double> xValues, QVector<double> yValues, QVector<double> zValues)
+            {
+                if (xValues.size() != yValues.size() || xValues.size() != zValues.size()) {
+                    /// @todo ALX : log
+                    return {};
+                }
+                auto result = QVector<double>{};
+                result.reserve(xValues.size() * 3);
+                while (!xValues.isEmpty()) {
+                    result.append({xValues.takeFirst(), yValues.takeFirst(), zValues.takeFirst()});
+                }
+                return result;
+            }
+            } // namespace
             VectorSeries::VectorSeries(QVector<double> xAxisData, QVector<double> xValuesData,
                                        QVector<double> yValuesData, QVector<double> zValuesData,
                                        const Unit &xAxisUnit, const Unit &valuesUnit)
+                    : VectorSeries{std::move(xAxisData), flatten(std::move(xValuesData), std::move(yValuesData),
+                                                                 std::move(zValuesData)),
+                                   xAxisUnit, valuesUnit}
+            {
+            }
+            VectorSeries::VectorSeries(QVector<double> xAxisData, QVector<double> valuesData,
+                                       const Unit &xAxisUnit, const Unit &valuesUnit)
                     : DataSeries{std::make_shared<ArrayData<1> >(std::move(xAxisData)), xAxisUnit,
-                                 std::make_shared<ArrayData<2> >(QVector<QVector<double> >{
+                                 std::make_shared<ArrayData<2> >(std::move(valuesData), 3), valuesUnit}
-                                     std::move(xValuesData), std::move(yValuesData), std::move(zValuesData)}),
-                                 valuesUnit}
             {
             }
             std::unique_ptr<IDataSeries> VectorSeries::clone() const
             {
                 return std::make_unique<VectorSeries>(*this);
             }
             std::shared_ptr<IDataSeries> VectorSeries::subDataSeries(const SqpRange &range)
             {
                 auto subXAxisData = QVector<double>();
                 auto subXValuesData = QVector<double>();
                 auto subYValuesData = QVector<double>();
                 auto subZValuesData = QVector<double>();
                 this->lockRead();
                 {
                     auto bounds = xAxisRange(range.m_TStart, range.m_TEnd);
                     for (auto it = bounds.first; it != bounds.second; ++it) {
                         subXAxisData.append(it->x());
                         subXValuesData.append(it->value(0));
                         subYValuesData.append(it->value(1));
                         subZValuesData.append(it->value(2));
                     }
                 }
                 this->unlock();
                 return std::make_shared<VectorSeries>(subXAxisData, subXValuesData, subYValuesData,
                                                       subZValuesData, this->xAxisUnit(), this->valuesUnit());
             }

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