GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r836:c5d1bb9523be

Fix bug in canceling process: the handler canUpdate was always set to ...

perrinel -

r836:c5d1bb9523be

parent child

Context file:

r836:c5d1bb9523be

core/src/Variable/VariableController.cpp +13 -4

                                                           << varRequest.m_RangeRequested
                                                           << varRequest.m_CacheRangeRequested;
                         auto variableGroupIdToCancel = varHandler->m_PendingVarRequest.m_VariableGroupId;
-                        varHandler->m_PendingVarRequest = varRequest;
                         cancelVariableRequest(variableGroupIdToCancel);
+                        // Cancel variable can make state downgrade
+                        varHandler->m_State = VariableRequestHandlerState::PENDING;
+                        varHandler->m_PendingVarRequest = varRequest;
                         break;
                     }
                 auto varHandler = itVarHandler->second.get();
                 if (varHandler->m_State == VariableRequestHandlerState::OFF) {
-                    // TODO log impossible case !!!
+                    qCCritical(LOG_VariableController())
+                        << tr("acceptVariableRequest impossible on a variable with OFF state");
                 }
                 varHandler->m_RunningVarRequest.m_DataSeries = dataSeries;
                 auto &varIds = varGroupIdToVarIdsIt->second;
                 auto varIdsEnd = varIds.end();
                 bool processVariableUpdate = true;
+                qCDebug(LOG_VariableController()) << "VariableControllerPrivate::updateVariables"
+                                                  << varRequestId << varIds.size();
                 for (auto varIdsIt = varIds.begin(); (varIdsIt != varIdsEnd) && processVariableUpdate;
                      ++varIdsIt) {
                     auto itVarHandler = m_VarIdToVarRequestHandler.find(*varIdsIt);
             {
                 auto varGroupIdToVarIdsIt = m_VarGroupIdToVarIds.find(varRequestId);
                 if (varGroupIdToVarIdsIt == m_VarGroupIdToVarIds.end()) {
-                    // TODO LOG cannot update variable request since varGroupdId isn't here anymore
+                    qCCritical(LOG_VariableController()) << QObject::tr(
+                        "Impossible to updateVariableRequest since varGroupdId isn't here anymore");
                     return;
                 }
                     if (itVarHandler != m_VarIdToVarRequestHandler.cend()) {
                         auto varHandler = itVarHandler->second.get();
-                        varHandler->m_CanUpdate = false;
                         varHandler->m_VarId = QUuid{};
                         switch (varHandler->m_State) {
                             case VariableRequestHandlerState::OFF: {
                                             itVarHandler->first);
                                     }
                                     m_VariableModel->setDataProgress(var, 0.0);
+                                    varHandler->m_CanUpdate = false;
                                     varHandler->m_State = VariableRequestHandlerState::OFF;
                                     varHandler->m_RunningVarRequest = VariableRequest{};
                                 }
                                             itVarHandler->first);
                                     }
                                     m_VariableModel->setDataProgress(var, 0.0);
+                                    varHandler->m_CanUpdate = false;
                                     varHandler->m_State = VariableRequestHandlerState::RUNNING;
                                     varHandler->m_RunningVarRequest = varHandler->m_PendingVarRequest;
+                                    varHandler->m_PendingVarRequest = VariableRequest{};
                                     executeVarRequest(var, varHandler->m_RunningVarRequest);
                                 }
                                 else if (varHandler->m_PendingVarRequest.m_VariableGroupId == varRequestId) {

General Comments 3

perrinel

|

Auto status change to "Under Review"

perrinel

|

Merge lasted acquisition developpement on main Sciqlop branch

Write
Preview

You need to be logged in to leave comments. Login now

	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