##// END OF EJS Templates
GIT_REPOSITORIES » LPP » Users » mperrinel » SCIQLOP-Initialisation
RSS

Fork of HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop

Fixed untimely update of the range to be displayed in the variable widget
Fixed untimely update of the range to be displayed in the variable widget
Alexandre Leroux - - Load All Authors

File last commit:

r611:aff19a50babf
r611:aff19a50babf
Show More
Variable.cpp
279 lines | 7.7 KiB | text/x-c | CppLexer
/ core / src / Variable / Variable.cpp
History | Source | Raw |Copy content |Copy permalink
Alexandre Leroux
Changes Variable from struct to class
 r151 #include "Variable/Variable.h"
Alexandre Leroux
Adds data series to a variable
 r152 #include <Data/IDataSeries.h>
perrinel
Change SqpRange for SqpDateTime
 r471 #include <Data/SqpRange.h>
perrinel
Variable slot is called when x range of its graph changed
 r210
perrinel
Add thread protection on variable
 r512 #include <QMutex>
perrinel
Add current progression for thread fix
 r336 #include <QReadWriteLock>
#include <QThread>
perrinel
Variable slot is called when x range of its graph changed
 r210 Q_LOGGING_CATEGORY(LOG_Variable, "Variable")
Alexandre Leroux
Adds data series to a variable
 r152
Alexandre Leroux
Changes Variable from struct to class
 r151 struct Variable::VariablePrivate {
perrinel
Change SqpRange for SqpDateTime
 r471 explicit VariablePrivate(const QString &name, const SqpRange &dateTime,
Alexandre Leroux
Adds QVariantHash to store metadata in a variable
 r373 const QVariantHash &metadata)
Alexandre Leroux
Fixed untimely update of the range to be displayed in the variable widget
 r611 : m_Name{name},
m_Range{dateTime},
m_Metadata{metadata},
m_DataSeries{nullptr},
m_RealRange{INVALID_RANGE}
Alexandre Leroux
Changes Variable from struct to class
 r151 {
}
perrinel
Add thread protection on variable
 r512 void lockRead() { m_Lock.lockForRead(); }
void lockWrite() { m_Lock.lockForWrite(); }
void unlock() { m_Lock.unlock(); }
Alexandre Leroux
Fixed untimely update of the range to be displayed in the variable widget
 r611 /// Updates real range according to current variable range and data series
void updateRealRange()
{
if (m_DataSeries) {
m_DataSeries->lockRead();
auto end = m_DataSeries->cend();
auto minXAxisIt = m_DataSeries->minXAxisData(m_Range.m_TStart);
auto maxXAxisIt = m_DataSeries->maxXAxisData(m_Range.m_TEnd);
m_RealRange = (minXAxisIt != end && maxXAxisIt != end)
? SqpRange{minXAxisIt->x(), maxXAxisIt->x()}
: INVALID_RANGE;
m_DataSeries->unlock();
}
else {
m_RealRange = INVALID_RANGE;
}
}
Alexandre Leroux
Changes Variable from struct to class
 r151 QString m_Name;
perrinel
Variable slot is called when x range of its graph changed
 r210
perrinel
add CacheRange for Variable and the provideNotInCacheRangeList method
 r503 SqpRange m_Range;
SqpRange m_CacheRange;
Alexandre Leroux
Adds QVariantHash to store metadata in a variable
 r373 QVariantHash m_Metadata;
perrinel
The dataSeries of a variable is now shared istead of uniq to avoid...
 r513 std::shared_ptr<IDataSeries> m_DataSeries;
Alexandre Leroux
Fixed untimely update of the range to be displayed in the variable widget
 r611 SqpRange m_RealRange;
perrinel
Add thread protection on variable
 r512
QReadWriteLock m_Lock;
Alexandre Leroux
Changes Variable from struct to class
 r151 };
perrinel
Change SqpRange for SqpDateTime
 r471 Variable::Variable(const QString &name, const SqpRange &dateTime, const QVariantHash &metadata)
Alexandre Leroux
Adds QVariantHash to store metadata in a variable
 r373 : impl{spimpl::make_unique_impl<VariablePrivate>(name, dateTime, metadata)}
