GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation Commit - r540:23422057e407

Merge branch 'feature/DisplayDataBeforeAcquisition' into develop

perrinel -

r540:23422057e407

parent child

Context file:

r540:23422057e407

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

                  bool cacheIsInside(const SqpRange &range) const noexcept;
                  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;

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/Variable.cpp +32 0

		@@ -182,6 +182,8 bool Variable::cacheIsInside(const SqpRange &range) const noexcept
182	182
183	183	QVector<SqpRange> Variable::provideNotInCacheRangeList(const SqpRange &range) const noexcept
184	184	{
	185	// This code assume that cach in contigue. Can return 0, 1 or 2 SqpRange
	186
185	187	auto notInCache = QVector<SqpRange>{};
186	188
187	189	if (!this->cacheContains(range)) {
		@@ -209,3 +211,33 QVector<SqpRange> Variable::provideNotInCacheRangeList(const SqpRange &range) co
209	211
210	212	return notInCache;
211	213	}
	214
	215	QVector<SqpRange> Variable::provideInCacheRangeList(const SqpRange &range) const noexcept
	216	{
	217	// This code assume that cach in contigue. Can return 0 or 1 SqpRange
	218
	219	auto inCache = QVector<SqpRange>{};
	220
	221
	222	if (this->cacheContains(range)) {
	223	if (range.m_TStart <= impl->m_CacheRange.m_TEnd
	224	&& range.m_TEnd >= impl->m_CacheRange.m_TEnd) {
	225	inCache << SqpRange{range.m_TStart, impl->m_CacheRange.m_TEnd};
	226	}
	227
	228	else if (range.m_TStart >= impl->m_CacheRange.m_TStart
	229	&& range.m_TEnd < impl->m_CacheRange.m_TEnd) {
	230	inCache << range;
	231	}
	232	else if (range.m_TStart < impl->m_CacheRange.m_TStart
	233	&& range.m_TEnd >= impl->m_CacheRange.m_TStart) {
	234	inCache << SqpRange{impl->m_CacheRange.m_TStart, range.m_TEnd};
	235	}
	236	else {
	237	qCCritical(LOG_Variable()) << tr("Detection of unknown case.")
	238	<< QThread::currentThread();
	239	}
	240	}
	241
	242	return inCache;
	243	}

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 +4 -19

              }
              void updateScalarData(QCPAbstractPlottable *component, std::shared_ptr<ScalarSeries> scalarSeries,
-                                   const SqpRange &dateTime)
+                                   const SqpRange &range)
              {
                  qCDebug(LOG_VisualizationGraphHelper()) << "TORM: updateScalarData"
                                                          << QThread::currentThread()->objectName();
                  if (auto qcpGraph = dynamic_cast<QCPGraph *>(component)) {
                      scalarSeries->lockRead();
                      {
-                         const auto &xData = scalarSeries->xAxisData()->cdata();
-                         const auto &valuesData = scalarSeries->valuesData()->cdata();
-                         auto xDataBegin = xData.cbegin();
-                         auto xDataEnd = xData.cend();
-                         qCInfo(LOG_VisualizationGraphHelper()) << "TODEBUG: Current points in cache"
-                                                                << xData.count();
                          auto sqpDataContainer = QSharedPointer<SqpDataContainer>::create();
                          qcpGraph->setData(sqpDataContainer);
-                         auto lowerIt = std::lower_bound(xDataBegin, xDataEnd, dateTime.m_TStart);
-                         auto upperIt = std::upper_bound(xDataBegin, xDataEnd, dateTime.m_TEnd);
-                         auto distance = std::distance(xDataBegin, lowerIt);
-                         auto valuesDataIt = valuesData.cbegin() + distance;
-                         for (auto xAxisDataIt = lowerIt; xAxisDataIt != upperIt;
-                              ++xAxisDataIt, ++valuesDataIt) {
-                             sqpDataContainer->appendGraphData(QCPGraphData(*xAxisDataIt, *valuesDataIt));
+                         auto bounds = scalarSeries->subData(range.m_TStart, range.m_TEnd);
+                         for (auto it = bounds.first; it != bounds.second; ++it) {
+                             sqpDataContainer->appendGraphData(QCPGraphData(it->x(), it->value()));
                          }
                          qCInfo(LOG_VisualizationGraphHelper()) << "TODEBUG: Current points displayed"

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

                  connect(this, &VisualizationGraphWidget::requestDataLoading, &sqpApp->variableController(),
                          &VariableController::onRequestDataLoading);
+                 connect(&sqpApp->variableController(), &VariableController::updateVarDisplaying, this,
+                         &VisualizationGraphWidget::onUpdateVarDisplaying);
              }
                      }
                  }
              }
+             void VisualizationGraphWidget::onUpdateVarDisplaying(std::shared_ptr<Variable> variable,
+                                                                  const SqpRange &range)
+             {
+                 auto componentsIt = impl->m_VariableToPlotMultiMap.equal_range(variable);
+                 for (auto it = componentsIt.first; it != componentsIt.second;) {
+                     VisualizationGraphHelper::updateData(QVector<QCPAbstractPlottable *>{} << it->second,
+                                                          variable->dataSeries(), range);
+                 }
+             }

plugins/amda/tests/TestAmdaResultParser.cpp +4 -4

                                                       QVector<QDateTime>{}, QVector<double>{}};
                  // Invalid files
-                 QTest::newRow("Invalid file (unexisting file)")
-                     << QStringLiteral("UnexistingFile.txt") << ExpectedResults<ScalarSeries>{};
+                 QTest::newRow("Invalid file (unexisting file)") << QStringLiteral("UnexistingFile.txt")
+                                                                 << ExpectedResults<ScalarSeries>{};
-                 QTest::newRow("Invalid file (file not found on server)")
-                     << QStringLiteral("FileNotFound.txt") << ExpectedResults<ScalarSeries>{};
+                 QTest::newRow("Invalid file (file not found on server)") << QStringLiteral("FileNotFound.txt")
+                                                                          << ExpectedResults<ScalarSeries>{};
              }
              void TestAmdaResultParser::testReadScalarTxt()

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