diff --git a/core/include/Data/IDataSeries.h b/core/include/Data/IDataSeries.h index b66ae68..7435fa3 100644 --- a/core/include/Data/IDataSeries.h +++ b/core/include/Data/IDataSeries.h @@ -56,7 +56,8 @@ public: virtual Unit valuesUnit() const = 0; virtual void merge(IDataSeries *dataSeries) = 0; - virtual std::shared_ptr subData(const SqpRange &range) = 0; + /// @todo Review the name and signature of this method + virtual std::shared_ptr subDataSeries(const SqpRange &range) = 0; virtual std::unique_ptr clone() const = 0; virtual SqpRange range() const = 0; diff --git a/core/include/Data/ScalarSeries.h b/core/include/Data/ScalarSeries.h index 9183e3d..1a745e5 100644 --- a/core/include/Data/ScalarSeries.h +++ b/core/include/Data/ScalarSeries.h @@ -21,7 +21,7 @@ public: std::unique_ptr clone() const override; - std::shared_ptr subData(const SqpRange &range) override; + std::shared_ptr subDataSeries(const SqpRange &range) override; }; #endif // SCIQLOP_SCALARSERIES_H diff --git a/core/src/Data/ScalarSeries.cpp b/core/src/Data/ScalarSeries.cpp index 9732921..94387da 100644 --- a/core/src/Data/ScalarSeries.cpp +++ b/core/src/Data/ScalarSeries.cpp @@ -12,7 +12,7 @@ std::unique_ptr ScalarSeries::clone() const return std::make_unique(*this); } -std::shared_ptr ScalarSeries::subData(const SqpRange &range) +std::shared_ptr ScalarSeries::subDataSeries(const SqpRange &range) { auto subXAxisData = QVector(); auto subValuesData = QVector(); diff --git a/core/src/Variable/Variable.cpp b/core/src/Variable/Variable.cpp index 04fac1c..ace298f 100644 --- a/core/src/Variable/Variable.cpp +++ b/core/src/Variable/Variable.cpp @@ -107,7 +107,7 @@ void Variable::mergeDataSeries(std::shared_ptr dataSeries) noexcept 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(); diff --git a/core/src/Variable/VariableController.cpp b/core/src/Variable/VariableController.cpp index a7a67df..ad796fd 100644 --- a/core/src/Variable/VariableController.cpp +++ b/core/src/Variable/VariableController.cpp @@ -481,7 +481,7 @@ void VariableController::VariableControllerPrivate::processRequest(std::shared_p 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(); } }