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_cluster.cpp
+18 -18
View File
@@ -161,7 +161,7 @@ static void fillData(const ExplosionClusterModifyRequest &src, Database::AesExpl
dst.explosionGeometryId = src.explosionGeometry;
dst.zog = src.tla;
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;
@@ -170,13 +170,13 @@ static void fillData(const ExplosionClusterModifyRequest &src, Database::AesExpl
dst.igniterFunctionId = src.chargeStruct.igniterFunctionId;
dst.firePurposeId = src.firePurposeId;
dst.partyId = src.partyId.is_set() ? src.partyId.get() : 0;
dst.participantId = src.participantId.is_set() ? src.participantId.get() : -1; // -1 -> avoid trajectory
dst.partyId = src.partyId.has_value() ? src.partyId.get() : 0;
dst.participantId = src.participantId.has_value() ? src.participantId.get() : -1; // -1 -> avoid trajectory
// dst.firingGeoPosition // not provided, has to be retrieved from dds
dst.impactCount = src.impactCount;
dst.mhpCountRequest = src.mhpCount;
if (src.mhpRotation.is_set())
if (src.mhpRotation.has_value())
dst.mhpRotationRequest = src.mhpRotation.get();
else
dst.mhpRotationRequest = ObjectExplosionCluster::s_invalid_rotation_angle;
@@ -189,7 +189,7 @@ static void fillData(const ExplosionClusterModifyRequest &src, Database::AesExpl
// 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;
dst.launchVelocity = src.launchVelocity;
dst.launchAngleDeg = src.launchAngleDeg;
@@ -321,7 +321,7 @@ Core::FunctionReplyObject HandlerExplosionCluster::explosionClusterCreateRequest
// HLA Interface is using externalId...
// external (externalId>0) -> no partyId required
// external (externalId==0) -> partyId required
const int externalIdValue = request.externalId.is_set() ? request.externalId.get() : 0;
const int externalIdValue = request.externalId.has_value() ? request.externalId.get() : 0;
const ProjectDataManagement::GearClass gearClass = m_mainHandler->gearClassOfChargeTypeId(request.chargeStruct.chargeTypeId);
const bool bDoClaimPlannedCharge = (request.id == 0) &&
@@ -339,7 +339,7 @@ Core::FunctionReplyObject HandlerExplosionCluster::explosionClusterCreateRequest
QString chargeName= QString::fromStdString(m_mainHandler->dds()->pdmDtc()->chargeType(request.chargeStruct.chargeTypeId).name);
QString fireUnitName;
if (request.participantId.is_set())
if (request.participantId.has_value())
fireUnitName = QString::fromStdString(m_mainHandler->dds()->ppmDtc()->participant(request.participantId.get()).designator);
if (chargeNeeded > chargeLeft)
@@ -355,7 +355,7 @@ Core::FunctionReplyObject HandlerExplosionCluster::explosionClusterCreateRequest
fillData(request, newData, m_mainHandler);
if (!request.properties.empty() &&
(!request.effectStart.is_set() ||
(!request.effectStart.has_value() ||
request.effectStart.get() == 0))
{
QJsonObject propertiesObject = QJsonDocument::fromJson(QByteArray::fromStdString(request.properties)).object();
@@ -396,7 +396,7 @@ Core::FunctionReplyObject HandlerExplosionCluster::explosionClusterCreateRequest
return Core::FunctionReplyObject(1, tr_lts("dds", "Too many active air supports."));
}
}
else if (totalAreasCentral() >= (s_maxActiveAreasCentral[static_cast<int>(AesType::AtExplosionCluster)]) + (s_currentAirSupportCount) && request.effectStart.is_set())
else if (totalAreasCentral() >= (s_maxActiveAreasCentral[static_cast<int>(AesType::AtExplosionCluster)]) + (s_currentAirSupportCount) && request.effectStart.has_value())
{
ifs->removeObject(); //Not finally deleted from db after this,Fallback if DB deletion is not working correct
ifs->removeObjectFromDb();
@@ -406,9 +406,9 @@ Core::FunctionReplyObject HandlerExplosionCluster::explosionClusterCreateRequest
}
else
{
DEBUG_LOG(m_logger) << "New dec ExplosionCluster: " << totalAreas() << " Max: " << s_maxActiveAreas[static_cast<int>(AesType::AtExplosionCluster)] << " Is Set: " << request.effectStart.is_set();
DEBUG_LOG(m_logger) << "New dec ExplosionCluster: " << totalAreas() << " Max: " << s_maxActiveAreas[static_cast<int>(AesType::AtExplosionCluster)] << " Is Set: " << request.effectStart.has_value();
if (totalAreas() >= (s_maxActiveAreas[static_cast<int>(AesType::AtExplosionCluster)]) && request.effectStart.is_set())
if (totalAreas() >= (s_maxActiveAreas[static_cast<int>(AesType::AtExplosionCluster)]) && request.effectStart.has_value())
{
ifs->removeObject(); //Not finally deleted from db after this,Fallback if DB deletion is not working correct
ifs->removeObjectFromDb();
@@ -447,8 +447,8 @@ Core::FunctionReplyObject HandlerExplosionCluster::explosionClusterModifyRequest
// // externalId maybe set be HLA interface:
// // from external (externalIdValue>0) -> no partyId required
// // from internal (externalIdValue==0) -> partyId required
// const int externalIdValue = request.externalId.is_set() ? request.externalId.get() : 0;
// if (externalIdValue == 0 && !request.partyId.is_set())
// const int externalIdValue = request.externalId.has_value() ? request.externalId.get() : 0;
// if (externalIdValue == 0 && !request.partyId.has_value())
// return Core::FunctionReplyObject(tr_lts("dds", "Explosion areas need a party id."));
DEBUG_LOG(m_logger) << "request.effectStart :" << request.effectStart
@@ -476,7 +476,7 @@ Core::FunctionReplyObject HandlerExplosionCluster::explosionClusterModifyRequest
ifs->setAirSupportSource(bChargeIsAirSupport);
// For counting, only Elements being at least prepared are important:
if (request.effectStart.is_set() && ifs->isObjectModifiable()) // ToDo: check
if (request.effectStart.has_value() && ifs->isObjectModifiable()) // ToDo: check
{
// Calculate new polygon here. Not nice, though
auto poly = Polygons::explosionClusterArea(aea);
@@ -503,7 +503,7 @@ Core::FunctionReplyObject HandlerExplosionCluster::explosionClusterModifyRequest
{
// case 1: war zentral && effectStart war nicht gesetzt
// case 2: war dezentral && effectStart ist gesetzt.
if (totalAreasCentral() >= (s_maxActiveAreasCentral[static_cast<int>(AesType::AtExplosionCluster)] + (s_currentAirSupportCount)) && request.effectStart.is_set()
if (totalAreasCentral() >= (s_maxActiveAreasCentral[static_cast<int>(AesType::AtExplosionCluster)] + (s_currentAirSupportCount)) && request.effectStart.has_value()
&& ((wasCentral && !ifs->isActivationTimeSet()) || !wasCentral))
{
return Core::FunctionReplyObject(1, tr_lts("dds", "Too many active central explosion clusters."));
@@ -514,7 +514,7 @@ Core::FunctionReplyObject HandlerExplosionCluster::explosionClusterModifyRequest
{
// case 1: war dezentral && effectStart war nicht gesetzt
// case 2: war zentral && effectStart ist gesetzt.
if (totalAreas() >= (s_maxActiveAreas[static_cast<int>(AesType::AtExplosionCluster)]) && request.effectStart.is_set()
if (totalAreas() >= (s_maxActiveAreas[static_cast<int>(AesType::AtExplosionCluster)]) && request.effectStart.has_value()
&& (( !wasCentral && !ifs->isActivationTimeSet()) || wasCentral))
{
return Core::FunctionReplyObject(1, tr_lts("dds", "Too many active explosion clusters."));
@@ -523,7 +523,7 @@ Core::FunctionReplyObject HandlerExplosionCluster::explosionClusterModifyRequest
// For counting, only Elements being at least prepared are important:
if (request.effectStart.is_set() && ifs->isObjectModifiable())
if (request.effectStart.has_value() && ifs->isObjectModifiable())
{
DEBUG_LOG(m_logger) << "isCentral: " << isCentral;
@@ -580,7 +580,7 @@ Core::FunctionReplyObject HandlerExplosionCluster::explosionClusterModifyGeometr
// Anzahl aktiver Areas ist erreicht, der Wirkbeginn ist (soll) gesetzt sein, aber die Area war
// vorher noch ohne Wirkbeginn
if (totalAreas() >= (s_maxActiveAreas[AesType::AtExplosionArea] + s_maxActiveAreas[AesType::AtExplosionSingle]) && request.effectStart.is_set() && !ifs->isObjectModifiable())
if (totalAreas() >= (s_maxActiveAreas[AesType::AtExplosionArea] + s_maxActiveAreas[AesType::AtExplosionSingle]) && request.effectStart.has_value() && !ifs->isObjectModifiable())
return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Too many active explosion areas."));
// Todo: IsObjectModifiable() ?!?