GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation Commit - r538:ba71c0cdaccd

add Skeleton for displaying data which are already in cache

perrinel -

r538:ba71c0cdaccd

parent child

Context file:

r538:ba71c0cdaccd

core/include/Variable/VariableController.h +3 0

                 /// Signal emitted when a data acquisition is requested on a range for a variable
                 void rangeChanged(std::shared_ptr<Variable> variable, const SqpRange &range);
+                /// Signal emitted when a sub range of the cacheRange of the variable can be displayed
+                void updateVarDisplaying(std::shared_ptr<Variable> variable, const SqpRange &range);
             public slots:
                 /// Request the data loading of the variable whithin range
                 void onRequestDataLoading(QVector<std::shared_ptr<Variable> > variables, const SqpRange &range,

core/src/Variable/VariableController.cpp +10 -1

                           m_VariableSelectionModel{new QItemSelectionModel{m_VariableModel, parent}},
                           m_VariableCacheController{std::make_unique<VariableCacheController>()},
                           m_VariableCacheStrategy{std::make_unique<VariableCacheStrategy>()},
-                          m_VariableAcquisitionWorker{std::make_unique<VariableAcquisitionWorker>()}
+                          m_VariableAcquisitionWorker{std::make_unique<VariableAcquisitionWorker>()},
+                          q{parent}
                 {
                     m_VariableAcquisitionWorker->moveToThread(&m_VariableAcquisitionWorkerThread);
                     m_GroupIdToVariableSynchronizationGroupMap;
                 std::map<QUuid, QUuid> m_VariableIdGroupIdMap;
                 std::set<std::shared_ptr<IDataProvider> > m_ProviderSet;
+                VariableController *q;
             };
                 auto varRangesRequested
                     = m_VariableCacheStrategy->computeCacheRange(var->range(), rangeRequested);
                 auto notInCacheRangeList = var->provideNotInCacheRangeList(varRangesRequested.second);
+                auto inCacheRangeList = var->provideInCacheRangeList(varRangesRequested.second);
                 if (!notInCacheRangeList.empty()) {
                     auto identifier = m_VariableToIdentifierMap.at(var);
                         qCCritical(LOG_VariableController())
                             << "Impossible to provide data with a null provider";
                     }
+                    if (!inCacheRangeList.empty()) {
+                        emit q->updateVarDisplaying(var, inCacheRangeList.first());
+                    }
                 }
                 else {
                     var->setRange(rangeRequested);

gui/include/Visualization/VisualizationGraphWidget.h +2 0

                 void onMouseRelease(QMouseEvent *event) noexcept;
                 void onDataCacheVariableUpdated();
+                void onUpdateVarDisplaying(std::shared_ptr<Variable> variable, const SqpRange &range);
             };
             #endif // SCIQLOP_VISUALIZATIONGRAPHWIDGET_H

gui/src/Visualization/VisualizationGraphHelper.cpp +17 -16

@@ -43,27 +43,28 void updateScalarData(QCPAbstractPlottable *component, std::shared_ptr<ScalarSer
43	if (auto qcpGraph = dynamic_cast<QCPGraph *>(component)) {	43	if (auto qcpGraph = dynamic_cast<QCPGraph *>(component)) {
44	scalarSeries->lockRead();	44	scalarSeries->lockRead();
45	{	45	{
46	~~const~~ ~~auto~~ &~~xData~~ = scalarSeries->~~xAxisData~~()->~~cdata();~~	46	// auto bounds = scalarSeries->subData(rang
47	const auto &~~values~~Data = scalarSeries->~~value~~sData()->cdata();	47	// const auto &xData = scalarSeries->xAxisData()->cdata();
		48	// const auto &valuesData = scalarSeries->valuesData()->cdata();
48		49
49	auto xDataBegin = xData.cbegin();	50	// auto xDataBegin = xData.cbegin();
50	auto xDataEnd = xData.cend();	51	// auto xDataEnd = xData.cend();
51		52
52	qCInfo(LOG_VisualizationGraphHelper()) << "TODEBUG: Current points in cache"	53	// qCInfo(LOG_VisualizationGraphHelper()) << "TODEBUG: Current points in cache"
53	<< xData.count();	54	// << xData.count();
54		55
55	auto sqpDataContainer = QSharedPointer<SqpDataContainer>::create();	56	// auto sqpDataContainer = QSharedPointer<SqpDataContainer>::create();
56	qcpGraph->setData(sqpDataContainer);	57	// qcpGraph->setData(sqpDataContainer);
57		58
58	auto lowerIt = std::lower_bound(xDataBegin, xDataEnd, dateTime.m_TStart);	59	// auto lowerIt = std::lower_bound(xDataBegin, xDataEnd, dateTime.m_TStart);
59	auto upperIt = std::upper_bound(xDataBegin, xDataEnd, dateTime.m_TEnd);	60	// auto upperIt = std::upper_bound(xDataBegin, xDataEnd, dateTime.m_TEnd);
60	auto distance = std::distance(xDataBegin, lowerIt);	61	// auto distance = std::distance(xDataBegin, lowerIt);
61		62
62	auto valuesDataIt = valuesData.cbegin() + distance;	63	// auto valuesDataIt = valuesData.cbegin() + distance;
63	for (auto xAxisDataIt = lowerIt; xAxisDataIt != upperIt;	64	// for (auto xAxisDataIt = lowerIt; xAxisDataIt != upperIt;
64	++xAxisDataIt, ++valuesDataIt) {	65	// ++xAxisDataIt, ++valuesDataIt) {
65	sqpDataContainer->appendGraphData(QCPGraphData(xAxisDataIt, valuesDataIt));	66	// sqpDataContainer->appendGraphData(QCPGraphData(xAxisDataIt, valuesDataIt));
66	}	67	// }
67		68
68	qCInfo(LOG_VisualizationGraphHelper()) << "TODEBUG: Current points displayed"	69	qCInfo(LOG_VisualizationGraphHelper()) << "TODEBUG: Current points displayed"
69	<< sqpDataContainer->size();	70	<< sqpDataContainer->size();

gui/src/Visualization/VisualizationGraphWidget.cpp +13 0

@@ -80,6 +80,9 VisualizationGraphWidget::VisualizationGraphWidget(const QString &name, QWidget
80		80
81	connect(this, &VisualizationGraphWidget::requestDataLoading, &sqpApp->variableController(),	81	connect(this, &VisualizationGraphWidget::requestDataLoading, &sqpApp->variableController(),
82	&VariableController::onRequestDataLoading);	82	&VariableController::onRequestDataLoading);
		83
		84	connect(&sqpApp->variableController(), &VariableController::updateVarDisplaying, this,
		85	&VisualizationGraphWidget::onUpdateVarDisplaying);
83	}	86	}
84		87
85		88
@@ -305,3 +308,13 void VisualizationGraphWidget::onDataCacheVariableUpdated()
305	}	308	}
306	}	309	}
307	}	310	}
		311
		312	void VisualizationGraphWidget::onUpdateVarDisplaying(std::shared_ptr<Variable> variable,
		313	const SqpRange &range)
		314	{
		315	auto componentsIt = impl->m_VariableToPlotMultiMap.equal_range(variable);
		316	for (auto it = componentsIt.first; it != componentsIt.second;) {
		317	VisualizationGraphHelper::updateData(QVector<QCPAbstractPlottable *>{} << it->second,
		318	variable->dataSeries(), range);
		319	}
		320	}

General Comments 1

perrinel

|

Auto status change to "Under Review"

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