lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds immediate migration results in progress

Browse Source
This commit is contained in:
torsten committed 2026-08-19 11:18:24 +02:00
1 parent 8453e104c5
commit 3bb6e89496
2102 files changed
+17482 -15071
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/data_manager.cpp
+13 -13
View File
@@ -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 &reg)
{
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;