GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r546:c13ea1918c0c

Correction for MR

perrinel -

r546:c13ea1918c0c

parent child

Context file:

r546:c13ea1918c0c

core/src/Variable/VariableController.cpp +14 -16

                                                      const SqpRange &cacheRangeRequested,
                                                      QVector<AcquisitionDataPacket> dataAcquired)
              {
-                 auto var = impl->findVariable(vIdentifier);
-                 if (var != nullptr) {
+                 if (auto var = impl->findVariable(vIdentifier)) {
                      var->setRange(rangeRequested);
                      var->setCacheRange(cacheRangeRequested);
                      qCDebug(LOG_VariableController()) << tr("1: onDataProvided") << rangeRequested;
              void VariableController::onVariableRetrieveDataInProgress(QUuid identifier, double progress)
              {
-                 auto var = impl->findVariable(identifier);
-                 if (var != nullptr) {
+                 if (auto var = impl->findVariable(identifier)) {
                      impl->m_VariableModel->setDataProgress(var, progress);
                  }
                  else {
              {
                  qCDebug(LOG_VariableController()) << "TORM: VariableController::onAddSynchronized"
                                                    << synchronizationGroupId;
-                 auto vToVIdit = impl->m_VariableToIdentifierMap.find(variable);
-                 if (vToVIdit != impl->m_VariableToIdentifierMap.cend()) {
-                     auto itSynchroGroup
+                 auto varToVarIdIt = impl->m_VariableToIdentifierMap.find(variable);
+                 if (varToVarIdIt != impl->m_VariableToIdentifierMap.cend()) {
+                     auto groupIdToVSGIt
                          = impl->m_GroupIdToVariableSynchronizationGroupMap.find(synchronizationGroupId);
-                     if (itSynchroGroup != impl->m_GroupIdToVariableSynchronizationGroupMap.cend()) {
+                     if (groupIdToVSGIt != impl->m_GroupIdToVariableSynchronizationGroupMap.cend()) {
                          impl->m_VariableIdGroupIdMap.insert(
-                             std::make_pair(vToVIdit->second, synchronizationGroupId));
-                         itSynchroGroup->second->addVariableId(vToVIdit->second);
+                             std::make_pair(varToVarIdIt->second, synchronizationGroupId));
+                         groupIdToVSGIt->second->addVariableId(varToVarIdIt->second);
                      }
                      else {
                          qCCritical(LOG_VariableController())
              {
                  // NOTE: oldRange isn't really necessary since oldRange == variable->range().
-                 qCInfo(LOG_VariableController()) << "VariableController::onRequestDataLoading"
-                                                  << QThread::currentThread()->objectName();
+                 qCDebug(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.
-                 foreach (auto var, variables) {
+                 for (const auto &var : variables) {
                      qCDebug(LOG_VariableController()) << "processRequest for" << var->name();
                      impl->processRequest(var, range);
                  }
                  if (synchronise) {
                      // Get the group ids
                      qCDebug(LOG_VariableController())
-                         << "VariableController::onRequestDataLoading for synchro var ENABLE";
+                         << "TORM VariableController::onRequestDataLoading for synchro var ENABLE";
                      auto groupIds = std::set<QUuid>();
-                     foreach (auto var, variables) {
+                     for (const auto &var : variables) {
                          auto varToVarIdIt = impl->m_VariableToIdentifierMap.find(var);
                          if (varToVarIdIt != impl->m_VariableToIdentifierMap.cend()) {
                              auto vId = varToVarIdIt->second;
                      }
                      // We assume here all group ids exist
-                     foreach (auto gId, groupIds) {
+                     for (const auto &gId : groupIds) {
                          auto vSynchronizationGroup = impl->m_GroupIdToVariableSynchronizationGroupMap.at(gId);
                          auto vSyncIds = vSynchronizationGroup->getIds();
                          qCDebug(LOG_VariableController()) << "Var in synchro group ";

plugins/amda/src/AmdaProvider.cpp +6 -4

                  const auto data = parameters.m_Data;
                  for (const auto &dateTime : qAsConst(times)) {
                      this->retrieveData(acqIdentifier, dateTime, data);
-                     QThread::msleep(200);
+                     // TORM
+                     // QThread::msleep(200);
                  }
              }
                  auto endDate = dateFormat(dateTime.m_TEnd);
                  auto url = QUrl{QString{AMDA_URL_FORMAT}.arg(startDate, endDate, productId)};
-                 qCInfo(LOG_AmdaProvider()) << tr("AmdaProvider::retrieveData url:") << url;
+                 qCInfo(LOG_AmdaProvider()) << tr("TORM AmdaProvider::retrieveData url:") << url;
                  auto tempFile = std::make_shared<QTemporaryFile>();
                  // LAMBDA
                                auto downloadFileUrl = QUrl{QString{reply->readAll()}};
-                               qCInfo(LOG_AmdaProvider()) << tr("AmdaProvider::retrieveData downloadFileUrl:")
-                                                          << downloadFileUrl;
+                               qCInfo(LOG_AmdaProvider())
+                                   << tr("TORM AmdaProvider::retrieveData downloadFileUrl:") << downloadFileUrl;
                                // Executes request for downloading file //
                                // Creates destination file

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