Alexandre Leroux
Changes Variable from struct to class
 r151 {
}
QString Variable::name() const noexcept
{
perrinel
Add thread protection on variable
 r512 impl->lockRead();
auto name = impl->m_Name;
impl->unlock();
return name;
Alexandre Leroux
Changes Variable from struct to class
 r151 }
perrinel
add CacheRange for Variable and the provideNotInCacheRangeList method
 r503 SqpRange Variable::range() const noexcept
perrinel
The mock plugin can now create data with view operation
 r219 {
perrinel
Add thread protection on variable
 r512 impl->lockRead();
auto range = impl->m_Range;
impl->unlock();
return range;
perrinel
The mock plugin can now create data with view operation
 r219 }
perrinel
add CacheRange for Variable and the provideNotInCacheRangeList method
 r503 void Variable::setRange(const SqpRange &range) noexcept
perrinel
Implementation of the new Dela T computation strategy
 r241 {
perrinel
Add thread protection on variable
 r512 impl->lockWrite();
perrinel
add CacheRange for Variable and the provideNotInCacheRangeList method
 r503 impl->m_Range = range;
Alexandre Leroux
Fixed untimely update of the range to be displayed in the variable widget
 r611 impl->updateRealRange();
perrinel
Add thread protection on variable
 r512 impl->unlock();
perrinel
add CacheRange for Variable and the provideNotInCacheRangeList method
 r503 }
SqpRange Variable::cacheRange() const noexcept
{
perrinel
Add thread protection on variable
 r512 impl->lockRead();
auto cacheRange = impl->m_CacheRange;
impl->unlock();
return cacheRange;
perrinel
add CacheRange for Variable and the provideNotInCacheRangeList method
 r503 }
void Variable::setCacheRange(const SqpRange &cacheRange) noexcept
{
perrinel
Add thread protection on variable
 r512 impl->lockWrite();
perrinel
add CacheRange for Variable and the provideNotInCacheRangeList method
 r503 impl->m_CacheRange = cacheRange;
perrinel
Add thread protection on variable
 r512 impl->unlock();
perrinel
Implementation of the new Dela T computation strategy
 r241 }
Alexandre Leroux
Fixed untimely update of the range to be displayed in the variable widget
 r611 SqpRange Variable::realRange() const noexcept
{
return impl->m_RealRange;
}
Alexandre Leroux
Use std::shared_ptr in CosinusProvider
 r287 void Variable::setDataSeries(std::shared_ptr<IDataSeries> dataSeries) noexcept
Alexandre Leroux
Adds data series to a variable
 r152 {
perrinel
The dataSeries of a variable is now shared istead of uniq to avoid...
 r513 qCDebug(LOG_Variable()) << "TORM Variable::setDataSeries"
<< QThread::currentThread()->objectName();
Alexandre Leroux
Use std::shared_ptr in CosinusProvider
 r287 if (!dataSeries) {
/// @todo ALX : log
return;
Alexandre Leroux
Adds data series to a variable
 r152 }
perrinel
Add thread protection on variable
 r512 impl->lockWrite();
perrinel
Update Variable impl for v5
 r509 impl->m_DataSeries = dataSeries->clone();
Alexandre Leroux
Fixed untimely update of the range to be displayed in the variable widget
 r611 impl->updateRealRange();
perrinel
Add thread protection on variable
 r512 impl->unlock();
perrinel
Update Variable impl for v5
 r509 }
