Qt6 Migration: Complete migration with DDS/RTI support and build validation
Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
18662 files changed
+4115092
-5435
No files matched your search
+41
-28
@@ -18,11 +18,11 @@
|
||||
#include <LtsCoordinate/lts_coordinate.h>
|
||||
|
||||
|
||||
#include <QtCore/QPointF>
|
||||
#include <QtCore/QVector>
|
||||
#include <QtCore/QSet>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QPointF>
|
||||
#include <QVector>
|
||||
#include <QSet>
|
||||
#include <QDateTime>
|
||||
#include <QTimer>
|
||||
#include <QElapsedTimer>
|
||||
|
||||
using namespace CentralEffectSimulation;
|
||||
@@ -115,7 +115,7 @@ void HandlerExplosions::onAesItemViewChanged(const AreaEffectSimulation::AesItem
|
||||
// if (m_ddsHandler->dtcPdm()->gearClassFromChargeTypeId(data.chargeTypeId()) == ProjectDataManagement::GearClass_def::AirSupport)
|
||||
// return;
|
||||
|
||||
static const QVector<AreaEffectSimulation::AesType> validAesTypes = {AesType_def::AtExplosionAreaSingleExplosions, AesType_def::AtExplosionSingle, AesType_def::AtExplosionCluster};
|
||||
static const QVector<AreaEffectSimulation::AesType> validAesTypes = {AesType_def::AtEffectCluster, AesType_def::AtExplosionAreaSingleExplosions, AesType_def::AtExplosionSingle, AesType_def::AtExplosionCluster};
|
||||
if (!validAesTypes.contains(data.aesTypeId()))
|
||||
return;
|
||||
|
||||
@@ -159,6 +159,12 @@ void HandlerExplosions::onAesItemViewChanged(const AreaEffectSimulation::AesItem
|
||||
DEBUG_LOG(m_logger) << "explosionCluster";
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType::AtEffectCluster:
|
||||
{
|
||||
isCentral = true;
|
||||
DEBUG_LOG(m_logger) << "effectCluster";
|
||||
break;
|
||||
}
|
||||
default:
|
||||
DEBUG_LOG(m_logger) << "default, data.aesTypeId=" << aesTypeId;
|
||||
} // switch
|
||||
@@ -268,7 +274,7 @@ void HandlerExplosions::onAesItemViewChanged(const AreaEffectSimulation::AesItem
|
||||
// a) Aiv changes to EsActivated or
|
||||
// b) Effects ?
|
||||
// So be prepared and calculate hazardDistanceForm already at EsPrepared
|
||||
if (aesTypeId == AreaEffectSimulation::AesType_def::AtExplosionCluster)
|
||||
if (aesTypeId == AreaEffectSimulation::AesType_def::AtExplosionCluster || aesTypeId == AreaEffectSimulation::AesType_def::AtEffectCluster)
|
||||
{
|
||||
// useHazardDistance = (aesTypeId == AreaEffectSimulation::AesType_def::AtExplosionCluster);
|
||||
|
||||
@@ -384,7 +390,10 @@ void HandlerExplosions::calculateImpact(const AreaEffectSimulation::ChargeEffect
|
||||
requestTab.equipmentNumber(equipNo);
|
||||
requestTab.participantId(pPos.participantId());
|
||||
requestTab.chargeTypeId(data.chargeTypeId());
|
||||
//default
|
||||
requestTab.aesId(0);
|
||||
requestTab.eventType(ProjectDataManagement::EventType_def::FireEvent);
|
||||
//
|
||||
if (data.originatorTypeId() == ProjectDataManagement::StateChangeOriginator::Participant)
|
||||
{
|
||||
// if we get the equipmentNumber from the participant we will send this (needed by tab)
|
||||
@@ -402,10 +411,14 @@ void HandlerExplosions::calculateImpact(const AreaEffectSimulation::ChargeEffect
|
||||
{
|
||||
requestTab.originatorEquipmentNumber(data.originatorId());
|
||||
}
|
||||
else if (data.originatorTypeId() == ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation)
|
||||
{
|
||||
requestTab.aesId(data.originatorId());
|
||||
requestTab.eventType(ProjectDataManagement::EventType_def::ExplosionCluster);
|
||||
}
|
||||
requestTab.remainEffectPercent(remainEffectPercent);
|
||||
requestTab.position(tabPosition);
|
||||
requestTab.effectTime(data.effectStart() / 1000);
|
||||
requestTab.eventType(ProjectDataManagement::PdmEventType_def::FireEvent);
|
||||
ParticipantManagement::Participant originator = m_ddsHandler->dtcPpm()->participant(data.originatorId());
|
||||
requestTab.partyId(originator.partyId());
|
||||
requestTab.mineId(0);
|
||||
@@ -994,10 +1007,10 @@ void HandlerExplosions::calculateSmartExplosion(const int32_t aesItemId,
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "size=1";
|
||||
// send two single fire to the same vehicle
|
||||
sendCesHitRequest( itemViewUtm, vehiclesInSmartExplosion.first().participantPosition, impactTime , 100, ProjectDataManagement::PdmEventType_def::HitEffectSimulation); // 100 Percent
|
||||
sendCesHitRequest( itemViewUtm, vehiclesInSmartExplosion.first().participantPosition, impactTime + 1000, 100, ProjectDataManagement::PdmEventType_def::HitEffectSimulation); // 100 Percent
|
||||
sendParticipantEvent(itemViewUtm, vehiclesInSmartExplosion.first().participantPosition, ProjectDataManagement::PdmEventType_def::HitEffectSimulation);
|
||||
sendParticipantEvent(itemViewUtm, vehiclesInSmartExplosion.first().participantPosition, ProjectDataManagement::PdmEventType_def::HitEffectSimulation);
|
||||
sendCesHitRequest( itemViewUtm, vehiclesInSmartExplosion.first().participantPosition, impactTime , 100, ProjectDataManagement::EventType_def::HitEffectSimulation); // 100 Percent
|
||||
sendCesHitRequest( itemViewUtm, vehiclesInSmartExplosion.first().participantPosition, impactTime + 1000, 100, ProjectDataManagement::EventType_def::HitEffectSimulation); // 100 Percent
|
||||
sendParticipantEvent(itemViewUtm, vehiclesInSmartExplosion.first().participantPosition, ProjectDataManagement::EventType_def::HitEffectSimulation);
|
||||
sendParticipantEvent(itemViewUtm, vehiclesInSmartExplosion.first().participantPosition, ProjectDataManagement::EventType_def::HitEffectSimulation);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1011,10 +1024,10 @@ void HandlerExplosions::calculateSmartExplosion(const int32_t aesItemId,
|
||||
};
|
||||
std::sort(vehiclesInSmartExplosion.begin(), vehiclesInSmartExplosion.end(), mapSortLessThan);
|
||||
|
||||
sendCesHitRequest( itemViewUtm, vehiclesInSmartExplosion.at(0).participantPosition, impactTime, 100, ProjectDataManagement::PdmEventType_def::HitEffectSimulation); // 100 Percent
|
||||
sendCesHitRequest( itemViewUtm, vehiclesInSmartExplosion.at(1).participantPosition, impactTime, 100, ProjectDataManagement::PdmEventType_def::HitEffectSimulation); // 100 Percent
|
||||
sendParticipantEvent(itemViewUtm, vehiclesInSmartExplosion.at(0).participantPosition, ProjectDataManagement::PdmEventType_def::HitEffectSimulation);
|
||||
sendParticipantEvent(itemViewUtm, vehiclesInSmartExplosion.at(1).participantPosition, ProjectDataManagement::PdmEventType_def::HitEffectSimulation);
|
||||
sendCesHitRequest( itemViewUtm, vehiclesInSmartExplosion.at(0).participantPosition, impactTime, 100, ProjectDataManagement::EventType_def::HitEffectSimulation); // 100 Percent
|
||||
sendCesHitRequest( itemViewUtm, vehiclesInSmartExplosion.at(1).participantPosition, impactTime, 100, ProjectDataManagement::EventType_def::HitEffectSimulation); // 100 Percent
|
||||
sendParticipantEvent(itemViewUtm, vehiclesInSmartExplosion.at(0).participantPosition, ProjectDataManagement::EventType_def::HitEffectSimulation);
|
||||
sendParticipantEvent(itemViewUtm, vehiclesInSmartExplosion.at(1).participantPosition, ProjectDataManagement::EventType_def::HitEffectSimulation);
|
||||
|
||||
}
|
||||
} // calculateSmartExplosion
|
||||
@@ -1205,7 +1218,7 @@ void HandlerExplosions::calculateImpactsEffect(const CentralEffectSimulation::Ae
|
||||
effect = 3; // hazardDistance
|
||||
DEBUG_LOG(m_logger) << "Sende CES Hit Request: participantId=" << participantId << ", RANGE=" << toString(mostInnerRange) << ", effect=" << effect;
|
||||
sendCesHitRequest(itemView, participantPosition, QDateTime::currentMSecsSinceEpoch(),
|
||||
effect, ProjectDataManagement::PdmEventType_def::EnterHazardDistance);
|
||||
effect, ProjectDataManagement::EventType_def::EnterHazardDistance);
|
||||
}
|
||||
break;
|
||||
case RANGE::NON_LETHAL:
|
||||
@@ -1230,14 +1243,14 @@ void HandlerExplosions::calculateImpactsEffect(const CentralEffectSimulation::Ae
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Sende CES Hit Request: participantId=" << participantId << ", RANGE=" << toString(mostInnerRange) << ", effect=" << effect;
|
||||
sendCesHitRequest(itemView, participantPosition, QDateTime::currentMSecsSinceEpoch(),
|
||||
effect, ProjectDataManagement::PdmEventType_def::AirSupport); // AirSupport for both: LETHAL_RADIUS, NONLETHAL_RADIUS
|
||||
effect, ProjectDataManagement::EventType_def::AirSupport); // AirSupport for both: LETHAL_RADIUS, NONLETHAL_RADIUS
|
||||
}
|
||||
#ifdef GUEZE_3136_IMPLEMENTED
|
||||
else
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Sende CES Hit Request: participantId=" << participantId << ", RANGE=" << toString(mostInnerRange) << " (Verdeckung -> EnterHazardDistance)";
|
||||
sendCesHitRequest(itemView, participantPosition, QDateTime::currentMSecsSinceEpoch(),
|
||||
effect, ProjectDataManagement::PdmEventType_def::EnterHazardDistance);
|
||||
effect, ProjectDataManagement::EventType_def::EnterHazardDistance);
|
||||
}
|
||||
#endif // GUEZE_3136_IMPLEMENTED
|
||||
} // case
|
||||
@@ -1510,7 +1523,7 @@ void HandlerExplosions::sendEffectTypeEvent(const CentralEffectSimulation::AesIt
|
||||
//effectTime >= 0 ? effectTime : participantPosition.sampleTime(),
|
||||
QDateTime::currentMSecsSinceEpoch(),
|
||||
ctasEffectType,
|
||||
ProjectDataManagement::PdmEventType_def::HitEffectSimulation);
|
||||
ProjectDataManagement::EventType_def::HitEffectSimulation);
|
||||
}
|
||||
|
||||
// Send via TAB-Proxy to battlefield
|
||||
@@ -1518,7 +1531,7 @@ void HandlerExplosions::sendCesHitRequest(const CentralEffectSimulation::AesItem
|
||||
const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition,
|
||||
const qint64 effectTime,
|
||||
const int remaining,
|
||||
const ProjectDataManagement::PdmEventType eventType)
|
||||
const ProjectDataManagement::EventType eventType)
|
||||
{
|
||||
int32_t legacyChargeTypeId = 0;
|
||||
legacyChargeTypeId = m_ddsHandler->getLegacyIdFromChargeTypeId(itemView.chargeStruct);
|
||||
@@ -1575,7 +1588,7 @@ void HandlerExplosions::sendCesHitRequest(const CentralEffectSimulation::AesItem
|
||||
|
||||
// mineFieldBitIndex wird als reserve2 uebertragen und hier wird die Wirkbeginn uebertragen.
|
||||
int effectTime2 = 0;
|
||||
if (eventType == ProjectDataManagement::PdmEventType::EnterHazardDistance)
|
||||
if (eventType == ProjectDataManagement::EventType::EnterHazardDistance)
|
||||
{
|
||||
const auto &ec = m_ddsHandler->dtcAes().get()->explosionCluster(itemView.aesItemId);
|
||||
if (ec.effectStart().is_set())
|
||||
@@ -1605,7 +1618,7 @@ void HandlerExplosions::sendCesHitRequest(const CentralEffectSimulation::AesItem
|
||||
DEBUG_LOG(m_logger) << "ftcTab->SendCesHitRequest: " << requestTab;
|
||||
m_ddsHandler->ftcTab()->sendCesHitRequest(requestTab, this);
|
||||
if (!m_ddsHandler->isSmartChargeType(itemView.chargeStruct))
|
||||
sendParticipantEvent(m_aesItemViewsUtm.value(itemView.aesItemId), participantPosition, ProjectDataManagement::PdmEventType_def::HitEffectSimulation);
|
||||
sendParticipantEvent(m_aesItemViewsUtm.value(itemView.aesItemId), participantPosition, ProjectDataManagement::EventType_def::HitEffectSimulation);
|
||||
}
|
||||
|
||||
double HandlerExplosions::getSquareDistance(const QPointF ¢erUtm, const QPointF &pointUtm)
|
||||
@@ -1632,13 +1645,13 @@ void HandlerExplosions::sendEnterHazardDistance(const int participantId, const i
|
||||
|
||||
m_enteredHazardDistanceStore.participantEnteringArea(participantId, aesItemId);
|
||||
|
||||
ProjectDataManagement::PdmEventType eventType = ProjectDataManagement::PdmEventType_def::EnterHazardDistance;
|
||||
ProjectDataManagement::EventType eventType = ProjectDataManagement::EventType_def::EnterHazardDistance;
|
||||
sendCesHitRequest(m_aesItemViewsUtm.value(aesItemId),
|
||||
cesParticipantData,
|
||||
QDateTime::currentMSecsSinceEpoch(),
|
||||
ctasEffectType,
|
||||
eventType);
|
||||
sendParticipantEvent(m_aesItemViewsUtm.value(aesItemId), cesParticipantData, ProjectDataManagement::PdmEventType_def::EnterHazardDistance);
|
||||
sendParticipantEvent(m_aesItemViewsUtm.value(aesItemId), cesParticipantData, ProjectDataManagement::EventType_def::EnterHazardDistance);
|
||||
}
|
||||
|
||||
void HandlerExplosions::sendLeaveHazardDistance(const int participantId, const int aesItemId, const int remaining)
|
||||
@@ -1658,13 +1671,13 @@ void HandlerExplosions::sendLeaveHazardDistance(const int participantId, const i
|
||||
cesParticipantData,
|
||||
QDateTime::currentMSecsSinceEpoch(),
|
||||
ctasEffectType,
|
||||
ProjectDataManagement::PdmEventType_def::LeaveHazardDistance);
|
||||
sendParticipantEvent(itemView, cesParticipantData, ProjectDataManagement::PdmEventType_def::LeaveHazardDistance);
|
||||
ProjectDataManagement::EventType_def::LeaveHazardDistance);
|
||||
sendParticipantEvent(itemView, cesParticipantData, ProjectDataManagement::EventType_def::LeaveHazardDistance);
|
||||
}
|
||||
|
||||
void HandlerExplosions::sendParticipantEvent(const CentralEffectSimulation::AesItemViewUtm &item,
|
||||
const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition,
|
||||
const ProjectDataManagement::PdmEventType eventType)
|
||||
const ProjectDataManagement::EventType eventType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "sendParticipantEvent participantId=" << participantPosition.participantId();
|
||||
ParticipantManagement::TypeClass typeClass = m_handlerParticipant->typeClassFromTypeId(participantPosition.participantTypeId());
|
||||
|
||||
Reference in new issue
Block a user