GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1399:5f9a7b80e8f3

Fix bug when canceling acquisition

perrinel -

r1399:5f9a7b80e8f3

parent child

Context file:

r1399:5f9a7b80e8f3

core/src/Variable/VariableAcquisitionWorker.cpp +1 0

                 m_AcqIdentifierToAcqDataPacketVectorMap.erase(acqRequestId);
                 m_AcqIdentifierToAcqRequestMap.erase(acqRequestId);
+                m_VIdentifierToCurrrentAcqIdMap.erase(vIdentifier);
                 unlock();
                 qCDebug(LOG_VariableAcquisitionWorker())

core/src/Variable/VariableController.cpp +11 -2

                 auto &varIds = varGroupIdToVarIdsIt->second;
                 auto varIdsEnd = varIds.end();
+                // First pass all canUpdate of handler to false
+                for (auto varIdsIt = varIds.begin(); (varIdsIt != varIdsEnd); ++varIdsIt) {
+                    auto itVarHandler = m_VarIdToVarRequestHandler.find(*varIdsIt);
+                    if (itVarHandler != m_VarIdToVarRequestHandler.cend()) {
+                        auto varHandler = itVarHandler->second.get();
+                        varHandler->m_CanUpdate = false;
+                    }
+                }
                 for (auto varIdsIt = varIds.begin(); (varIdsIt != varIdsEnd); ++varIdsIt) {
                     auto itVarHandler = m_VarIdToVarRequestHandler.find(*varIdsIt);
                     if (itVarHandler != m_VarIdToVarRequestHandler.cend()) {
                                             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{};

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