void Variable::mergeDataSeries(std::shared_ptr<IDataSeries> dataSeries) noexcept
{
perrinel
The dataSeries of a variable is now shared istead of uniq to avoid...
 r513 qCDebug(LOG_Variable()) << "TORM Variable::mergeDataSeries"
perrinel
Add thread protection on variable
 r512 << QThread::currentThread()->objectName();
perrinel
Update Variable impl for v5
 r509 if (!dataSeries) {
/// @todo ALX : log
return;
}
// Add or merge the data
Alexandre Leroux
Use std::shared_ptr in CosinusProvider
 r287 // Inits the data series of the variable
perrinel
Add thread protection on variable
 r512 impl->lockWrite();
Alexandre Leroux
Use std::shared_ptr in CosinusProvider
 r287 if (!impl->m_DataSeries) {
impl->m_DataSeries = dataSeries->clone();
}
else {
perrinel
The mock plugin can now create data with view operation
 r219 impl->m_DataSeries->merge(dataSeries.get());
}
perrinel
Add thread protection on variable
 r512 impl->unlock();
perrinel
Update Variable impl for v5
 r509
// sub the data
Alexandre Leroux
Renames subData() to subDataSeries()...
 r522 auto subData = this->dataSeries()->subDataSeries(this->cacheRange());
perrinel
The dataSeries of a variable is now shared istead of uniq to avoid...
 r513 qCDebug(LOG_Variable()) << "TORM: Variable::mergeDataSeries sub" << subData->range();
perrinel
Update Variable impl for v5
 r509 this->setDataSeries(subData);
perrinel
The dataSeries of a variable is now shared istead of uniq to avoid...
 r513 qCDebug(LOG_Variable()) << "TORM: Variable::mergeDataSeries set" << this->dataSeries()->range();
Alexandre Leroux
Adds data series to a variable
 r152 }
Alexandre Leroux
Handles creations for scalar series
 r169
perrinel
The dataSeries of a variable is now shared istead of uniq to avoid...
 r513 std::shared_ptr<IDataSeries> Variable::dataSeries() const noexcept
Alexandre Leroux
Handles creations for scalar series
 r169 {
perrinel
Add thread protection on variable
 r512 impl->lockRead();
perrinel
The dataSeries of a variable is now shared istead of uniq to avoid...
 r513 auto dataSeries = impl->m_DataSeries;
perrinel
Add thread protection on variable
 r512 impl->unlock();
return dataSeries;
Alexandre Leroux
Handles creations for scalar series
 r169 }
perrinel
Variable slot is called when x range of its graph changed
 r210
Alexandre Leroux
Adds QVariantHash to store metadata in a variable
 r373 QVariantHash Variable::metadata() const noexcept
{
perrinel
Add thread protection on variable
 r512 impl->lockRead();
auto metadata = impl->m_Metadata;
impl->unlock();
return metadata;
Alexandre Leroux
Adds QVariantHash to store metadata in a variable
 r373 }
perrinel
add CacheRange for Variable and the provideNotInCacheRangeList method
 r503 bool Variable::contains(const SqpRange &range) const noexcept
perrinel
Variable slot is called when x range of its graph changed
 r210 {
perrinel
Add thread protection on variable
 r512 impl->lockRead();
auto res = impl->m_Range.contains(range);
impl->unlock();
return res;
perrinel
Variable slot is called when x range of its graph changed
 r210 }
perrinel
Add intersect méthode on variable and sqpDateTime...
 r240
perrinel
add CacheRange for Variable and the provideNotInCacheRangeList method
 r503 bool Variable::intersect(const SqpRange &range) const noexcept
perrinel
Add intersect méthode on variable and sqpDateTime...
 r240 {
perrinel
Add thread protection on variable
 r512
impl->lockRead();
auto res = impl->m_Range.intersect(range);
impl->unlock();
return res;
perrinel
Add intersect méthode on variable and sqpDateTime...
 r240 }
perrinel
The cache is now updated only if date requested has been successfully...
 r293
perrinel
add CacheRange for Variable and the provideNotInCacheRangeList method
 r503 bool Variable::isInside(const SqpRange &range) const noexcept
perrinel
The cache is now updated only if date requested has been successfully...
 r293 {
perrinel
Add thread protection on variable
 r512 impl->lockRead();
auto res = range.contains(SqpRange{impl->m_Range.m_TStart, impl->m_Range.m_TEnd});
impl->unlock();
return res;
perrinel
add CacheRange for Variable and the provideNotInCacheRangeList method
 r503 }
bool Variable::cacheContains(const SqpRange &range) const noexcept
{
perrinel
Add thread protection on variable
 r512 impl->lockRead();
auto res = impl->m_CacheRange.contains(range);
impl->unlock();
return res;
perrinel
add CacheRange for Variable and the provideNotInCacheRangeList method
 r503 }
bool Variable::cacheIntersect(const SqpRange &range) const noexcept
{
perrinel
Add thread protection on variable
 r512 impl->lockRead();
auto res = impl->m_CacheRange.intersect(range);
impl->unlock();
return res;
perrinel
add CacheRange for Variable and the provideNotInCacheRangeList method
 r503 }
