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
+12
-12
@@ -65,7 +65,7 @@ EffectorData ObjectEffector::effectorData() const
|
||||
|
||||
void ObjectEffector::assignAesItemRequest(int aesItemId)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "assignAesItemRequest aesItemId=" << aesItemId;
|
||||
DEBUG_LOG() << "assignAesItemRequest aesItemId=" << aesItemId;
|
||||
m_aesItemId = aesItemId;
|
||||
// Statemachine mit new anlegen
|
||||
if (m_effectorStateMachine)
|
||||
@@ -101,7 +101,7 @@ void ObjectEffector::assignAesItemRequest(int aesItemId)
|
||||
|
||||
void ObjectEffector::deleteAssignmentAesItem()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "deleteAssignmentAesItem";
|
||||
DEBUG_LOG() << "deleteAssignmentAesItem";
|
||||
if (m_effectorStateMachine)
|
||||
{
|
||||
delete m_effectorStateMachine;
|
||||
@@ -119,7 +119,7 @@ bool ObjectEffector::reportFireReadinessRequest() // Feuerbereitschaft melden
|
||||
|
||||
void ObjectEffector::fireOrderRequest() // Feuerbefehl erhalten
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "fireOrderRequest";
|
||||
DEBUG_LOG() << "fireOrderRequest";
|
||||
if (!m_effectorStateMachine)
|
||||
return;
|
||||
|
||||
@@ -128,7 +128,7 @@ void ObjectEffector::fireOrderRequest() // Feuerbefehl erhalten
|
||||
|
||||
void ObjectEffector::fireRequest() // Feuern
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "fireRequest";
|
||||
DEBUG_LOG() << "fireRequest";
|
||||
if (!m_effectorStateMachine)
|
||||
return;
|
||||
m_effectorStateMachine->fire();
|
||||
@@ -136,7 +136,7 @@ void ObjectEffector::fireRequest() // Feuern
|
||||
|
||||
bool ObjectEffector::reportFiredRequest() // Abgefeuert melden
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "reportFiredRequest";
|
||||
DEBUG_LOG() << "reportFiredRequest";
|
||||
if (!m_effectorStateMachine)
|
||||
return false;
|
||||
return m_effectorStateMachine->reportFired();
|
||||
@@ -144,7 +144,7 @@ bool ObjectEffector::reportFiredRequest() // Abgefeuert melden
|
||||
|
||||
void ObjectEffector::reportEmptyChargeRequest(bool emptyCharge) // Munition leer
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "reportEmptyChargeRequest";
|
||||
DEBUG_LOG() << "reportEmptyChargeRequest";
|
||||
if (!m_effectorStateMachine)
|
||||
return;
|
||||
m_effectorStateMachine->setEmptyCharge(emptyCharge);
|
||||
@@ -166,7 +166,7 @@ void ObjectEffector::resetReadynessTimer()
|
||||
void ObjectEffector::sendEffectorToDds()
|
||||
{
|
||||
// Effector Effector;
|
||||
DEBUG_LOG(m_logger) << "sendEffectorToDds NewState= " << m_effectorStateMachine->getCurrentStateStr() << ", participantId=" << m_participantId
|
||||
DEBUG_LOG() << "sendEffectorToDds NewState= " << m_effectorStateMachine->getCurrentStateStr() << ", participantId=" << m_participantId
|
||||
<< ", aesItemId=" << m_aesItemId;
|
||||
AreaEffectSimulation::Effector effector;
|
||||
effector.id(m_participantId);
|
||||
@@ -178,11 +178,11 @@ void ObjectEffector::sendEffectorToDds()
|
||||
|
||||
void ObjectEffector::onEffectorFired()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onEffectorFired";
|
||||
DEBUG_LOG() << "onEffectorFired";
|
||||
|
||||
if (m_firingStrategy == nullptr)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Not possible to fire. No firing strategy specified.";
|
||||
ERROR_LOG() << "Not possible to fire. No firing strategy specified.";
|
||||
|
||||
return;
|
||||
}
|
||||
@@ -195,7 +195,7 @@ void ObjectEffector::onEffectorFired()
|
||||
// Input: SAA-Format, relativ zum Geschoss in metern und die Zeit relativ zur Abschusszeit
|
||||
void ObjectEffector::setIndendedTrajectory(const std::vector<Core::RelativePositionRelativeTime> &geometryRelativeToLaunchOrigin)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "setTrajectory #points=" << geometryRelativeToLaunchOrigin.size();
|
||||
DEBUG_LOG() << "setTrajectory #points=" << geometryRelativeToLaunchOrigin.size();
|
||||
m_intendendTrajectory.clear();
|
||||
for (const Core::RelativePositionRelativeTime &geoPosRelTime : geometryRelativeToLaunchOrigin)
|
||||
{
|
||||
@@ -209,7 +209,7 @@ void ObjectEffector::setIndendedTrajectory(const std::vector<Core::RelativePosit
|
||||
|
||||
void ObjectEffector::setEffectorData(const EffectorData &effectorData)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "setEffectorData";
|
||||
DEBUG_LOG() << "setEffectorData";
|
||||
m_effectorData = effectorData;
|
||||
setIndendedTrajectory(effectorData.trajectoryRelative());
|
||||
delete m_firingStrategy;
|
||||
@@ -221,7 +221,7 @@ void ObjectEffector::setEffectorData(const EffectorData &effectorData)
|
||||
|
||||
void ObjectEffector::logMessage(QString message)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "EffectorStateMachine logMessage=" << message << ", aesItemId=" << m_aesItemId << ", m_participantId=" << m_participantId;
|
||||
DEBUG_LOG() << "EffectorStateMachine logMessage=" << message << ", aesItemId=" << m_aesItemId << ", m_participantId=" << m_participantId;
|
||||
}
|
||||
|
||||
} // namespace AreaEffectSimulation
|
||||
Reference in new issue
Block a user