GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation Commit - r611:aff19a50babf

Fixed untimely update of the range to be displayed in the variable widget

Alexandre Leroux -

r611:aff19a50babf

parent child

Context file:

r611:aff19a50babf

Collapse all files

core/include/Data/SqpRange.h +13 0

@@ -26,8 +26,21 struct SqpRange {
26	{	26	{
27	return (m_TEnd >= dateTime.m_TStart && m_TStart <= dateTime.m_TEnd);	27	return (m_TEnd >= dateTime.m_TStart && m_TStart <= dateTime.m_TEnd);
28	}	28	}
		29
		30	bool operator==(const SqpRange &other) const
		31	{
		32	auto equals = [](const auto &v1, const auto &v2) {
		33	return (std::isnan(v1) && std::isnan(v2)) \|\| v1 == v2;
		34	};
		35
		36	return equals(m_TStart, other.m_TStart) && equals(m_TEnd, other.m_TEnd);
		37	}
		38	bool operator!=(const SqpRange &other) const { return !(*this == other); }
29	};	39	};
30		40
		41	const auto INVALID_RANGE
		42	= SqpRange{std::numeric_limits<double>::quiet_NaN(), std::numeric_limits<double>::quiet_NaN()};
		43
31	inline QDebug operator<<(QDebug d, SqpRange obj)	44	inline QDebug operator<<(QDebug d, SqpRange obj)
32	{	45	{
33	auto tendDateTimeStart = DateUtils::dateTime(obj.m_TStart);	46	auto tendDateTimeStart = DateUtils::dateTime(obj.m_TStart);

core/include/Variable/Variable.h +9 0

             #include "CoreGlobal.h"
+            #include <Data/DataSeriesIterator.h>
             #include <Data/SqpRange.h>
             #include <QLoggingCategory>
                 SqpRange cacheRange() const noexcept;
                 void setCacheRange(const SqpRange &cacheRange) noexcept;
+                /// Returns the real range of the variable, i.e. the min and max x-axis values of the data
+                /// series between the range of the variable. The real range is updated each time the variable
+                /// range or the data series changed
+                /// @return the real range, invalid range if the data series is null or empty
+                /// @sa setDataSeries()
+                /// @sa setRange()
+                SqpRange realRange() const noexcept;
                 /// @return the data of the variable, nullptr if there is no data
                 std::shared_ptr<IDataSeries> dataSeries() const noexcept;

core/src/Variable/Variable.cpp +32 -1

             struct Variable::VariablePrivate {
                 explicit VariablePrivate(const QString &name, const SqpRange &dateTime,
                                          const QVariantHash &metadata)
-                        : m_Name{name}, m_Range{dateTime}, m_Metadata{metadata}, m_DataSeries{nullptr}
+                        : m_Name{name},
+                          m_Range{dateTime},
+                          m_Metadata{metadata},
+                          m_DataSeries{nullptr},
+                          m_RealRange{INVALID_RANGE}
                 {
                 }
                 void lockWrite() { m_Lock.lockForWrite(); }
                 void unlock() { m_Lock.unlock(); }
+                /// 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;
+                    }
+                }
                 QString m_Name;
                 SqpRange m_Range;
                 SqpRange m_CacheRange;
                 QVariantHash m_Metadata;
                 std::shared_ptr<IDataSeries> m_DataSeries;
+                SqpRange m_RealRange;
                 QReadWriteLock m_Lock;
             };
             {
                 impl->lockWrite();
                 impl->m_Range = range;
+                impl->updateRealRange();
                 impl->unlock();
             }
                 impl->unlock();
             }
+            SqpRange Variable::realRange() const noexcept
+            {
+                return impl->m_RealRange;
+            }
             void Variable::setDataSeries(std::shared_ptr<IDataSeries> dataSeries) noexcept
             {
                 qCDebug(LOG_Variable()) << "TORM Variable::setDataSeries"
                 }
                 impl->lockWrite();
                 impl->m_DataSeries = dataSeries->clone();
+                impl->updateRealRange();
                 impl->unlock();
             }

core/src/Variable/VariableModel.cpp +12 -26

@@ -153,35 +153,21 QVariant VariableModel::data(const QModelIndex &index, int role) const
153		153
154	if (role == Qt::DisplayRole) {	154	if (role == Qt::DisplayRole) {
155	if (auto variable = impl->m_Variables.at(index.row()).get()) {	155	if (auto variable = impl->m_Variables.at(index.row()).get()) {
156	/// Lambda function that builds the variant to return for a time value
157	/// @param getValueFun function used to get for a data series the iterator on the entry
158	/// that contains the time value to display
159	auto dateTimeVariant = [variable](const auto &getValueFun) {
160	if (auto dataSeries = variable->dataSeries()) {
161	dataSeries->lockRead();
162	auto it = getValueFun(*dataSeries);
163	auto resVariant = (it != dataSeries->cend())
164	? DateUtils::dateTime(it->x()).toString(DATETIME_FORMAT)
165	: QVariant{};
166	dataSeries->unlock();
167	return resVariant;
168	}
169	else {
170	return QVariant{};
171	}
172	};
173
174	switch (index.column()) {	156	switch (index.column()) {
175	case NAME_COLUMN:	157	case NAME_COLUMN:
176	return variable->name();	158	return variable->name();
177	case TSTART_COLUMN:	159	case TSTART_COLUMN: {
178	// Shows the min value of the data series above the range tstart	160	auto range = variable->realRange();
179	return dateTimeVariant([min = variable->range().m_TStart](	161	return range != INVALID_RANGE
180	const auto &dataSeries) { return dataSeries.minXAxisData(min); });	162	? DateUtils::dateTime(range.m_TStart).toString(DATETIME_FORMAT)
181	case TEND_COLUMN:	163	: QVariant{};
182	// Shows the max value of the data series under the range tend	164	}
183	return dateTimeVariant([max = variable->range().m_TEnd](	165	case TEND_COLUMN: {
184	const auto &dataSeries) { return dataSeries.maxXAxisData(max); });	166	auto range = variable->realRange();
		167	return range != INVALID_RANGE
		168	? DateUtils::dateTime(range.m_TEnd).toString(DATETIME_FORMAT)
		169	: QVariant{};
		170	}
185	case UNIT_COLUMN:	171	case UNIT_COLUMN:
186	return variable->metadata().value(QStringLiteral("units"));	172	return variable->metadata().value(QStringLiteral("units"));
187	case MISSION_COLUMN:	173	case MISSION_COLUMN:

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