bool Variable::cacheIsInside(const SqpRange &range) const noexcept
{
perrinel
Add thread protection on variable
 r512 impl->lockRead();
auto res = range.contains(SqpRange{impl->m_CacheRange.m_TStart, impl->m_CacheRange.m_TEnd});
impl->unlock();
return res;
perrinel
add CacheRange for Variable and the provideNotInCacheRangeList method
 r503 }
perrinel
Add thread protection on variable
 r512 QVector<SqpRange> Variable::provideNotInCacheRangeList(const SqpRange &range) const noexcept
perrinel
add CacheRange for Variable and the provideNotInCacheRangeList method
 r503 {
perrinel
Add method to get range in cacheRange
 r537 // This code assume that cach in contigue. Can return 0, 1 or 2 SqpRange
perrinel
add CacheRange for Variable and the provideNotInCacheRangeList method
 r503 auto notInCache = QVector<SqpRange>{};
if (!this->cacheContains(range)) {
if (range.m_TEnd <= impl->m_CacheRange.m_TStart
|| range.m_TStart >= impl->m_CacheRange.m_TEnd) {
notInCache << range;
}
else if (range.m_TStart < impl->m_CacheRange.m_TStart
&& range.m_TEnd <= impl->m_CacheRange.m_TEnd) {
notInCache << SqpRange{range.m_TStart, impl->m_CacheRange.m_TStart};
}
else if (range.m_TStart < impl->m_CacheRange.m_TStart
&& range.m_TEnd > impl->m_CacheRange.m_TEnd) {
notInCache << SqpRange{range.m_TStart, impl->m_CacheRange.m_TStart}
perrinel
Update Variable impl for v5
 r509 << SqpRange{impl->m_CacheRange.m_TEnd, range.m_TEnd};
perrinel
add CacheRange for Variable and the provideNotInCacheRangeList method
 r503 }
else if (range.m_TStart < impl->m_CacheRange.m_TEnd) {
perrinel
Update Variable impl for v5
 r509 notInCache << SqpRange{impl->m_CacheRange.m_TEnd, range.m_TEnd};
perrinel
add CacheRange for Variable and the provideNotInCacheRangeList method
 r503 }
else {
qCCritical(LOG_Variable()) << tr("Detection of unknown case.")
<< QThread::currentThread();
}
}
return notInCache;
perrinel
The cache is now updated only if date requested has been successfully...
 r293 }
perrinel
Add method to get range in cacheRange
 r537
QVector<SqpRange> Variable::provideInCacheRangeList(const SqpRange &range) const noexcept
{
// This code assume that cach in contigue. Can return 0 or 1 SqpRange
auto inCache = QVector<SqpRange>{};
perrinel
Add test for cach providing methods of variable
 r552 if (this->intersect(range)) {
if (range.m_TStart <= impl->m_CacheRange.m_TStart
&& range.m_TEnd >= impl->m_CacheRange.m_TStart
&& range.m_TEnd < impl->m_CacheRange.m_TEnd) {
inCache << SqpRange{impl->m_CacheRange.m_TStart, range.m_TEnd};
perrinel
Add method to get range in cacheRange
 r537 }
else if (range.m_TStart >= impl->m_CacheRange.m_TStart
perrinel
Add test for cach providing methods of variable
 r552 && range.m_TEnd <= impl->m_CacheRange.m_TEnd) {
perrinel
Add method to get range in cacheRange
 r537 inCache << range;
}
perrinel
Add test for cach providing methods of variable
 r552 else if (range.m_TStart > impl->m_CacheRange.m_TStart
&& range.m_TEnd > impl->m_CacheRange.m_TEnd) {
inCache << SqpRange{range.m_TStart, impl->m_CacheRange.m_TEnd};
}
else if (range.m_TStart <= impl->m_CacheRange.m_TStart
&& range.m_TEnd >= impl->m_CacheRange.m_TEnd) {
inCache << impl->m_CacheRange;
perrinel
Add method to get range in cacheRange
 r537 }
else {
qCCritical(LOG_Variable()) << tr("Detection of unknown case.")
<< QThread::currentThread();
}
}
return inCache;
}