GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r452:158d38bb6d5a

Updates cosinus provider...

Alexandre Leroux -

r452:158d38bb6d5a

parent child

Context file:

r452:158d38bb6d5a

Collapse all files

core/include/Data/ScalarSeries.h 0 -16

             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 Unit &xAxisUnit, const Unit &valuesUnit);
-                /**
                  * Ctor with two vectors. The vectors must have the same size, otherwise a ScalarSeries with no
                  * values will be created.
                  * @param xAxisData x-axis data
                 explicit ScalarSeries(QVector<double> xAxisData, QVector<double> valuesData,
                                       const Unit &xAxisUnit, const 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;
                 std::unique_ptr<IDataSeries> clone() const;
             };

core/src/Data/ScalarSeries.cpp 0 -12

             #include <Data/ScalarSeries.h>
-            ScalarSeries::ScalarSeries(int size, const Unit &xAxisUnit, const Unit &valuesUnit)
-                    : DataSeries{std::make_shared<ArrayData<1> >(size), xAxisUnit,
-                                 std::make_shared<ArrayData<1> >(size), valuesUnit}
             ScalarSeries::ScalarSeries(QVector<double> xAxisData, QVector<double> valuesData,
                                        const Unit &xAxisUnit, const Unit &valuesUnit)
                     : DataSeries{std::make_shared<ArrayData<1> >(std::move(xAxisData)), xAxisUnit,
             {
             }
-            void ScalarSeries::setData(int index, double x, double value) noexcept
-                xAxisData()->setData(index, x);
-                valuesData()->setData(index, value);
             std::unique_ptr<IDataSeries> ScalarSeries::clone() const
             {
                 return std::make_unique<ScalarSeries>(*this);

plugins/mockplugin/src/CosinusProvider.cpp +14 -8

                 // Gets the timerange from the parameters
                 double freq = 100.0;
-                double start = dateTime.m_TStart * freq; // 100 htz
+                double start = std::ceil(dateTime.m_TStart * freq); // 100 htz
-                double end = dateTime.m_TEnd * freq;     // 100 htz
+                double end = std::floor(dateTime.m_TEnd * freq);    // 100 htz
                 // We assure that timerange is valid
                 if (end < start) {
                 }
                 // Generates scalar series containing cosinus values (one value per second)
-                auto scalarSeries
+                auto dataCount = end - start;
-                    = std::make_shared<ScalarSeries>(end - start, Unit{QStringLiteral("t"), true}, Unit{});
+                auto xAxisData = QVector<double>{};
+                xAxisData.resize(dataCount);
+                auto valuesData = QVector<double>{};
+                valuesData.resize(dataCount);
                 int progress = 0;
-                auto progressEnd = end - start;
+                auto progressEnd = dataCount;
                 for (auto time = start; time < end; ++time, ++dataIndex) {
                     auto it = m_VariableToEnableProvider.find(token);
                     if (it != m_VariableToEnableProvider.end() && it.value()) {
                         const auto timeOnFreq = time / freq;
-                        scalarSeries->setData(dataIndex, timeOnFreq, std::cos(timeOnFreq));
+                        xAxisData.replace(dataIndex, timeOnFreq);
+                        valuesData.replace(dataIndex, std::cos(timeOnFreq));
                         // progression
                         int currentProgress = (time - start) * 100.0 / progressEnd;
                 }
                 emit dataProvidedProgress(token, 0.0);
+                return std::make_shared<ScalarSeries>(std::move(xAxisData), std::move(valuesData),
-                return scalarSeries;
+                                                      Unit{QStringLiteral("t"), true}, Unit{});
             }
             void CosinusProvider::requestDataLoading(QUuid token, const DataProviderParameters &parameters)

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