GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation Commit - r513:4e7b3226237d

The dataSeries of a variable is now shared istead of uniq to avoid...

perrinel -

r513:4e7b3226237d

parent child

Context file:

r513:4e7b3226237d

core/src/Variable/Variable.cpp +8 -8

                  SqpRange m_Range;
                  SqpRange m_CacheRange;
                  QVariantHash m_Metadata;
-                 std::unique_ptr<IDataSeries> m_DataSeries;
+                 std::shared_ptr<IDataSeries> m_DataSeries;
                  QReadWriteLock m_Lock;
              };
              void Variable::setDataSeries(std::shared_ptr<IDataSeries> dataSeries) noexcept
              {
-                 qCInfo(LOG_Variable()) << "Variable::setDataSeries" << QThread::currentThread()->objectName();
+                 qCDebug(LOG_Variable()) << "TORM Variable::setDataSeries"
+                                         << QThread::currentThread()->objectName();
                  if (!dataSeries) {
                      /// @todo ALX : log
                      return;
              void Variable::mergeDataSeries(std::shared_ptr<IDataSeries> dataSeries) noexcept
              {
-                 qCDebug(LOG_Variable()) << "Variable::mergeDataSeries"
+                 qCDebug(LOG_Variable()) << "TORM Variable::mergeDataSeries"
                                          << QThread::currentThread()->objectName();
                  if (!dataSeries) {
                      /// @todo ALX : log
                  // sub the data
                  auto subData = this->dataSeries()->subData(this->cacheRange());
-                 qCCritical(LOG_Variable()) << "TORM: Variable::mergeDataSeries sub" << subData->range();
+                 qCDebug(LOG_Variable()) << "TORM: Variable::mergeDataSeries sub" << subData->range();
                  this->setDataSeries(subData);
-                 qCCritical(LOG_Variable()) << "TORM: Variable::mergeDataSeries set"
-                                            << this->dataSeries()->range();
+                 qCDebug(LOG_Variable()) << "TORM: Variable::mergeDataSeries set" << this->dataSeries()->range();
              }
-             IDataSeries *Variable::dataSeries() const noexcept
+             std::shared_ptr<IDataSeries> Variable::dataSeries() const noexcept
              {
                  impl->lockRead();
-                 auto dataSeries = impl->m_DataSeries.get();
+                 auto dataSeries = impl->m_DataSeries;
                  impl->unlock();
                  return dataSeries;

core/src/Variable/VariableAcquisitionWorker.cpp +2 -2

                                                                  DataProviderParameters parameters,
                                                                  std::shared_ptr<IDataProvider> provider)
              {
-                 qCDebug(LOG_VariableAcquisitionWorker())
+                 qCInfo(LOG_VariableAcquisitionWorker())
                      << tr("TORM VariableAcquisitionWorker::pushVariableRequest ") << cacheRangeRequested;
                  // Request creation
              void VariableAcquisitionWorker::onExecuteRequest(QUuid acqIdentifier)
              {
-                 qCDebug(LOG_VariableAcquisitionWorker()) << tr("onExecuteRequest") << QThread::currentThread();
+                 qCInfo(LOG_VariableAcquisitionWorker()) << tr("onExecuteRequest") << QThread::currentThread();
                  impl->lockRead();
                  auto it = impl->m_AcqIdentifierToAcqRequestMap.find(acqIdentifier);
                  if (it != impl->m_AcqIdentifierToAcqRequestMap.cend()) {

core/src/Variable/VariableController.cpp +9 -9

                      qCDebug(LOG_VariableController()) << tr("3: onDataProvided")
                                                        << retrievedDataSeries->range();
                      var->mergeDataSeries(retrievedDataSeries);
+                     qCDebug(LOG_VariableController()) << tr("4: onDataProvided");
                      emit var->updated();
                  }
                  else {
              {
                  // NOTE: oldRange isn't really necessary since oldRange == variable->range().
-                 qCDebug(LOG_VariableController()) << "VariableController::onRequestDataLoading"
-                                                   << QThread::currentThread()->objectName();
+                 qCInfo(LOG_VariableController()) << "VariableController::onRequestDataLoading"
+                                                  << QThread::currentThread()->objectName();
                  // we want to load data of the variable for the dateTime.
                  // First we check if the cache contains some of them.
                  // For the other, we ask the provider to give them.
                  auto notInCacheRangeList = var->provideNotInCacheRangeList(varRangesRequested.second);
                  if (!notInCacheRangeList.empty()) {
-                     // Display part of data which are already there
-                     // Ask the provider for each data on the dateTimeListNotInCache
                      auto identifier = m_VariableToIdentifierMap.at(var);
                      auto varProvider = m_VariableToProviderMap.at(var);
                      if (varProvider != nullptr) {
              std::shared_ptr<IDataSeries> VariableController::VariableControllerPrivate::retrieveDataSeries(
                  const QVector<AcquisitionDataPacket> acqDataPacketVector)
              {
-                 qCInfo(LOG_VariableController()) << tr("TORM: retrieveDataSeries acqDataPacketVector size")
-                                                  << acqDataPacketVector.size();
+                 qCDebug(LOG_VariableController()) << tr("TORM: retrieveDataSeries acqDataPacketVector size")
+                                                   << acqDataPacketVector.size();
                  std::shared_ptr<IDataSeries> dataSeries;
                  if (!acqDataPacketVector.isEmpty()) {
                      dataSeries = acqDataPacketVector[0].m_DateSeries;
                          dataSeries->merge(acqDataPacketVector[i].m_DateSeries.get());
                      }
                  }
+                 qCDebug(LOG_VariableController()) << tr("TORM: retrieveDataSeries acqDataPacketVector size END")
+                                                   << acqDataPacketVector.size();
                  return dataSeries;
              }
                  std::shared_ptr<IDataProvider> provider)
              {
                  if (m_ProviderSet.find(provider) == m_ProviderSet.end()) {
-                     qCInfo(LOG_VariableController()) << tr("Registering of a new provider")
-                                                      << provider->objectName();
+                     qCDebug(LOG_VariableController()) << tr("Registering of a new provider")
+                                                       << provider->objectName();
                      m_ProviderSet.insert(provider);
                      connect(provider.get(), &IDataProvider::dataProvided, m_VariableAcquisitionWorker.get(),
                              &VariableAcquisitionWorker::onVariableDataAcquired);

gui/include/Visualization/VisualizationGraphHelper.h +2 -2

                  static QVector<QCPAbstractPlottable *> create(std::shared_ptr<Variable> variable,
                                                                QCustomPlot &plot) noexcept;
-                 static void updateData(QVector<QCPAbstractPlottable *> plotableVect, IDataSeries *dataSeries,
-                                        const SqpRange &dateTime);
+                 static void updateData(QVector<QCPAbstractPlottable *> plotableVect,
+                                        std::shared_ptr<IDataSeries> dataSeries, const SqpRange &dateTime);
              };
              #endif // SCIQLOP_VISUALIZATIONGRAPHHELPER_H

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

                  }
              }
-             void updateScalarData(QCPAbstractPlottable *component, ScalarSeries &scalarSeries,
+             void updateScalarData(QCPAbstractPlottable *component, std::shared_ptr<ScalarSeries> scalarSeries,
                                    const SqpRange &dateTime)
              {
                  qCDebug(LOG_VisualizationGraphHelper()) << "TORM: updateScalarData"
                                                          << QThread::currentThread()->objectName();
                  if (auto qcpGraph = dynamic_cast<QCPGraph *>(component)) {
-                     scalarSeries.lockRead();
+                     scalarSeries->lockRead();
                      {
-                         const auto &xData = scalarSeries.xAxisData()->cdata();
-                         const auto &valuesData = scalarSeries.valuesData()->cdata();
+                         const auto &xData = scalarSeries->xAxisData()->cdata();
+                         const auto &valuesData = scalarSeries->valuesData()->cdata();
                          auto xDataBegin = xData.cbegin();
                          auto xDataEnd = xData.cend();
-                         qCInfo(LOG_VisualizationGraphHelper()) << "TORM: Current points in cache"
+                         qCInfo(LOG_VisualizationGraphHelper()) << "TODEBUG: Current points in cache"
                                                                 << xData.count();
                          auto sqpDataContainer = QSharedPointer<SqpDataContainer>::create();
                              sqpDataContainer->appendGraphData(QCPGraphData(*xAxisDataIt, *valuesDataIt));
                          }
-                         qCInfo(LOG_VisualizationGraphHelper()) << "TORM: Current points displayed"
+                         qCInfo(LOG_VisualizationGraphHelper()) << "TODEBUG: Current points displayed"
                                                                 << sqpDataContainer->size();
                      }
-                     scalarSeries.unlock();
+                     scalarSeries->unlock();
                      // Display all data
                  }
              }
-             QCPAbstractPlottable *createScalarSeriesComponent(ScalarSeries &scalarSeries, QCustomPlot &plot,
-                                                               const SqpRange &dateTime)
+             QCPAbstractPlottable *createScalarSeriesComponent(std::shared_ptr<ScalarSeries> scalarSeries,
+                                                               QCustomPlot &plot, const SqpRange &dateTime)
              {
                  auto component = plot.addGraph();
                  if (component) {
                      //        // Graph data
-                     component->setData(scalarSeries.xAxisData()->data(), scalarSeries.valuesData()->data(),
+                     component->setData(scalarSeries->xAxisData()->data(), scalarSeries->valuesData()->data(),
                                         true);
                      updateScalarData(component, scalarSeries, dateTime);
                          // ticker (depending on the type of unit)
                          axis->setTicker(axisTicker(unit.m_TimeUnit));
                      };
-                     setAxisProperties(plot.xAxis, scalarSeries.xAxisUnit());
-                     setAxisProperties(plot.yAxis, scalarSeries.valuesUnit());
+                     setAxisProperties(plot.xAxis, scalarSeries->xAxisUnit());
+                     setAxisProperties(plot.yAxis, scalarSeries->valuesUnit());
                      // Display all data
                      component->rescaleAxes();
                  if (variable) {
                      // Gets the data series of the variable to call the creation of the right components
                      // according to its type
-                     if (auto scalarSeries = dynamic_cast<ScalarSeries *>(variable->dataSeries())) {
-                         result.append(createScalarSeriesComponent(*scalarSeries, plot, variable->range()));
+                     if (auto scalarSeries = std::dynamic_pointer_cast<ScalarSeries>(variable->dataSeries())) {
+                         result.append(createScalarSeriesComponent(scalarSeries, plot, variable->range()));
                      }
                      else {
                          qCDebug(LOG_VisualizationGraphHelper())
              }
              void VisualizationGraphHelper::updateData(QVector<QCPAbstractPlottable *> plotableVect,
-                                                       IDataSeries *dataSeries, const SqpRange &dateTime)
+                                                       std::shared_ptr<IDataSeries> dataSeries,
+                                                       const SqpRange &dateTime)
              {
-                 if (auto scalarSeries = dynamic_cast<ScalarSeries *>(dataSeries)) {
+                 if (auto scalarSeries = std::dynamic_pointer_cast<ScalarSeries>(dataSeries)) {
                      if (plotableVect.size() == 1) {
-                         updateScalarData(plotableVect.at(0), *scalarSeries, dateTime);
+                         updateScalarData(plotableVect.at(0), scalarSeries, dateTime);
                      }
                      else {
                          qCCritical(LOG_VisualizationGraphHelper()) << QObject::tr(

gui/src/Visualization/VisualizationGraphWidget.cpp +1 -1

                                              !impl->m_IsCalibration);
                      if (!impl->m_IsCalibration) {
-                         qCInfo(LOG_VisualizationGraphWidget())
+                         qCDebug(LOG_VisualizationGraphWidget())
                              << tr("TORM: VisualizationGraphWidget::Synchronize notify !!")
                              << QThread::currentThread()->objectName() << graphRange << oldGraphRange;
                          emit synchronize(graphRange, oldGraphRange);

plugins/mockplugin/src/CosinusProvider.cpp +1 0

                  for (const auto &dateTime : qAsConst(times)) {
                      if (m_VariableToEnableProvider[acqIdentifier]) {
                          auto scalarSeries = this->retrieveData(acqIdentifier, dateTime);
+                         qCCritical(LOG_CosinusProvider()) << "CosinusProvider::dataProvided";
                          emit dataProvided(acqIdentifier, scalarSeries, dateTime);
                      }
                  }

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