Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
@@ -28,7 +28,7 @@ LtsWebSocket::AbstractClientMessage *ClientMessageFactory::createMessage(LtsWebS
|
||||
|
||||
if (m_type == LtsWebSocket::JsonKeys::ERROR_())
|
||||
{
|
||||
ERROR_LOG() << "Error in message: " << message;
|
||||
ERROR_LOG(m_logger) << "Error in message: " << message;
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
@@ -46,7 +46,7 @@ LtsWebSocket::AbstractClientMessage *ClientMessageFactory::createMessage(LtsWebS
|
||||
|
||||
if (!result)
|
||||
{
|
||||
ERROR_LOG() << "message: " << message;
|
||||
ERROR_LOG(m_logger) << "message: " << message;
|
||||
Q_ASSERT(result);
|
||||
}
|
||||
|
||||
@@ -114,7 +114,7 @@ DataManager::DataManager(const std::shared_ptr<IWMS2ECC_Impl> &wms2ecc, const st
|
||||
this, &DataManager::openWebSocket);
|
||||
|
||||
m_messageFactory = new ClientMessageFactory(this);
|
||||
DEBUG_LOG() << "WarehouseManagement/WmsServer = " << Settings::wmsServerName();
|
||||
DEBUG_LOG(m_logger) << "WarehouseManagement/WmsServer = " << Settings::wmsServerName();
|
||||
}
|
||||
|
||||
DataManager::~DataManager()
|
||||
@@ -154,7 +154,7 @@ void DataManager::openWebSocket()
|
||||
int port = NGL::Connections::port(NGL::Connections::eConnection::ZSLV);
|
||||
QString url = QStringLiteral("ws://") + Settings::wmsServerName() + QStringLiteral(":") + QString::number(port);
|
||||
wsSocket->open(QUrl::fromEncoded(url.toLocal8Bit()));
|
||||
INFO_LOG() << "Trying to listen on " << url;
|
||||
INFO_LOG(m_logger) << "Trying to listen on " << url;
|
||||
|
||||
m_wsReconnectTimer->start(5000);
|
||||
}
|
||||
@@ -272,7 +272,7 @@ void DataManager::handleEquipmentTypes(const ::EquipmentTypes &eTypes)
|
||||
{
|
||||
const IWMS2ECC::equipTypeMap equipTypeMap = eTypes.getEquipmentTypes();
|
||||
|
||||
INFO_LOG() << "equipTypeMap size: " << equipTypeMap.size();
|
||||
INFO_LOG(m_logger) << "equipTypeMap size: " << equipTypeMap.size();
|
||||
ParticipantManagement::ModifyEquipmentTypeDataRequest request;
|
||||
request.deleteAll(true);
|
||||
auto &dataVec = request.data();
|
||||
@@ -292,7 +292,7 @@ void DataManager::handleEquipmentTypes(const ::EquipmentTypes &eTypes)
|
||||
dataVec.push_back(std::move(pEt));
|
||||
}
|
||||
|
||||
INFO_LOG() << "dataVec size: " << dataVec.size() << ", " << request;
|
||||
INFO_LOG(m_logger) << "dataVec size: " << dataVec.size() << ", " << request;
|
||||
|
||||
m_ddsHandler->ppmFtc()->modifyEquipmentTypeDataRequest(request, this);
|
||||
}
|
||||
@@ -300,9 +300,9 @@ void DataManager::handleEquipmentTypes(const ::EquipmentTypes &eTypes)
|
||||
void DataManager::onModifyEquipmentTypeDataReply(const Core::FunctionReplyObject &replyObject)
|
||||
{
|
||||
if (replyObject.error())
|
||||
ERROR_LOG() << "Error while modifying equipmentType: " << replyObject.str();
|
||||
ERROR_LOG(m_logger) << "Error while modifying equipmentType: " << replyObject.str();
|
||||
else
|
||||
INFO_LOG() << "onModifyEquipmentTypeDataReply ok";
|
||||
INFO_LOG(m_logger) << "onModifyEquipmentTypeDataReply ok";
|
||||
}
|
||||
|
||||
void DataManager::newTextMessageFromClient(LtsWebSocket::ClientConnection *client, const QString &message)
|
||||
@@ -313,7 +313,7 @@ void DataManager::newTextMessageFromClient(LtsWebSocket::ClientConnection *clien
|
||||
clientMessage = m_messageFactory->createMessage(client, message);
|
||||
else
|
||||
{
|
||||
WARNING_LOG() << "Could not parse incoming message: '" << message << "', error: " << result.errorString();
|
||||
WARNING_LOG(m_logger) << "Could not parse incoming message: '" << message << "', error: " << result.errorString();
|
||||
clientMessage = new LtsWebSocket::InvalidMessage(client, QString(), QStringLiteral("Got message which is not JSON conform"));
|
||||
}
|
||||
|
||||
@@ -330,7 +330,7 @@ void DataManager::onParticipantChanged(const ParticipantManagement::Participant
|
||||
if (!m_clientConnection || !m_wms2ecc)
|
||||
return;
|
||||
|
||||
DEBUG_LOG() << "partyId: " << data.partyId() << "participantId: " << data.id();
|
||||
DEBUG_LOG(m_logger) << "partyId: " << data.partyId() << "participantId: " << data.id();
|
||||
IWMS2ECC::PlayerInfo pl = m_wms2ecc->convert(data, exerciseId);
|
||||
pl.playerId = (exerciseId* 1000000) + pl.playerId;
|
||||
m_clientConnection->addReply(new ParticipantUpdate(pl, modType));
|
||||
@@ -341,7 +341,7 @@ void DataManager::onExerciseChanged(const ExerciseManagement::Exercise &data, Da
|
||||
if (!m_clientConnection)
|
||||
return;
|
||||
|
||||
INFO_LOG() << "IN onExerciseChanged: ExerciseUpdate: id = " << data.id();
|
||||
INFO_LOG(m_logger) << "IN onExerciseChanged: ExerciseUpdate: id = " << data.id();
|
||||
IWMS2ECC::Exercise exeData = IWMS2ECC_Impl::convert(data);
|
||||
|
||||
m_clientConnection->addReply(new ExerciseUpdate(exeData, modType));
|
||||
@@ -355,9 +355,9 @@ void DataManager::onRegistrationReturnValue(int exerciseId, qint32 participantId
|
||||
void DataManager::registerParticipant(const Registration ®)
|
||||
{
|
||||
ParticipantManagement::ParticipantAssignState state = IWMS2ECC_Impl::convert(reg.getAssignment());
|
||||
INFO_LOG() << "ParticipantAssignState: " << state;
|
||||
INFO_LOG(m_logger) << "ParticipantAssignState: " << state;
|
||||
|
||||
INFO_LOG() << "Registration: participant: " << reg.getPlayerId() << ", exerciseId: " << reg.getExerciseId();
|
||||
INFO_LOG(m_logger) << "Registration: participant: " << reg.getPlayerId() << ", exerciseId: " << reg.getExerciseId();
|
||||
|
||||
dds::core::optional<int> equipNo;
|
||||
dds::core::optional<QString> identification;
|
||||
|
||||
@@ -36,6 +36,8 @@ public:
|
||||
const QString &message);
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
DataManager *m_dataManager;
|
||||
|
||||
};
|
||||
|
||||
@@ -8,17 +8,16 @@
|
||||
namespace WarehouseManagement
|
||||
{
|
||||
|
||||
DdsHandler::DdsHandler(int domainId)
|
||||
: m_ddsConnector(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Global, 0))
|
||||
{
|
||||
DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
|
||||
DdsHandler::DdsHandler(int domainId) : m_ddsConnector(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Global, 0)),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
|
||||
}
|
||||
|
||||
bool DdsHandler::init(const QStringList &qosFileList)
|
||||
{
|
||||
if (!m_ddsConnector->init(qosFileList))
|
||||
{
|
||||
ERROR_LOG() << "Error initializing dds connections - aborting";
|
||||
ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -30,7 +29,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
|
||||
|
||||
m_exmDtc = ExerciseManagement::Interface::Dtc::create(m_ddsConnector);
|
||||
bool bRet = m_exmDtc->enableExercise();
|
||||
INFO_LOG() << "Exm dtc initialised";
|
||||
INFO_LOG(m_logger) << "Exm dtc initialised";
|
||||
|
||||
m_ppmDtc = ParticipantManagement::Interface::Dtc::create(m_ddsConnector);
|
||||
bRet &= m_ppmDtc->enableType();
|
||||
|
||||
@@ -37,6 +37,7 @@ public:
|
||||
dds::domain::DomainParticipant getDomainParticipant() const { return m_ddsConnector->getDomainParticipant(); }
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
|
||||
std::shared_ptr<Core::Pacemaker> m_pacemaker;
|
||||
std::shared_ptr<ExerciseManagement::Interface::Dtc> m_exmDtc;
|
||||
|
||||
+4
-5
@@ -9,18 +9,17 @@
|
||||
namespace WarehouseManagement
|
||||
{
|
||||
|
||||
DdsHandlerExercise::DdsHandlerExercise(const dds::domain::DomainParticipant &dp, int exerciseId)
|
||||
: m_ddsConnector(new DDSConnector::DdsConnector(dp, IDL::PartitionType::Exercise, exerciseId))
|
||||
{
|
||||
DdsHandlerExercise::DdsHandlerExercise(const dds::domain::DomainParticipant &dp, int exerciseId) : m_ddsConnector(new DDSConnector::DdsConnector(dp, IDL::PartitionType::Exercise, exerciseId)),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_ddsConnector->setDomainParticipant(dp);
|
||||
DEBUG_LOG() << "DdsHandlerExercise for partition: " << m_ddsConnector->getDefaultPartition();
|
||||
DEBUG_LOG(m_logger) << "DdsHandlerExercise for partition: " << m_ddsConnector->getDefaultPartition();
|
||||
}
|
||||
|
||||
bool DdsHandlerExercise::init(const QStringList &qosFileList)
|
||||
{
|
||||
if (!m_ddsConnector->init(qosFileList))
|
||||
{
|
||||
ERROR_LOG() << "Error initializing dds connections - aborting";
|
||||
ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -38,6 +38,7 @@ public:
|
||||
}
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
|
||||
PpmDtc m_ppmDtc;
|
||||
PpmFtc m_ppmFtc;
|
||||
|
||||
+6
-6
@@ -97,7 +97,7 @@ void ExerciseParticipantHandler::registerParticipant(qint32 participantId,
|
||||
}
|
||||
req.participantId(participantId);
|
||||
|
||||
INFO_LOG() << "IN ::registerParticipant, ParticipantId: " << participantId
|
||||
INFO_LOG(m_logger) << "IN ::registerParticipant, ParticipantId: " << participantId
|
||||
<< ", equipNo: " << equipNo << ", assignState: " << assignState;
|
||||
|
||||
m_ddsHandlerExercise->ppmFtc()->registerParticipantRequest(req, this);
|
||||
@@ -105,7 +105,7 @@ void ExerciseParticipantHandler::registerParticipant(qint32 participantId,
|
||||
|
||||
void ExerciseParticipantHandler::onRegisterParticipantReply(const ParticipantManagement::RegisterReply &reply)
|
||||
{
|
||||
INFO_LOG() << "RegisterReply id " << reply.id()
|
||||
INFO_LOG(m_logger) << "RegisterReply id " << reply.id()
|
||||
<< " - registerReturnValue: " << reply.registerReturnValue()
|
||||
<< " for exercise " << reply.exerciseId();
|
||||
|
||||
@@ -119,7 +119,7 @@ void ExerciseParticipantHandler::onRegisterParticipantReply(const ParticipantMan
|
||||
emit registrationReturnValue(reply.exerciseId(), reply.id(), reply.registerReturnValue());
|
||||
|
||||
if (fro.error())
|
||||
ERROR_LOG() << "Error: " << fro();
|
||||
ERROR_LOG(m_logger) << "Error: " << fro();
|
||||
}
|
||||
|
||||
void ExerciseParticipantHandler::participantAdded(const ParticipantManagement::Participant &participant)
|
||||
@@ -128,7 +128,7 @@ void ExerciseParticipantHandler::participantAdded(const ParticipantManagement::P
|
||||
if (!participant.equipmentNumber().is_set() || participant.equipmentNumber().get() == 0)
|
||||
{
|
||||
|
||||
INFO_LOG() << "New participant but no equipment number - ignoring";
|
||||
INFO_LOG(m_logger) << "New participant but no equipment number - ignoring";
|
||||
return;
|
||||
}
|
||||
addParticipant(participant.id(), participant.equipmentNumber().get());
|
||||
@@ -168,7 +168,7 @@ void ExerciseParticipantHandler::participantModified(const ParticipantManagement
|
||||
}
|
||||
if (participant.equipmentNumber().is_set())
|
||||
{
|
||||
INFO_LOG() << "Participant with id " << participant.id() << " changed its equipment number from "
|
||||
INFO_LOG(m_logger) << "Participant with id " << participant.id() << " changed its equipment number from "
|
||||
<< itEquipNumber.value() << " to " << participant.equipmentNumber().get();
|
||||
}
|
||||
|
||||
@@ -192,7 +192,7 @@ void ExerciseParticipantHandler::participantRemoved(const ParticipantManagement:
|
||||
if (itEquipNumber == m_participantId2EquipmentNumber.end())
|
||||
{
|
||||
|
||||
INFO_LOG() << "Participant was removed but has no equipment number - ignoring";
|
||||
INFO_LOG(m_logger) << "Participant was removed but has no equipment number - ignoring";
|
||||
return;
|
||||
}
|
||||
removeParticipant(itEquipNumber.key(), itEquipNumber.value());
|
||||
|
||||
+2
@@ -39,6 +39,7 @@ Q_SIGNALS:
|
||||
void participantChanged(const ParticipantManagement::Participant&, DataModification modType, int exerciseId);
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
void participantAdded(const ParticipantManagement::Participant &participant);
|
||||
void participantModified(const ParticipantManagement::Participant &participant);
|
||||
void participantRemoved(const ParticipantManagement::Participant &participant);
|
||||
@@ -53,6 +54,7 @@ private Q_SLOTS:
|
||||
void onRegisterParticipantReply(const ParticipantManagement::RegisterReply &reply) override final;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
int m_exerciseId;
|
||||
std::shared_ptr<DdsHandlerExercise> m_ddsHandlerExercise;
|
||||
ExercisesHandler *m_exercisesHandler;
|
||||
|
||||
+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();
|
||||
|
||||
@@ -70,6 +70,7 @@ Q_SIGNALS:
|
||||
void exerciseChanged(const ExerciseManagement::Exercise &data, DataModification modType);
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
void exerciseAdded(int exerciseId);
|
||||
void exerciseRemoved(int exerciseId);
|
||||
QMultiHash<int, ParticipantInfoStruct>::iterator findParticipant(const ParticipantInfoStruct &pis);
|
||||
@@ -78,6 +79,7 @@ private Q_SLOTS:
|
||||
void onModifyEquipmentTypeDataReply(const Core::FunctionReplyObject &replyObject) override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
std::shared_ptr<DdsHandler> m_ddsHandler;
|
||||
|
||||
QHash<int, ExerciseParticipantHandler *> m_exerciseHandler;
|
||||
|
||||
+18
-18
@@ -54,7 +54,7 @@ IWMS2ECC::PlayerInfo IWMS2ECC_Impl::convert(const ParticipantManagement::Partici
|
||||
pi.exerciseId = exerciseId;
|
||||
pi.forceId = part.partyId();
|
||||
|
||||
DEBUG_LOG() << "Force Id = " << pi.forceId;
|
||||
DEBUG_LOG(m_logger) << "Force Id = " << pi.forceId;
|
||||
|
||||
pi.info = QString::fromStdString(part.info());
|
||||
pi.parentPlayerId = part.superiorId();
|
||||
@@ -67,10 +67,10 @@ IWMS2ECC::PlayerInfo IWMS2ECC_Impl::convert(const ParticipantManagement::Partici
|
||||
{
|
||||
pi.equipTypeId = partType.equipmentTypeId();
|
||||
pi.typeClassId = convert(partType.typeClass());
|
||||
TRACE_LOG() << "Found participant type with id " << part.typeId() << ", " << pi.typeClassId << ", " << pi.equipTypeId;
|
||||
TRACE_LOG(m_logger) << "Found participant type with id " << part.typeId() << ", " << pi.typeClassId << ", " << pi.equipTypeId;
|
||||
}
|
||||
else
|
||||
WARNING_LOG() << "Can not find participant type with id " << part.typeId();
|
||||
WARNING_LOG(m_logger) << "Can not find participant type with id " << part.typeId();
|
||||
pi.typeId = part.typeId();
|
||||
pi.isDeleted = part.isDeleted();
|
||||
|
||||
@@ -80,8 +80,8 @@ IWMS2ECC::PlayerInfo IWMS2ECC_Impl::convert(const ParticipantManagement::Partici
|
||||
|
||||
pi.symbolColor = party.color();
|
||||
|
||||
DEBUG_LOG() << "party.name: " << pi.forceName;
|
||||
DEBUG_LOG() << "symbolColor: " << pi.symbolColor << ", playerId: " << pi.playerId << ", exerciseId: " << exerciseId;
|
||||
DEBUG_LOG(m_logger) << "party.name: " << pi.forceName;
|
||||
DEBUG_LOG(m_logger) << "symbolColor: " << pi.symbolColor << ", playerId: " << pi.playerId << ", exerciseId: " << exerciseId;
|
||||
|
||||
|
||||
return pi;
|
||||
@@ -97,7 +97,7 @@ IWMS2ECC::exerciseMap IWMS2ECC_Impl::getExercises() const
|
||||
retMap.insert(ex.id(), convert(ex));
|
||||
}
|
||||
|
||||
INFO_LOG() << "IN getExercises, exMap.size(): " << exMap.size()
|
||||
INFO_LOG(m_logger) << "IN getExercises, exMap.size(): " << exMap.size()
|
||||
<< ", retMap.size: " << retMap.size();
|
||||
return retMap;
|
||||
}
|
||||
@@ -131,12 +131,12 @@ QMap<int, IWMS2ECC::PlayerInfo> IWMS2ECC_Impl::getAllPlayers(int exerciseId) con
|
||||
|
||||
QMap<int, IWMS2ECC::PlayerInfo> IWMS2ECC_Impl::getAllParticipants(int exerciseId) const
|
||||
{
|
||||
INFO_LOG() << "IN getAllParticipants";
|
||||
INFO_LOG(m_logger) << "IN getAllParticipants";
|
||||
QMap<int, IWMS2ECC::PlayerInfo> retMap;
|
||||
|
||||
const QMap<qint32, ParticipantManagement::Participant> map = m_exercisesHandler->getParticipants(exerciseId);
|
||||
|
||||
INFO_LOG() << "getAllPlayers map.size() : " << map.size();
|
||||
INFO_LOG(m_logger) << "getAllPlayers map.size() : " << map.size();
|
||||
|
||||
for (const ParticipantManagement::Participant &exePart : map)
|
||||
{
|
||||
@@ -171,8 +171,8 @@ IWMS2ECC::RegisterReturnValue IWMS2ECC_Impl::registerPlayer(int playerId, int eq
|
||||
|
||||
void IWMS2ECC_Impl::onRegistrationReturnValue(int exerciseId, qint32 participantId, ParticipantManagement::RegisterReturnValue retValue)
|
||||
{
|
||||
INFO_LOG() << "IN onRegistrationReturnValue ";
|
||||
INFO_LOG() << "exerciseId: " << exerciseId << ", participantId: " << participantId << ", retValue: " << retValue;
|
||||
INFO_LOG(m_logger) << "IN onRegistrationReturnValue ";
|
||||
INFO_LOG(m_logger) << "exerciseId: " << exerciseId << ", participantId: " << participantId << ", retValue: " << retValue;
|
||||
emit registrationReturnValue(exerciseId, participantId, convert(retValue));
|
||||
}
|
||||
|
||||
@@ -187,12 +187,12 @@ IWMS2ECC::UnregisterReturnValue IWMS2ECC_Impl::unregister(int equipNo, int exerc
|
||||
IWMS2ECC::PlayerInfo IWMS2ECC_Impl::getPlayerInfo(int playerId, int exerciseId)
|
||||
{
|
||||
|
||||
DEBUG_LOG() << "IN getPlayerInfo: "
|
||||
DEBUG_LOG(m_logger) << "IN getPlayerInfo: "
|
||||
<< " playerId = " << playerId << ", exerciseId = " << exerciseId;
|
||||
|
||||
if (playerId <= 0 || exerciseId <= 0)
|
||||
{
|
||||
WARNING_LOG() << "Invalid Player (0,0)";
|
||||
WARNING_LOG(m_logger) << "Invalid Player (0,0)";
|
||||
IWMS2ECC::PlayerInfo pi;
|
||||
pi.playerState = NOT_FOUND;
|
||||
return pi;
|
||||
@@ -217,7 +217,7 @@ IWMS2ECC::PlayerInfo IWMS2ECC_Impl::getPlayerInfo(int playerId, int exerciseId)
|
||||
|
||||
pi.playerState = FOUND;
|
||||
|
||||
INFO_LOG() << "Player (" << pi.playerId << "," << exerciseId << ") found: "
|
||||
INFO_LOG(m_logger) << "Player (" << pi.playerId << "," << exerciseId << ") found: "
|
||||
<< "AssignState: " << pi.assignState << ", forceName: " << pi.forceName;
|
||||
|
||||
return pi;
|
||||
@@ -230,7 +230,7 @@ QMap<int, int> IWMS2ECC_Impl::getEquipRequirements(int exerciseId) const
|
||||
|
||||
const QMap<qint32, ParticipantManagement::Participant> map = m_exercisesHandler->getParticipants(exerciseId);
|
||||
|
||||
INFO_LOG() << "getAllPlayers map.size() : " << map.size();
|
||||
INFO_LOG(m_logger) << "getAllPlayers map.size() : " << map.size();
|
||||
|
||||
QMap<int, int> reqPartTypes;
|
||||
|
||||
@@ -250,17 +250,17 @@ QMap<int, int> IWMS2ECC_Impl::getEquipRequirements(int exerciseId) const
|
||||
const ParticipantManagement::Type partType = m_exercisesHandler->participantType(typeId);
|
||||
if (partType.id() == typeId)
|
||||
{
|
||||
DEBUG_LOG() << "Key: " << typeId;
|
||||
DEBUG_LOG(m_logger) << "Key: " << typeId;
|
||||
ParticipantManagement::TypeClass typeClass = partType.typeClass();
|
||||
int equipTypeId = partType.equipmentTypeId();
|
||||
if (typeClass != ParticipantManagement::TypeClass_def::Unit && typeClass != ParticipantManagement::TypeClass_def::SupportUnit)
|
||||
{
|
||||
reqEquipTypes[equipTypeId] = cIt.value();
|
||||
DEBUG_LOG() << "equipTypeId: " << equipTypeId << ", amount: " << cIt.value();
|
||||
DEBUG_LOG(m_logger) << "equipTypeId: " << equipTypeId << ", amount: " << cIt.value();
|
||||
}
|
||||
}
|
||||
else
|
||||
WARNING_LOG() << "Can not find participant type with id " << typeId;
|
||||
WARNING_LOG(m_logger) << "Can not find participant type with id " << typeId;
|
||||
}
|
||||
return reqEquipTypes;
|
||||
}
|
||||
@@ -408,7 +408,7 @@ bool IWMS2ECC_Impl::setEquipmentType(const EquipmentType &et)
|
||||
|
||||
bool IWMS2ECC_Impl::setEquipmentTypes(const equipTypeMap &map)
|
||||
{
|
||||
INFO_LOG() << "IN setEquipmentTypes: equipMap.size: " << map.size();
|
||||
INFO_LOG(m_logger) << "IN setEquipmentTypes: equipMap.size: " << map.size();
|
||||
|
||||
std::vector<ParticipantManagement::EquipmentType> vEquipTypes;
|
||||
vEquipTypes.reserve(map.size());
|
||||
|
||||
+2
@@ -54,6 +54,8 @@ Q_SIGNALS:
|
||||
void registrationReturnValue(int exerciseId, qint32 participantId, IWMS2ECC::RegisterReturnValue retValue);
|
||||
|
||||
protected:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
QMap<int, IWMS2ECC::PlayerInfo> getAllParticipants(int exerciseId) const;
|
||||
|
||||
QByteArray getSymbol(int symbolId, int exerciseId, const QColor &color, int role) const;
|
||||
|
||||
@@ -6,9 +6,8 @@
|
||||
namespace WarehouseManagement
|
||||
{
|
||||
|
||||
MainHandler::MainHandler()
|
||||
: QObject()
|
||||
{}
|
||||
MainHandler::MainHandler() : QObject(),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
|
||||
|
||||
MainHandler::~MainHandler()
|
||||
{
|
||||
|
||||
@@ -28,6 +28,8 @@ public:
|
||||
bool init(int domainId);
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
std::shared_ptr<DdsHandler> m_ddsHandler;
|
||||
std::shared_ptr<ExercisesHandler> m_exercisesHandler;
|
||||
std::shared_ptr<IWMS2ECC_Impl> m_wms2ecc;
|
||||
|
||||
Reference in new issue
Block a user