GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r677:0efbd3cc5e8d

Calls purge() method when setting cache range or data series of a variable

Alexandre Leroux -

r677:0efbd3cc5e8d

parent child

Context file:

r677:0efbd3cc5e8d

Collapse all files

core/include/Variable/Variable.h 0 -1

                 QVector<SqpRange> provideNotInCacheRangeList(const SqpRange &range) const noexcept;
                 QVector<SqpRange> provideInCacheRangeList(const SqpRange &range) const noexcept;
-                void setDataSeries(std::shared_ptr<IDataSeries> dataSeries) noexcept;
                 void mergeDataSeries(std::shared_ptr<IDataSeries> dataSeries) noexcept;
             signals:

core/src/Variable/Variable.cpp +13 -22

                 void lockWrite() { m_Lock.lockForWrite(); }
                 void unlock() { m_Lock.unlock(); }
+                void purgeDataSeries()
+                {
+                    if (m_DataSeries) {
+                        m_DataSeries->purge(m_CacheRange.m_TStart, m_CacheRange.m_TEnd);
+                    }
+                    updateRealRange();
+                }
                 /// Updates real range according to current variable range and data series
                 void updateRealRange()
                 {
             void Variable::setCacheRange(const SqpRange &cacheRange) noexcept
             {
                 impl->lockWrite();
-                impl->m_CacheRange = cacheRange;
+                if (cacheRange != impl->m_CacheRange) {
+                    impl->m_CacheRange = cacheRange;
+                    impl->purgeDataSeries();
+                }
                 impl->unlock();
             }
                 return impl->m_RealRange;
             }
-            void Variable::setDataSeries(std::shared_ptr<IDataSeries> dataSeries) noexcept
-                qCDebug(LOG_Variable()) << "TORM Variable::setDataSeries"
-                                        << QThread::currentThread()->objectName();
-                if (!dataSeries) {
-                    /// @todo ALX : log
-                    return;
-                impl->lockWrite();
-                impl->m_DataSeries = dataSeries->clone();
-                impl->updateRealRange();
-                impl->unlock();
             void Variable::mergeDataSeries(std::shared_ptr<IDataSeries> dataSeries) noexcept
             {
                 qCDebug(LOG_Variable()) << "TORM Variable::mergeDataSeries"
                 }
                 // Add or merge the data
-                // Inits the data series of the variable
                 impl->lockWrite();
                 if (!impl->m_DataSeries) {
                     impl->m_DataSeries = dataSeries->clone();
                 else {
                     impl->m_DataSeries->merge(dataSeries.get());
                 }
+                impl->purgeDataSeries();
                 impl->unlock();
-                // sub the data
-                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();
             }
             std::shared_ptr<IDataSeries> Variable::dataSeries() const noexcept

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