diff --git a/core/src/Variable/VariableAcquisitionWorker.cpp b/core/src/Variable/VariableAcquisitionWorker.cpp index 1a26737..cfc688e 100644 --- a/core/src/Variable/VariableAcquisitionWorker.cpp +++ b/core/src/Variable/VariableAcquisitionWorker.cpp @@ -71,8 +71,8 @@ QUuid VariableAcquisitionWorker::pushVariableRequest(QUuid varRequestId, QUuid v // Request creation auto acqRequest = AcquisitionRequest{}; - qCInfo(LOG_VariableAcquisitionWorker()) << tr("TpushVariableRequest ") << vIdentifier - << varRequestId; + qCDebug(LOG_VariableAcquisitionWorker()) << tr("PushVariableRequest ") << vIdentifier + << varRequestId; acqRequest.m_VarRequestId = varRequestId; acqRequest.m_vIdentifier = vIdentifier; acqRequest.m_DataProviderParameters = parameters; @@ -101,7 +101,7 @@ QUuid VariableAcquisitionWorker::pushVariableRequest(QUuid varRequestId, QUuid v impl->unlock(); // remove old acqIdentifier from the worker - impl->cancelVarRequest(oldAcqId); + impl->cancelVarRequest(varRequestIdCanceled); // impl->m_AcqIdentifierToAcqRequestMap.erase(oldAcqId); } else { @@ -343,7 +343,8 @@ void VariableAcquisitionWorker::VariableAcquisitionWorkerPrivate::updateToNextRe void VariableAcquisitionWorker::VariableAcquisitionWorkerPrivate::cancelVarRequest( QUuid varRequestId) { - qInfo() << "VariableAcquisitionWorkerPrivate::cancelVarRequest 0"; + qCCritical(LOG_VariableAcquisitionWorker()) + << "VariableAcquisitionWorkerPrivate::cancelVarRequest 0"; lockRead(); // get all AcqIdentifier in link with varRequestId QVector acqIdsToRm; @@ -359,29 +360,35 @@ void VariableAcquisitionWorker::VariableAcquisitionWorkerPrivate::cancelVarReque for (auto acqId : acqIdsToRm) { removeAcqRequest(acqId); } - qInfo() << "VariableAcquisitionWorkerPrivate::cancelVarRequest end"; + qCCritical(LOG_VariableAcquisitionWorker()) + << "VariableAcquisitionWorkerPrivate::cancelVarRequest end"; } void VariableAcquisitionWorker::VariableAcquisitionWorkerPrivate::removeAcqRequest( QUuid acqRequestId) { - qInfo() << "VariableAcquisitionWorkerPrivate::removeAcqRequest 0"; + qCDebug(LOG_VariableAcquisitionWorker()) + << "VariableAcquisitionWorkerPrivate::removeAcqRequest 0"; QUuid vIdentifier; std::shared_ptr provider; lockRead(); auto acqIt = m_AcqIdentifierToAcqRequestMap.find(acqRequestId); - qInfo() << "VariableAcquisitionWorkerPrivate::removeAcqRequest 1"; + qCDebug(LOG_VariableAcquisitionWorker()) + << "VariableAcquisitionWorkerPrivate::removeAcqRequest 1"; if (acqIt != m_AcqIdentifierToAcqRequestMap.cend()) { vIdentifier = acqIt->second.m_vIdentifier; provider = acqIt->second.m_Provider; - qInfo() << "VariableAcquisitionWorkerPrivate::removeAcqRequest 2"; + qCDebug(LOG_VariableAcquisitionWorker()) + << "VariableAcquisitionWorkerPrivate::removeAcqRequest 2"; auto it = m_VIdentifierToCurrrentAcqIdNextIdPairMap.find(vIdentifier); if (it != m_VIdentifierToCurrrentAcqIdNextIdPairMap.cend()) { - qInfo() << "VariableAcquisitionWorkerPrivate::removeAcqRequest 3"; + qCDebug(LOG_VariableAcquisitionWorker()) + << "VariableAcquisitionWorkerPrivate::removeAcqRequest 3"; if (it->second.first == acqRequestId) { // acqRequest is currently running -> let's aborting it - qInfo() << "VariableAcquisitionWorkerPrivate::removeAcqRequest 4"; + qCDebug(LOG_VariableAcquisitionWorker()) + << "VariableAcquisitionWorkerPrivate::removeAcqRequest 4"; unlock(); // Remove the current request from the worker @@ -389,34 +396,41 @@ void VariableAcquisitionWorker::VariableAcquisitionWorkerPrivate::removeAcqReque // notify the request aborting to the provider provider->requestDataAborting(acqRequestId); - qInfo() << "VariableAcquisitionWorkerPrivate::removeAcqRequest 5"; + qCDebug(LOG_VariableAcquisitionWorker()) + << "VariableAcquisitionWorkerPrivate::removeAcqRequest 5"; } else if (it->second.second == acqRequestId) { it->second.second = QUuid(); - qInfo() << "VariableAcquisitionWorkerPrivate::removeAcqRequest 6"; + qCDebug(LOG_VariableAcquisitionWorker()) + << "VariableAcquisitionWorkerPrivate::removeAcqRequest 6"; unlock(); } else { - qInfo() << "VariableAcquisitionWorkerPrivate::removeAcqRequest 7"; + qCDebug(LOG_VariableAcquisitionWorker()) + << "VariableAcquisitionWorkerPrivate::removeAcqRequest 7"; unlock(); } } else { - qInfo() << "VariableAcquisitionWorkerPrivate::removeAcqRequest 8"; + qCDebug(LOG_VariableAcquisitionWorker()) + << "VariableAcquisitionWorkerPrivate::removeAcqRequest 8"; unlock(); } } else { - qInfo() << "VariableAcquisitionWorkerPrivate::removeAcqRequest 9"; + qCDebug(LOG_VariableAcquisitionWorker()) + << "VariableAcquisitionWorkerPrivate::removeAcqRequest 9"; unlock(); } - qInfo() << "VariableAcquisitionWorkerPrivate::removeAcqRequest 10"; + qCDebug(LOG_VariableAcquisitionWorker()) + << "VariableAcquisitionWorkerPrivate::removeAcqRequest 10"; lockWrite(); m_AcqIdentifierToAcqDataPacketVectorMap.erase(acqRequestId); m_AcqIdentifierToAcqRequestMap.erase(acqRequestId); unlock(); - qInfo() << "VariableAcquisitionWorkerPrivate::removeAcqRequest 11"; + qCDebug(LOG_VariableAcquisitionWorker()) + << "VariableAcquisitionWorkerPrivate::removeAcqRequest 11"; } diff --git a/core/src/Variable/VariableController.cpp b/core/src/Variable/VariableController.cpp index d23ebc4..d77dbad 100644 --- a/core/src/Variable/VariableController.cpp +++ b/core/src/Variable/VariableController.cpp @@ -554,23 +554,23 @@ AcquisitionZoomType VariableController::getZoomType(const SqpRange &range, const // t1.m_TStart <= t2.m_TStart && t2.m_TEnd <= t1.m_TEnd auto zoomType = AcquisitionZoomType::Unknown; if (range.m_TStart <= oldRange.m_TStart && oldRange.m_TEnd <= range.m_TEnd) { - qCCritical(LOG_VariableController()) << "zoomtype: ZoomOut"; + qCDebug(LOG_VariableController()) << "zoomtype: ZoomOut"; zoomType = AcquisitionZoomType::ZoomOut; } else if (range.m_TStart > oldRange.m_TStart && range.m_TEnd > oldRange.m_TEnd) { - qCCritical(LOG_VariableController()) << "zoomtype: PanRight"; + qCDebug(LOG_VariableController()) << "zoomtype: PanRight"; zoomType = AcquisitionZoomType::PanRight; } else if (range.m_TStart < oldRange.m_TStart && range.m_TEnd < oldRange.m_TEnd) { - qCCritical(LOG_VariableController()) << "zoomtype: PanLeft"; + qCDebug(LOG_VariableController()) << "zoomtype: PanLeft"; zoomType = AcquisitionZoomType::PanLeft; } else if (range.m_TStart > oldRange.m_TStart && oldRange.m_TEnd > range.m_TEnd) { - qCCritical(LOG_VariableController()) << "zoomtype: ZoomIn"; + qCDebug(LOG_VariableController()) << "zoomtype: ZoomIn"; zoomType = AcquisitionZoomType::ZoomIn; } else { - qCCritical(LOG_VariableController()) << "getZoomType: Unknown type detected"; + qCDebug(LOG_VariableController()) << "getZoomType: Unknown type detected"; } return zoomType; } @@ -768,7 +768,7 @@ QUuid VariableController::VariableControllerPrivate::acceptVariableRequest( varRequestIdQueue.pop_front(); if (varRequestIdQueue.empty()) { - qCCritical(LOG_VariableController()) + qCDebug(LOG_VariableController()) << tr("TORM Erase REQUEST because it has been accepted") << varId; m_VarIdToVarRequestIdQueueMap.erase(varId); }