From ac71c472785a40ab96275795147e6d49fee523a7 2017-09-25 16:25:52 From: leroux Date: 2017-09-25 16:25:52 Subject: [PATCH] Merge pull request #296 from SCIQLOP-Initialisation develop Fixes slowness when opening variable --- diff --git a/core/src/Data/VectorSeries.cpp b/core/src/Data/VectorSeries.cpp index a51b0cc..3043f7c 100644 --- a/core/src/Data/VectorSeries.cpp +++ b/core/src/Data/VectorSeries.cpp @@ -64,23 +64,20 @@ std::unique_ptr VectorSeries::clone() const std::shared_ptr VectorSeries::subDataSeries(const SqpRange &range) { auto subXAxisData = std::vector(); - auto subXValuesData = std::vector(); - auto subYValuesData = std::vector(); - auto subZValuesData = std::vector(); + auto subValuesData = std::vector(); this->lockRead(); { auto bounds = xAxisRange(range.m_TStart, range.m_TEnd); for (auto it = bounds.first; it != bounds.second; ++it) { subXAxisData.push_back(it->x()); - subXValuesData.push_back(it->value(0)); - subYValuesData.push_back(it->value(1)); - subZValuesData.push_back(it->value(2)); + subValuesData.push_back(it->value(0)); + subValuesData.push_back(it->value(1)); + subValuesData.push_back(it->value(2)); } } this->unlock(); - return std::make_shared(std::move(subXAxisData), std::move(subXValuesData), - std::move(subYValuesData), std::move(subZValuesData), + return std::make_shared(std::move(subXAxisData), std::move(subValuesData), this->xAxisUnit(), this->valuesUnit()); }