| @@ -56,7 +56,8 public: | |||
|
|
56 | 56 | virtual Unit valuesUnit() const = 0; |
|
|
57 | 57 | |
|
|
58 | 58 | virtual void merge(IDataSeries *dataSeries) = 0; |
|
|
59 | virtual std::shared_ptr<IDataSeries> subData(const SqpRange &range) = 0; | |
|
|
59 | /// @todo Review the name and signature of this method | |
|
|
60 | virtual std::shared_ptr<IDataSeries> subDataSeries(const SqpRange &range) = 0; | |
|
|
60 | 61 | |
|
|
61 | 62 | virtual std::unique_ptr<IDataSeries> clone() const = 0; |
|
|
62 | 63 | virtual SqpRange range() const = 0; |
| @@ -21,7 +21,7 public: | |||
|
|
21 | 21 | |
|
|
22 | 22 | std::unique_ptr<IDataSeries> clone() const override; |
|
|
23 | 23 | |
|
|
24 | std::shared_ptr<IDataSeries> subData(const SqpRange &range) override; | |
|
|
24 | std::shared_ptr<IDataSeries> subDataSeries(const SqpRange &range) override; | |
|
|
25 | 25 | }; |
|
|
26 | 26 | |
|
|
27 | 27 | #endif // SCIQLOP_SCALARSERIES_H |
| @@ -12,7 +12,7 std::unique_ptr<IDataSeries> ScalarSeries::clone() const | |||
|
|
12 | 12 | return std::make_unique<ScalarSeries>(*this); |
|
|
13 | 13 | } |
|
|
14 | 14 | |
|
|
15 | std::shared_ptr<IDataSeries> ScalarSeries::subData(const SqpRange &range) | |
|
|
15 | std::shared_ptr<IDataSeries> ScalarSeries::subDataSeries(const SqpRange &range) | |
|
|
16 | 16 | { |
|
|
17 | 17 | auto subXAxisData = QVector<double>(); |
|
|
18 | 18 | auto subValuesData = QVector<double>(); |
| @@ -107,7 +107,7 void Variable::mergeDataSeries(std::shared_ptr<IDataSeries> dataSeries) noexcept | |||
|
|
107 | 107 | impl->unlock(); |
|
|
108 | 108 | |
|
|
109 | 109 | // sub the data |
|
|
110 | auto subData = this->dataSeries()->subData(this->cacheRange()); | |
|
|
110 | auto subData = this->dataSeries()->subDataSeries(this->cacheRange()); | |
|
|
111 | 111 | qCDebug(LOG_Variable()) << "TORM: Variable::mergeDataSeries sub" << subData->range(); |
|
|
112 | 112 | this->setDataSeries(subData); |
|
|
113 | 113 | qCDebug(LOG_Variable()) << "TORM: Variable::mergeDataSeries set" << this->dataSeries()->range(); |
| @@ -481,7 +481,7 void VariableController::VariableControllerPrivate::processRequest(std::shared_p | |||
|
|
481 | 481 | else { |
|
|
482 | 482 | var->setRange(rangeRequested); |
|
|
483 | 483 | var->setCacheRange(varRangesRequested.second); |
|
|
484 | var->setDataSeries(var->dataSeries()->subData(varRangesRequested.second)); | |
|
|
484 | var->setDataSeries(var->dataSeries()->subDataSeries(varRangesRequested.second)); | |
|
|
485 | 485 | emit var->updated(); |
|
|
486 | 486 | } |
|
|
487 | 487 | } |
General Comments 0
You need to be logged in to leave comments.
Login now