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

Fork of HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop

Fix bug when creating two variables crash the app. ...
Fix bug when creating two variables crash the app. Variable as now invalid range and cache range at creation
perrinel - - Load All Authors

File last commit:

r699:a7f60f6512e6
r699:a7f60f6512e6
Show More
Variable.cpp
315 lines | 8.6 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
Fix bug when creating two variables crash the app. ...
 r699 explicit VariablePrivate(const QString &name, const QVariantHash &metadata)
Alexandre Leroux
Fixed untimely update of the range to be displayed in the variable widget
 r611 : m_Name{name},
perrinel
Fix bug when creating two variables crash the app. ...
 r699 m_Range{INVALID_RANGE},
m_CacheRange{INVALID_RANGE},
Alexandre Leroux
Fixed untimely update of the range to be displayed in the variable widget
 r611 m_Metadata{metadata},
m_DataSeries{nullptr},
Alexandre Leroux
Creates attribute to get nb points of a variable
 r659 m_RealRange{INVALID_RANGE},
m_NbPoints{0}
Alexandre Leroux
Changes Variable from struct to class
 r151 {
}
Alexandre Leroux
Clones variable
 r651 VariablePrivate(const VariablePrivate &other)
: m_Name{other.m_Name},
m_Range{other.m_Range},
perrinel
Fix bug when creating two variables crash the app. ...
 r699 m_CacheRange{other.m_CacheRange},
Alexandre Leroux
Clones variable
 r651 m_Metadata{other.m_Metadata},
m_DataSeries{other.m_DataSeries != nullptr ? other.m_DataSeries->clone() : nullptr},
Alexandre Leroux
Creates attribute to get nb points of a variable
 r659 m_RealRange{other.m_RealRange},
m_NbPoints{other.m_NbPoints}
Alexandre Leroux
Clones variable
 r651 {
}
perrinel
Add thread protection on variable
 r512 void lockRead() { m_Lock.lockForRead(); }
void lockWrite() { m_Lock.lockForWrite(); }
void unlock() { m_Lock.unlock(); }
Alexandre Leroux
Calls purge() method when setting cache range or data series of a variable
 r630 void purgeDataSeries()
{
if (m_DataSeries) {
m_DataSeries->purge(m_CacheRange.m_TStart, m_CacheRange.m_TEnd);
}
updateRealRange();
Alexandre Leroux
Updates variable attribute when data series is changing
 r661 updateNbPoints();
Alexandre Leroux
Calls purge() method when setting cache range or data series of a variable
 r630 }
Alexandre Leroux
Updates variable attribute when data series is changing
 r661 void updateNbPoints() { m_NbPoints = m_DataSeries ? m_DataSeries->nbPoints() : 0; }
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);
perrinel
Fix bug when creating two variables crash the app. ...
 r699 m_RealRange
= (minXAxisIt != end && maxXAxisIt != end && minXAxisIt->x() <= maxXAxisIt->x())
? SqpRange{minXAxisIt->x(), maxXAxisIt->x()}
: INVALID_RANGE;
Alexandre Leroux
Fixed untimely update of the range to be displayed in the variable widget
 r611 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;
Alexandre Leroux
Creates attribute to get nb points of a variable
 r659 int m_NbPoints;
perrinel
Add thread protection on variable
 r512
QReadWriteLock m_Lock;
Alexandre Leroux
Changes Variable from struct to class
 r151 };
perrinel
Fix bug when creating two variables crash the app. ...
 r699 Variable::Variable(const QString &name, const QVariantHash &metadata)
: impl{spimpl::make_unique_impl<VariablePrivate>(name, metadata)}
Alexandre Leroux
Changes Variable from struct to class
 r151 {
}
Alexandre Leroux
Clones variable
 r651 Variable::Variable(const Variable &other)
: impl{spimpl::make_unique_impl<VariablePrivate>(*other.impl)}
{
}
std::shared_ptr<Variable> Variable::clone() const
{
return std::make_shared<Variable>(*this);
}
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 }
Alexandre Leroux
Sets variable name
 r638 void Variable::setName(const QString &name) noexcept
{
impl->lockWrite();
impl->m_Name = name;
impl->unlock();
}
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();
Alexandre Leroux
Calls purge() method when setting cache range or data series of a variable
 r630 if (cacheRange != impl->m_CacheRange) {
impl->m_CacheRange = cacheRange;
impl->purgeDataSeries();
}
perrinel
Add thread protection on variable
 r512 impl->unlock();
perrinel
Implementation of the new Dela T computation strategy
 r241 }
Alexandre Leroux
Creates attribute to get nb points of a variable
 r659 int Variable::nbPoints() const noexcept
{
return impl->m_NbPoints;
}
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;
}
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
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());
}
Alexandre Leroux
Calls purge() method when setting cache range or data series of a variable
 r630 impl->purgeDataSeries();
perrinel
Add thread protection on variable
 r512 impl->unlock();
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>{};
perrinel
Fix bug when creating two variables crash the app. ...
 r699 if (impl->m_CacheRange != INVALID_RANGE) {
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}
<< SqpRange{impl->m_CacheRange.m_TEnd, range.m_TEnd};
}
else if (range.m_TStart < impl->m_CacheRange.m_TEnd) {
notInCache << SqpRange{impl->m_CacheRange.m_TEnd, range.m_TEnd};
}
else {
qCCritical(LOG_Variable()) << tr("Detection of unknown case.")
<< QThread::currentThread();
}
perrinel
add CacheRange for Variable and the provideNotInCacheRangeList method
 r503 }
}
perrinel
Fix bug when creating two variables crash the app. ...
 r699 else {
notInCache << range;
}
perrinel
add CacheRange for Variable and the provideNotInCacheRangeList method
 r503
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
Fix bug when creating two variables crash the app. ...
 r699 if (impl->m_CacheRange != INVALID_RANGE) {
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};
}
else if (range.m_TStart >= impl->m_CacheRange.m_TStart
&& range.m_TEnd <= impl->m_CacheRange.m_TEnd) {
inCache << range;
}
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;
}
else {
qCCritical(LOG_Variable()) << tr("Detection of unknown case.")
<< QThread::currentThread();
}
perrinel
Add method to get range in cacheRange
 r537 }
}
return inCache;
}