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

Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen

Browse Source 
- 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:
torstenandCopilot committed 2026-08-19 06:06:24 +02:00
1 parent 010f91928a
commit b774f4035c
2785 files changed
+18754 -18316
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_smart.cpp
+30 -31
View File
@@ -35,7 +35,6 @@ CesTestsSmart::CesTestsSmart(QObject *parent)
, TrainingAreaBase::Interface::Fts::SendCesHitRequestHandler(nullptr)
, m_bTestsSuccessful(true)
, m_housePos(LtsCoordTrans::UtmCoordinate::fromMgrs(QStringLiteral("32UMD8000090000")))
, m_logger(getLogger("CesTestsSmart"))
, m_testId(0)
, m_participantIndex(0)
, m_DynamicParticipantIndex(0)
@@ -54,7 +53,7 @@ bool CesTestsSmart::init(int domainId, int exerciseId, int testId)
bool bRet = true;
int equipmentTypeIdVehicle = 35;
int equipmentTypeIdSoldier = 30; // dds-Topic Participant-Management::Type
INFO_LOG(m_logger) << "init begin";
INFO_LOG() << "init begin";
m_testId = testId;
m_buildingId = 0; // ism_main_structure_element:id
@@ -142,7 +141,7 @@ bool CesTestsSmart::init(int domainId, int exerciseId, int testId)
void CesTestsSmart::startTest()
{
INFO_LOG(m_logger) << "startTest m_testId=" << m_testId;
INFO_LOG() << "startTest m_testId=" << m_testId;
if (m_testId <= 1) // 1 SMART
{
m_explosionSingle = m_housePos.geographic(5, 5);
@@ -164,7 +163,7 @@ void CesTestsSmart::startTest()
}
else
{
ERROR_LOG(m_logger) << "Unknown test id = " << m_testId;
ERROR_LOG() << "Unknown test id = " << m_testId;
failExit();
}
QTimer::singleShot(8000, this, &CesTestsSmart::failExit);
@@ -186,10 +185,10 @@ void CesTestsSmart::tryCreateDynamicParticipantData()
dp.sampleTime(esTime);
m_DynamicParticipantIndex++;
DEBUG_LOG(m_logger) << "Publishing DynamicParticipantData";
DEBUG_LOG() << "Publishing DynamicParticipantData";
if (!m_ppmDts->publish(dp))
{
ERROR_LOG(m_logger) << "Error requesting create ParticipantPosition";
ERROR_LOG() << "Error requesting create ParticipantPosition";
failExit();
}
}
@@ -213,10 +212,10 @@ void CesTestsSmart::tryCreateParticipantPosition()
pp.sampleTime(posTime);
pp.pos(pos);
DEBUG_LOG(m_logger) << "Publishing ParticipantPosition";
DEBUG_LOG() << "Publishing ParticipantPosition";
if (!m_ppmDts->publish(pp))
{
ERROR_LOG(m_logger) << "Error requesting create ParticipantPosition";
ERROR_LOG() << "Error requesting create ParticipantPosition";
failExit();
}
}
@@ -230,17 +229,17 @@ void CesTestsSmart::tryCreateParticipant()
pt.id(21);
pt.equipmentNumber(61);
DEBUG_LOG(m_logger) << "Publishing Participant";
DEBUG_LOG() << "Publishing Participant";
if (!m_ppmDts->publish(pt))
{
ERROR_LOG(m_logger) << "Error requesting create Participant";
ERROR_LOG() << "Error requesting create Participant";
failExit();
}
}
void CesTestsSmart::checkParticipantEvent()
{
INFO_LOG(m_logger) << "checkParicipantEvent m_cesDtc->participantEvents().size() =" << m_cesDtc->participantEvents().size();
INFO_LOG() << "checkParicipantEvent m_cesDtc->participantEvents().size() =" << m_cesDtc->participantEvents().size();
m_cesDtc->waitForHistoricalDataParticipantEvent();
CentralEffectSimulation::ParticipantEvent participantEvent0 = m_cesDtc->participantEvent(0);
CentralEffectSimulation::ParticipantEvent participantEvent1 = m_cesDtc->participantEvent(1);
@@ -248,7 +247,7 @@ void CesTestsSmart::checkParticipantEvent()
for ( int i = 0; i < m_cesDtc->participantEvents().size(); i++)
{
CentralEffectSimulation::ParticipantEvent participantEvent = m_cesDtc->participantEvent(i);
INFO_LOG(m_logger) << "Recived ParicipantEvent equipmentNumber:"<<participantEvent.equipmentNumber()
INFO_LOG() << "Recived ParicipantEvent equipmentNumber:"<<participantEvent.equipmentNumber()
<< " eventType="<<participantEvent.eventTypeId();
}
@@ -263,7 +262,7 @@ void CesTestsSmart::checkParticipantEvent()
break;
default:
// nothing
ERROR_LOG(m_logger) << "Error checkParticipantEvent";
ERROR_LOG() << "Error checkParticipantEvent";
failExit();
break;
}
@@ -284,10 +283,10 @@ void CesTestsSmart::tryCreateTypeVehicle()
ty.name("HMMWV Utility");
DEBUG_LOG(m_logger) << "Publishing Type";
DEBUG_LOG() << "Publishing Type";
if (!m_ppmDts->publish(ty))
{
ERROR_LOG(m_logger) << "Error requesting create Type";
ERROR_LOG() << "Error requesting create Type";
failExit();
}
}
@@ -305,10 +304,10 @@ void CesTestsSmart::tryCreateTypeSoldier()
ty.name("Soldier");
DEBUG_LOG(m_logger) << "Publishing Type";
DEBUG_LOG() << "Publishing Type";
if (!m_ppmDts->publish(ty))
{
ERROR_LOG(m_logger) << "Error requesting create Type";
ERROR_LOG() << "Error requesting create Type";
failExit();
}
}
@@ -319,7 +318,7 @@ static void setPos(std::vector<Core::GeoPosition> &cont, const QPointF &pos)
void CesTestsSmart::tryCreateAesItemViewSingleExplosion()
{
INFO_LOG(m_logger) << "trying to send AesItemView AtExplosionAreaSingleExplosions";
INFO_LOG() << "trying to send AesItemView AtExplosionAreaSingleExplosions";
AreaEffectSimulation::AesItemView iv;
iv.effectStateId(AreaEffectSimulation::AesEffectState_def::EsActivated);
@@ -344,30 +343,30 @@ void CesTestsSmart::tryCreateAesItemViewSingleExplosion()
setPos(iv.form(), m_housePos.geographic(-10, 20));
setPos(iv.form(), m_housePos.geographic(-10, 30));
DEBUG_LOG(m_logger) << "Publishing AesItemView";
DEBUG_LOG() << "Publishing AesItemView";
if (!m_aesDts->publish(iv))
{
ERROR_LOG(m_logger) << "Error requesting create AesItemViewSingleExplosions";
ERROR_LOG() << "Error requesting create AesItemViewSingleExplosions";
failExit();
}
}
void CesTestsSmart::tryCreateChargeType()
{
DEBUG_LOG(m_logger) << "Publishing ChargeType";
DEBUG_LOG() << "Publishing ChargeType";
ProjectDataManagement::ChargeType ct;
ct.id(m_chargeTypeId);
ct.properties("{\"impactRadius\":25,\"impactEdgeLength\":50,\"isSmart\":true,\"searchRadius\":150}");
if (!m_pdmDts->publish(ct))
{
ERROR_LOG(m_logger) << "Error publish ChargeType";
ERROR_LOG() << "Error publish ChargeType";
failExit();
}
}
void CesTestsSmart::tryCreatePrepareExplosionSingle()
{
INFO_LOG(m_logger) << "trying to send ExplosionSingle";
INFO_LOG() << "trying to send ExplosionSingle";
AreaEffectSimulation::ExplosionSingle es;
const qint64 time = QDateTime::currentMSecsSinceEpoch();
const rti::core::int64 esTime = static_cast<rti::core::int64>(time);
@@ -383,17 +382,17 @@ void CesTestsSmart::tryCreatePrepareExplosionSingle()
es.isCentral(true);
es.effectStart ( QDateTime::currentMSecsSinceEpoch() + 2000);
DEBUG_LOG(m_logger) << "Publishing ExplosionSingle";
DEBUG_LOG() << "Publishing ExplosionSingle";
if (!m_aesDts->publish(es))
{
ERROR_LOG(m_logger) << "Error publish ExplosionArea";
ERROR_LOG() << "Error publish ExplosionArea";
failExit();
}
}
void CesTestsSmart::tryCreateExplosionSingle()
{
INFO_LOG(m_logger) << "trying to send ExplosionSingle";
INFO_LOG() << "trying to send ExplosionSingle";
AreaEffectSimulation::ExplosionSingle es;
const qint64 time = QDateTime::currentMSecsSinceEpoch();
const rti::core::int64 esTime = static_cast<rti::core::int64>(time);
@@ -411,10 +410,10 @@ void CesTestsSmart::tryCreateExplosionSingle()
es.sampleTime(esTime);
es.chargeStruct().chargeTypeId(m_chargeTypeId);
DEBUG_LOG(m_logger) << "Publishing ExplosionSingle";
DEBUG_LOG() << "Publishing ExplosionSingle";
if (!m_aesDts->publish(es))
{
ERROR_LOG(m_logger) << "Error publish ExplosionArea";
ERROR_LOG() << "Error publish ExplosionArea";
failExit();
}
}
@@ -434,7 +433,7 @@ void CesTestsSmart::onSendCesHitRequest(const rti::core::SampleIdentity &cookie,
QDateTime dateTime;
dateTime.setMSecsSinceEpoch(msecs);
DEBUG_LOG(m_logger) << "onSendCesHitRequest" << "\n"
DEBUG_LOG() << "onSendCesHitRequest" << "\n"
<< " request.aesId() = " << request.aesId() << "\n"
<< " request.chargeTypeId() = " << request.chargeTypeId() << "\n"
<< " request.equipmentNumber() = " << request.equipmentNumber() << "\n"
@@ -449,14 +448,14 @@ void CesTestsSmart::onSendCesHitRequest(const rti::core::SampleIdentity &cookie,
void CesTestsSmart::failExit()
{
DEBUG_LOG(m_logger) << "FailExit";
DEBUG_LOG() << "FailExit";
m_bTestsSuccessful = false;
QTimer::singleShot(50, qApp, QCoreApplication::quit);
}
void CesTestsSmart::ExitSuccess()
{
DEBUG_LOG(m_logger) << "ExitSuccess";
DEBUG_LOG() << "ExitSuccess";
m_bTestsSuccessful = true;
QTimer::singleShot(200, qApp, &QCoreApplication::quit);
}