Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen
- NGL_ADD_LIBRARY2: 87 CMakeLists.txt konvertiert für Export-Header Generierung - 44 Export-Header Include-Pfade korrigiert (_export.h) - 81 DDS-Stub-Header generiert (*_dtc.h, *_fts.h, *_dts.h, *_ftc.h) - INGLLogger: Duplikat gelöscht, m_logger Member entfernt, variadische Makros - Q_FUNC_INFO Redefinition behoben (Qt6 definiert bereits) - FATAL_LOG Makro hinzugefügt - InfrastructureManagement DDS-Stubs (ism.hpp, ism_enums.hpp, ism_ftc.h) - FilterManagement DDS-Stubs (flt_ftc.h, flt_dts.h) - AreaEffectSimulation DDS-Stubs (aes.hpp, aes_enums.hpp) - SymbolAppearance Klasse vollständig definiert mit content() Methode - BuildingComponentFilter Klasse definiert mit Copy-Konstruktor - Ftc Factory: nullptr Return (abstract class) - AesFilter Klasse in aes.hpp hinzugefügt - Dtc Klasse in ppm.hpp mit participantChanged Signal - AesType Enum: alle 15 At* Werte definiert - AesEffectState_def: EsReceived hinzugefügt - DataModification Enum: eAdded/eModified/eRemoved - function_reply_object.h → core_types.h Include-Pfad (72 Dateien) - Enum-Class-Streaming Template-Operator in INGLLogger.h - ism_mounting_point.h: QImage → QtGui/QImage, QGuiApplication/QScreen - ism_data_plugin_interface.h: QSet Include, Include-Reihenfolge - QRegExp → QRegularExpression in tpm_js_parser.cpp - .underlying() Aufrufe zu direktem Enum-Vergleich korrigiert - Include-Pfade: aes.hpp in symbol_appearance_settings_impl.h und aes_display_filter_impl.h Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
2785 files changed
+18754
-18316
No files matched your search
@@ -28,7 +28,7 @@ LtsWebSocket::AbstractClientMessage *ClientMessageFactory::createMessage(LtsWebS
|
||||
|
||||
if (m_type == LtsWebSocket::JsonKeys::ERROR_())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error in message: " << message;
|
||||
ERROR_LOG() << "Error in message: " << message;
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
@@ -46,7 +46,7 @@ LtsWebSocket::AbstractClientMessage *ClientMessageFactory::createMessage(LtsWebS
|
||||
|
||||
if (!result)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "message: " << message;
|
||||
ERROR_LOG() << "message: " << message;
|
||||
Q_ASSERT(result);
|
||||
}
|
||||
|
||||
@@ -109,13 +109,12 @@ DataManager::DataManager(const std::shared_ptr<IWMS2ECC_Impl> &wms2ecc, const st
|
||||
, m_wms2ecc(wms2ecc)
|
||||
, m_ddsHandler(ddsHandler)
|
||||
, m_exercisesHandler(exHandler)
|
||||
, m_logger(getLogger("MainHandler"))
|
||||
{
|
||||
connect(m_wsReconnectTimer, &QTimer::timeout,
|
||||
this, &DataManager::openWebSocket);
|
||||
|
||||
m_messageFactory = new ClientMessageFactory(this);
|
||||
DEBUG_LOG(m_logger) << "WarehouseManagement/WmsServer = " << Settings::wmsServerName();
|
||||
DEBUG_LOG() << "WarehouseManagement/WmsServer = " << Settings::wmsServerName();
|
||||
}
|
||||
|
||||
DataManager::~DataManager()
|
||||
@@ -155,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(m_logger) << "Trying to listen on " << url;
|
||||
INFO_LOG() << "Trying to listen on " << url;
|
||||
|
||||
m_wsReconnectTimer->start(5000);
|
||||
}
|
||||
@@ -273,7 +272,7 @@ void DataManager::handleEquipmentTypes(const ::EquipmentTypes &eTypes)
|
||||
{
|
||||
const IWMS2ECC::equipTypeMap equipTypeMap = eTypes.getEquipmentTypes();
|
||||
|
||||
INFO_LOG(m_logger) << "equipTypeMap size: " << equipTypeMap.size();
|
||||
INFO_LOG() << "equipTypeMap size: " << equipTypeMap.size();
|
||||
ParticipantManagement::ModifyEquipmentTypeDataRequest request;
|
||||
request.deleteAll(true);
|
||||
auto &dataVec = request.data();
|
||||
@@ -293,7 +292,7 @@ void DataManager::handleEquipmentTypes(const ::EquipmentTypes &eTypes)
|
||||
dataVec.push_back(std::move(pEt));
|
||||
}
|
||||
|
||||
INFO_LOG(m_logger) << "dataVec size: " << dataVec.size() << ", " << request;
|
||||
INFO_LOG() << "dataVec size: " << dataVec.size() << ", " << request;
|
||||
|
||||
m_ddsHandler->ppmFtc()->modifyEquipmentTypeDataRequest(request, this);
|
||||
}
|
||||
@@ -301,9 +300,9 @@ void DataManager::handleEquipmentTypes(const ::EquipmentTypes &eTypes)
|
||||
void DataManager::onModifyEquipmentTypeDataReply(const Core::FunctionReplyObject &replyObject)
|
||||
{
|
||||
if (replyObject.error())
|
||||
ERROR_LOG(m_logger) << "Error while modifying equipmentType: " << replyObject.str();
|
||||
ERROR_LOG() << "Error while modifying equipmentType: " << replyObject.str();
|
||||
else
|
||||
INFO_LOG(m_logger) << "onModifyEquipmentTypeDataReply ok";
|
||||
INFO_LOG() << "onModifyEquipmentTypeDataReply ok";
|
||||
}
|
||||
|
||||
void DataManager::newTextMessageFromClient(LtsWebSocket::ClientConnection *client, const QString &message)
|
||||
@@ -314,7 +313,7 @@ void DataManager::newTextMessageFromClient(LtsWebSocket::ClientConnection *clien
|
||||
clientMessage = m_messageFactory->createMessage(client, message);
|
||||
else
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Could not parse incoming message: '" << message << "', error: " << result.errorString();
|
||||
WARNING_LOG() << "Could not parse incoming message: '" << message << "', error: " << result.errorString();
|
||||
clientMessage = new LtsWebSocket::InvalidMessage(client, QString(), QStringLiteral("Got message which is not JSON conform"));
|
||||
}
|
||||
|
||||
@@ -331,7 +330,7 @@ void DataManager::onParticipantChanged(const ParticipantManagement::Participant
|
||||
if (!m_clientConnection || !m_wms2ecc)
|
||||
return;
|
||||
|
||||
DEBUG_LOG(m_logger) << "partyId: " << data.partyId() << "participantId: " << data.id();
|
||||
DEBUG_LOG() << "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));
|
||||
@@ -342,7 +341,7 @@ void DataManager::onExerciseChanged(const ExerciseManagement::Exercise &data, Da
|
||||
if (!m_clientConnection)
|
||||
return;
|
||||
|
||||
INFO_LOG(m_logger) << "IN onExerciseChanged: ExerciseUpdate: id = " << data.id();
|
||||
INFO_LOG() << "IN onExerciseChanged: ExerciseUpdate: id = " << data.id();
|
||||
IWMS2ECC::Exercise exeData = IWMS2ECC_Impl::convert(data);
|
||||
|
||||
m_clientConnection->addReply(new ExerciseUpdate(exeData, modType));
|
||||
@@ -356,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(m_logger) << "ParticipantAssignState: " << state;
|
||||
INFO_LOG() << "ParticipantAssignState: " << state;
|
||||
|
||||
INFO_LOG(m_logger) << "Registration: participant: " << reg.getPlayerId() << ", exerciseId: " << reg.getExerciseId();
|
||||
INFO_LOG() << "Registration: participant: " << reg.getPlayerId() << ", exerciseId: " << reg.getExerciseId();
|
||||
|
||||
dds::core::optional<int> equipNo;
|
||||
dds::core::optional<QString> identification;
|
||||
|
||||
Reference in new issue
Block a user