GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation Commit - r522:5d1bac48fb3a

Renames subData() to subDataSeries()...

Alexandre Leroux -

r522:5d1bac48fb3a

parent child

Context file:

r522:5d1bac48fb3a

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

                 virtual Unit valuesUnit() const = 0;
                 virtual void merge(IDataSeries *dataSeries) = 0;
-                virtual std::shared_ptr<IDataSeries> subData(const SqpRange &range) = 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;
                 virtual SqpRange range() const = 0;

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

                 std::unique_ptr<IDataSeries> clone() const override;
-                std::shared_ptr<IDataSeries> subData(const SqpRange &range) override;
+                std::shared_ptr<IDataSeries> subDataSeries(const SqpRange &range) override;
             };
             #endif // SCIQLOP_SCALARSERIES_H

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

                 return std::make_unique<ScalarSeries>(*this);
             }
-            std::shared_ptr<IDataSeries> ScalarSeries::subData(const SqpRange &range)
+            std::shared_ptr<IDataSeries> ScalarSeries::subDataSeries(const SqpRange &range)
             {
                 auto subXAxisData = QVector<double>();
                 auto subValuesData = QVector<double>();

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

                 impl->unlock();
                 // sub the data
-                auto subData = this->dataSeries()->subData(this->cacheRange());
+                auto subData = this->dataSeries()->subDataSeries(this->cacheRange());
                 qCDebug(LOG_Variable()) << "TORM: Variable::mergeDataSeries sub" << subData->range();
                 this->setDataSeries(subData);
                 qCDebug(LOG_Variable()) << "TORM: Variable::mergeDataSeries set" << this->dataSeries()->range();

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

                 else {
                     var->setRange(rangeRequested);
                     var->setCacheRange(varRangesRequested.second);
-                    var->setDataSeries(var->dataSeries()->subData(varRangesRequested.second));
+                    var->setDataSeries(var->dataSeries()->subDataSeries(varRangesRequested.second));
                     emit var->updated();
                 }
             }

General Comments 0

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

No TODOs yet

	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