Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
@@ -36,7 +36,7 @@ bool ExercisesHandler::init()
|
||||
if (!m_ppmDtc->enableEquipmentExerciseMapping())
|
||||
return false;
|
||||
|
||||
ERROR_LOG() << "# eem: " << m_ppmDtc->equipmentExerciseMappings().size();
|
||||
ERROR_LOG(m_logger) << "# eem: " << m_ppmDtc->equipmentExerciseMappings().size();
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -56,7 +56,7 @@ bool ExercisesHandler::sendEquipmentMessage(const TrainingAreaBase::SendEquipmen
|
||||
auto it = m_equipNo2ExerciseId.constFind(equipmentNumber);
|
||||
if (it == m_equipNo2ExerciseId.cend())
|
||||
{
|
||||
ERROR_LOG() << "Can not send equipment message to training area - equipment number "
|
||||
ERROR_LOG(m_logger) << "Can not send equipment message to training area - equipment number "
|
||||
<< equipmentNumber << " not known";
|
||||
return false;
|
||||
}
|
||||
@@ -72,7 +72,7 @@ bool ExercisesHandler::sendOcEquipmentMessage(const OcSituationServer::SendEquip
|
||||
auto it = m_equipNo2ExerciseId.constFind(equipmentNumber);
|
||||
if (it == m_equipNo2ExerciseId.cend())
|
||||
{
|
||||
ERROR_LOG() << "Can not send equipment message to training area - equipment number "
|
||||
ERROR_LOG(m_logger) << "Can not send equipment message to training area - equipment number "
|
||||
<< equipmentNumber << " not known";
|
||||
return false;
|
||||
}
|
||||
@@ -86,10 +86,10 @@ ExerciseHandler *ExercisesHandler::exerciseHandlerForExerciseId(int exerciseId)
|
||||
if (itEH != m_exerciseHandler.end())
|
||||
return itEH.value();
|
||||
|
||||
DEBUG_LOG() << "new ExerciseHandler for id " << exerciseId;
|
||||
DEBUG_LOG(m_logger) << "new ExerciseHandler for id " << exerciseId;
|
||||
auto exH = new ExerciseHandler(m_ddsHandler->ddsConnector(), exerciseId);
|
||||
bool result = exH->init();
|
||||
DEBUG_LOG()<<"result init ="<<result;
|
||||
DEBUG_LOG(m_logger)<<"result init ="<<result;
|
||||
connect(exH, &ExerciseHandler::exerciseHandlerIdleTimeout,
|
||||
this, &ExercisesHandler::onExerciseHandlerIdleTimeout);
|
||||
m_exerciseHandler[exerciseId] = exH;
|
||||
@@ -99,7 +99,7 @@ ExerciseHandler *ExercisesHandler::exerciseHandlerForExerciseId(int exerciseId)
|
||||
void ExercisesHandler::onEquipmentExerciseMappingChanged(const ParticipantManagement::EquipmentExerciseMapping &data,
|
||||
DataModification modType)
|
||||
{
|
||||
DEBUG_LOG() << "onEquipmentExerciseMappingChanged";
|
||||
DEBUG_LOG(m_logger) << "onEquipmentExerciseMappingChanged";
|
||||
|
||||
for (auto it = m_equipNo2ExerciseId.begin(); it != m_equipNo2ExerciseId.end(); )
|
||||
{
|
||||
@@ -129,7 +129,7 @@ void ExercisesHandler::onEquipmentExerciseMappingChanged(const ParticipantManage
|
||||
|
||||
void ExercisesHandler::onEquipmentMessageChanged(const TrainingAreaBase::EquipmentMessage &data, const DataModification modType)
|
||||
{
|
||||
DEBUG_LOG() << "onEquipmentMessageChanged";
|
||||
DEBUG_LOG(m_logger) << "onEquipmentMessageChanged";
|
||||
if (modType != DataModification::eAdded &&
|
||||
modType != DataModification::eModified)
|
||||
return;
|
||||
@@ -137,7 +137,7 @@ void ExercisesHandler::onEquipmentMessageChanged(const TrainingAreaBase::Equipme
|
||||
const auto it = m_equipNo2ExerciseId.constFind(equipmentNumber);
|
||||
if (it == m_equipNo2ExerciseId.constEnd())
|
||||
{
|
||||
ERROR_LOG() << "Got EquipmentMessage from unknown participant with equipment number " << equipmentNumber;
|
||||
ERROR_LOG(m_logger) << "Got EquipmentMessage from unknown participant with equipment number " << equipmentNumber;
|
||||
return;
|
||||
}
|
||||
emit messageFromTrainingArea(data);
|
||||
@@ -145,7 +145,7 @@ void ExercisesHandler::onEquipmentMessageChanged(const TrainingAreaBase::Equipme
|
||||
|
||||
void ExercisesHandler::onExerciseHandlerIdleTimeout()
|
||||
{
|
||||
DEBUG_LOG()<<"onExerciseHandlerIdleTimeout";
|
||||
DEBUG_LOG(m_logger)<<"onExerciseHandlerIdleTimeout";
|
||||
ExerciseHandler *exH = qobject_cast<ExerciseHandler *>(sender());
|
||||
if (!exH)
|
||||
return;
|
||||
|
||||
Reference in new issue
Block a user