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

Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set

Browse Source 
new_docker_build.sh gains Group 12 (212 GUI/Data plugins); fixes LtsUtilsGuiDds visibility (LTO-stripped exports), LtsProjectionWorkstation unity name shadow, 6 unity-off dirs (dup file-scope statics, ddsftc INTERFACE sources) and reconfigures BUILD_FILTERMANAGEMENT/BUILD_PLUGINS_SERVICEMONITOR=ON
This commit is contained in:
berrux-dev committed 2026-10-20 09:36:57 +02:00
1 parent 2b957d1edb
commit 598fc2560e
1718 files changed
+126739 -18495
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_explosion_area.cpp
+10 -10
View File
@@ -101,21 +101,21 @@ static void fillData(const ExplosionAreaModifyRequest &src, Database::AesExplosi
dst.impactPosition.ry() = src.area.cornerBottomLeft.lat;
dst.rotationAngle = src.area.rotation;
dst.name = QString::fromStdString(src.name);
dst.effectStart = src.effectStart.is_set() && src.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(src.effectStart.get()) : QDateTime();
dst.effectStart = src.effectStart.has_value() && src.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(src.effectStart.get()) : QDateTime();
dst.effectDuration = src.effectDuration;
dst.effectSourceId = src.effectSourceId;
dst.impactLength = src.area.height;
dst.impactWidth = src.area.width;
dst.partyId = src.partyId.is_set() ? src.partyId.get() : 0;
dst.partyId = src.partyId.has_value() ? src.partyId.get() : 0;
dst.chargeTypeId = src.chargeTypeId;
dst.participantId = src.participantId.is_set() ? src.participantId.get() : 0;
dst.participantId = src.participantId.has_value() ? src.participantId.get() : 0;
dst.cannonCount = src.cannonCount;
dst.cannonRounds = src.cannonRounds;
dst.altitude = src.altitude;
dst.firePurpose = QString::fromStdString(src.purpose);
dst.fireRequestTime = QDateTime::fromMSecsSinceEpoch(src.fireRequestTime);
dst.effectMarkingInTa = src.effectMarkingInTa;
dst.externalId = src.externalId.is_set() ? src.externalId.get() : 0;
dst.externalId = src.externalId.has_value() ? src.externalId.get() : 0;
}
void HandlerExplosionArea::onExplosionAreaModifyRequest(const rti::core::SampleIdentity &cookie,
@@ -130,7 +130,7 @@ void HandlerExplosionArea::onExplosionAreaModifyRequest(const rti::core::SampleI
Core::FunctionReplyObject HandlerExplosionArea::explosionAreaCreateRequest(const ExplosionAreaModifyRequest &request)
{
if (!request.partyId.is_set())
if (!request.partyId.has_value())
return Core::FunctionReplyObject(tr_lts("dds", "Explosion areas need a party id."));
int chargeNeeded = request.cannonCount * request.cannonRounds;
@@ -164,7 +164,7 @@ Core::FunctionReplyObject HandlerExplosionArea::explosionAreaCreateRequest(const
if (ifs->data().isCentral)
{
if (totalAreasCentral() >= (s_maxActiveAreasCentral[static_cast<int>(AesType::AtExplosionArea)] + s_maxActiveAreasCentral[static_cast<int>(AesType::AtExplosionSingle)]) && request.effectStart.is_set())
if (totalAreasCentral() >= (s_maxActiveAreasCentral[static_cast<int>(AesType::AtExplosionArea)] + s_maxActiveAreasCentral[static_cast<int>(AesType::AtExplosionSingle)]) && request.effectStart.has_value())
{
ifs->removeObject(); //Not finally deleted from db after this,Fallback if DB deletion is not working correct
ifs->removeObjectFromDb();
@@ -174,7 +174,7 @@ Core::FunctionReplyObject HandlerExplosionArea::explosionAreaCreateRequest(const
}
else
{
if (totalAreas() >= (s_maxActiveAreas[static_cast<int>(AesType::AtExplosionArea)] + s_maxActiveAreas[static_cast<int>(AesType::AtExplosionSingle)]) && request.effectStart.is_set())
if (totalAreas() >= (s_maxActiveAreas[static_cast<int>(AesType::AtExplosionArea)] + s_maxActiveAreas[static_cast<int>(AesType::AtExplosionSingle)]) && request.effectStart.has_value())
{
ifs->removeObject(); //Not finally deleted from db after this,Fallback if DB deletion is not working correct
ifs->removeObjectFromDb();
@@ -230,7 +230,7 @@ Core::FunctionReplyObject HandlerExplosionArea::explosionAreaModifyRequest(const
/*!
* Check if the max amount is reached if the effect start added after creation.
!*/
if(!ifs->isActivationTimeSet() && request.effectStart.is_set())
if(!ifs->isActivationTimeSet() && request.effectStart.has_value())
{
if (isCentral)
{
@@ -249,7 +249,7 @@ Core::FunctionReplyObject HandlerExplosionArea::explosionAreaModifyRequest(const
}
// For counting, only Elements being at least prepared are important:
if (request.effectStart.is_set() && ifs->isObjectModifiable())
if (request.effectStart.has_value() && ifs->isObjectModifiable())
{
// Calculate new polygon here. Not nice, though
@@ -304,7 +304,7 @@ Core::FunctionReplyObject HandlerExplosionArea::explosionAreaModifyGeometryReque
// Anzahl aktiver Areas ist erreicht, der Wirkbeginn ist (soll) gesetzt sein, aber die Area war
// vorher noch ohne Wirkbeginn
if (totalAreas() >= (s_maxActiveAreas[static_cast<int>(AesType::AtExplosionArea)] + s_maxActiveAreas[static_cast<int>(AesType::AtExplosionSingle)])
&& request.effectStart.is_set()
&& request.effectStart.has_value()
&& !ifs->isActivationTimeSet() // if time was not set before change and now check count
&& !ifs->isObjectModifiable())
return Core::FunctionReplyObject(request.id, tr_lts("dds", "Too many active explosion areas and explosion singles"));