Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
+11
-11
@@ -32,7 +32,7 @@ bool ExercisesHandler::init()
|
||||
|
||||
QMap<qint32, ExerciseManagement::Exercise> ExercisesHandler::getExercises() const
|
||||
{
|
||||
INFO_LOG() << "IN getExercises";
|
||||
INFO_LOG(m_logger) << "IN getExercises";
|
||||
m_ddsHandler->exmDtc()->waitForHistoricalDataExercise();
|
||||
return m_ddsHandler->exmDtc()->exercises();
|
||||
}
|
||||
@@ -62,7 +62,7 @@ ParticipantManagement::TypeClass ExercisesHandler::typeClassIdFromEquipmentTypeI
|
||||
|
||||
ParticipantManagement::Party ExercisesHandler::getParty(int partyId, int exerciseId) const
|
||||
{
|
||||
DEBUG_LOG() << "getParty: " << partyId << ", exId: " << exerciseId;
|
||||
DEBUG_LOG(m_logger) << "getParty: " << partyId << ", exId: " << exerciseId;
|
||||
auto it = m_exerciseHandler.find(exerciseId);
|
||||
if (it == m_exerciseHandler.end())
|
||||
return ParticipantManagement::Party();
|
||||
@@ -150,7 +150,7 @@ bool ExercisesHandler::modifyEquipmentTypes(const std::vector<ParticipantManagem
|
||||
void ExercisesHandler::onModifyEquipmentTypeDataReply(const Core::FunctionReplyObject &replyObject)
|
||||
{
|
||||
if (replyObject.error())
|
||||
ERROR_LOG() << replyObject();
|
||||
ERROR_LOG(m_logger) << replyObject();
|
||||
}
|
||||
|
||||
bool ExercisesHandler::addParticipant(const ParticipantInfoStruct &pis)
|
||||
@@ -164,7 +164,7 @@ bool ExercisesHandler::modifyParticipant(const ParticipantInfoStruct &pis)
|
||||
auto it = findParticipant(pis);
|
||||
if (it == m_participants.end())
|
||||
{
|
||||
ERROR_LOG() << "Trying to modify a participant which is not in our map. mod: "
|
||||
ERROR_LOG(m_logger) << "Trying to modify a participant which is not in our map. mod: "
|
||||
<< pis;
|
||||
return false;
|
||||
}
|
||||
@@ -177,7 +177,7 @@ bool ExercisesHandler::removeParticipant(const ParticipantInfoStruct &pis)
|
||||
auto it = findParticipant(pis);
|
||||
if (it == m_participants.end())
|
||||
{
|
||||
ERROR_LOG() << "Trying to remove a participant which is not in our map. mod: "
|
||||
ERROR_LOG(m_logger) << "Trying to remove a participant which is not in our map. mod: "
|
||||
<< pis;
|
||||
return false;
|
||||
}
|
||||
@@ -203,11 +203,11 @@ QVector<ParticipantInfoStruct> ExercisesHandler::infoStructForEquipment(int equi
|
||||
|
||||
void ExercisesHandler::exerciseAdded(int exerciseId)
|
||||
{
|
||||
INFO_LOG() << "Exercise with id " << exerciseId << " created";
|
||||
INFO_LOG(m_logger) << "Exercise with id " << exerciseId << " created";
|
||||
auto it = m_exerciseHandler.find(exerciseId);
|
||||
if (it != m_exerciseHandler.end())
|
||||
{
|
||||
WARNING_LOG() << "Exercise with id " << exerciseId
|
||||
WARNING_LOG(m_logger) << "Exercise with id " << exerciseId
|
||||
<< " added but it was already in our list - recreating handler";
|
||||
delete it.value();
|
||||
m_exerciseHandler.erase(it);
|
||||
@@ -215,7 +215,7 @@ void ExercisesHandler::exerciseAdded(int exerciseId)
|
||||
ExerciseParticipantHandler *exH = new ExerciseParticipantHandler(m_ddsHandler->getDomainParticipant(), exerciseId, this);
|
||||
if (!exH->init())
|
||||
{
|
||||
ERROR_LOG() << "Error initializing ExerciseHandler for exercise " << exerciseId;
|
||||
ERROR_LOG(m_logger) << "Error initializing ExerciseHandler for exercise " << exerciseId;
|
||||
delete exH;
|
||||
return;
|
||||
}
|
||||
@@ -223,17 +223,17 @@ void ExercisesHandler::exerciseAdded(int exerciseId)
|
||||
this, &ExercisesHandler::registrationReturnValue);
|
||||
connect(exH, &ExerciseParticipantHandler::participantChanged,
|
||||
this, &ExercisesHandler::participantChanged);
|
||||
INFO_LOG() << "Successfully created exercise handler for exercise " << exerciseId;
|
||||
INFO_LOG(m_logger) << "Successfully created exercise handler for exercise " << exerciseId;
|
||||
m_exerciseHandler[exerciseId] = exH;
|
||||
}
|
||||
|
||||
void ExercisesHandler::exerciseRemoved(int exerciseId)
|
||||
{
|
||||
INFO_LOG() << "Exercise with id " << exerciseId << " removed";
|
||||
INFO_LOG(m_logger) << "Exercise with id " << exerciseId << " removed";
|
||||
auto it = m_exerciseHandler.find(exerciseId);
|
||||
if (it == m_exerciseHandler.end())
|
||||
{
|
||||
WARNING_LOG() << "Exercise removed but it was not found in our internal map";
|
||||
WARNING_LOG(m_logger) << "Exercise removed but it was not found in our internal map";
|
||||
return;
|
||||
}
|
||||
delete it.value();
|
||||
|
||||
Reference in new issue
Block a user