| @@ -361,6 +361,7 void VariableAcquisitionWorker::VariableAcquisitionWorkerPrivate::removeAcqReque | |||
|
|
361 | 361 | |
|
|
362 | 362 | m_AcqIdentifierToAcqDataPacketVectorMap.erase(acqRequestId); |
|
|
363 | 363 | m_AcqIdentifierToAcqRequestMap.erase(acqRequestId); |
|
|
364 | m_VIdentifierToCurrrentAcqIdMap.erase(vIdentifier); | |
|
|
364 | 365 | |
|
|
365 | 366 | unlock(); |
|
|
366 | 367 | qCDebug(LOG_VariableAcquisitionWorker()) |
| @@ -950,6 +950,17 void VariableController::VariableControllerPrivate::cancelVariableRequest(QUuid | |||
|
|
950 | 950 | |
|
|
951 | 951 | auto &varIds = varGroupIdToVarIdsIt->second; |
|
|
952 | 952 | auto varIdsEnd = varIds.end(); |
|
|
953 | ||
|
|
954 | // First pass all canUpdate of handler to false | |
|
|
955 | for (auto varIdsIt = varIds.begin(); (varIdsIt != varIdsEnd); ++varIdsIt) { | |
|
|
956 | auto itVarHandler = m_VarIdToVarRequestHandler.find(*varIdsIt); | |
|
|
957 | if (itVarHandler != m_VarIdToVarRequestHandler.cend()) { | |
|
|
958 | ||
|
|
959 | auto varHandler = itVarHandler->second.get(); | |
|
|
960 | varHandler->m_CanUpdate = false; | |
|
|
961 | } | |
|
|
962 | } | |
|
|
963 | ||
|
|
953 | 964 | for (auto varIdsIt = varIds.begin(); (varIdsIt != varIdsEnd); ++varIdsIt) { |
|
|
954 | 965 | auto itVarHandler = m_VarIdToVarRequestHandler.find(*varIdsIt); |
|
|
955 | 966 | if (itVarHandler != m_VarIdToVarRequestHandler.cend()) { |
| @@ -972,7 +983,6 void VariableController::VariableControllerPrivate::cancelVariableRequest(QUuid | |||
|
|
972 | 983 | itVarHandler->first); |
|
|
973 | 984 | } |
|
|
974 | 985 | m_VariableModel->setDataProgress(var, 0.0); |
|
|
975 | varHandler->m_CanUpdate = false; | |
|
|
976 | 986 | varHandler->m_State = VariableRequestHandlerState::OFF; |
|
|
977 | 987 | varHandler->m_RunningVarRequest = VariableRequest{}; |
|
|
978 | 988 | } |
| @@ -991,7 +1001,6 void VariableController::VariableControllerPrivate::cancelVariableRequest(QUuid | |||
|
|
991 | 1001 | itVarHandler->first); |
|
|
992 | 1002 | } |
|
|
993 | 1003 | m_VariableModel->setDataProgress(var, 0.0); |
|
|
994 | varHandler->m_CanUpdate = false; | |
|
|
995 | 1004 | varHandler->m_State = VariableRequestHandlerState::RUNNING; |
|
|
996 | 1005 | varHandler->m_RunningVarRequest = varHandler->m_PendingVarRequest; |
|
|
997 | 1006 | varHandler->m_PendingVarRequest = VariableRequest{}; |
General Comments 0
You need to be logged in to leave comments.
Login now