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_bccontamination.cpp
+19 -19
View File
@@ -109,34 +109,34 @@ static void fillData(const BCContaminationModifyRequest &src, Database::AesBCCon
dst.id = src.id;
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.impactPosition.rx() = src.impactPosition.lon;
dst.impactPosition.ry() = src.impactPosition.lat;
dst.impactRadius = src.impactRadius;
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.weatherSourceId = src.weatherSource;
dst.externalId = src.externalId.is_set() ? src.externalId.get() : 0;
dst.externalId = src.externalId.has_value() ? src.externalId.get() : 0;
dst.upperOffset = src.upperOffset;
dst.lowerOffset = src.lowerOffset;
// weather parameter are delivered, when adding in OC-laptop
if (src.weatherPosition.is_set())
if (src.weatherPosition.has_value())
{
dst.weatherPosition.rx() = src.weatherPosition.get().lon;
dst.weatherPosition.ry() = src.weatherPosition.get().lat;
}
else
dst.weatherPosition = dst.impactPosition; // initial, is not used during update therefore it's ok here
if(src.windSpeed.is_set())
if(src.windSpeed.has_value())
dst.windSpeed = src.windSpeed.get();
if(src.propagationDirection.is_set())
if(src.propagationDirection.has_value())
dst.propagationDirection = src.propagationDirection.get();
if(src.weatherTimestamp.is_set())
if(src.weatherTimestamp.has_value())
dst.weatherTimestamp = QDateTime::fromMSecsSinceEpoch(src.weatherTimestamp.get());
else if(src.effectStart.is_set())
else if(src.effectStart.has_value())
dst.weatherTimestamp = QDateTime::fromMSecsSinceEpoch(src.effectStart.get());
}
@@ -170,7 +170,7 @@ Core::FunctionReplyObject HandlerBCContamination::bCContaminationCreateRequest(c
if (ifs->data().isCentral)
{
if (totalAreasCentral() >= (s_maxActiveAreasCentral[static_cast<int>(AesType::AtBCContamination)] + s_maxActiveAreasCentral[static_cast<int>(AesType::AtNContamination)]) && request.effectStart.is_set())
if (totalAreasCentral() >= (s_maxActiveAreasCentral[static_cast<int>(AesType::AtBCContamination)] + s_maxActiveAreasCentral[static_cast<int>(AesType::AtNContamination)]) && request.effectStart.has_value())
{
ifs->removeObject(); //Not finally deleted from db after this,Fallback if DB deletion is not working correct
ifs->removeObjectFromDb();
@@ -180,7 +180,7 @@ Core::FunctionReplyObject HandlerBCContamination::bCContaminationCreateRequest(c
}
else
{
if (totalAreas() >= (s_maxActiveAreas[static_cast<int>(AesType::AtBCContamination)] + s_maxActiveAreas[static_cast<int>(AesType::AtNContamination)]) && request.effectStart.is_set())
if (totalAreas() >= (s_maxActiveAreas[static_cast<int>(AesType::AtBCContamination)] + s_maxActiveAreas[static_cast<int>(AesType::AtNContamination)]) && request.effectStart.has_value())
{
ifs->removeObject(); //Not finally deleted from db after this,Fallback if DB deletion is not working correct
@@ -208,7 +208,7 @@ Core::FunctionReplyObject HandlerBCContamination::bCContaminationCreateRequest(c
}
m_objectMap.insert(ifs->id(), ifs);
if (request.withDangerArea.is_set() && request.withDangerArea.get())
if (request.withDangerArea.has_value() && request.withDangerArea.get())
{
DangerAreaModifyRequest req;
req.id = 0;
@@ -238,7 +238,7 @@ Core::FunctionReplyObject HandlerBCContamination::bCContaminationModifyRequest(c
{
Core::FunctionReplyObject ret;
ObjectBCContamination *ifs = nullptr;
if (request.externalId.is_set() && request.externalId.get() > 0)
if (request.externalId.has_value() && request.externalId.get() > 0)
ifs = getObjectFromMapByExternalId(m_objectMap, request.externalId.get(), ret);
if (!ifs)
@@ -252,7 +252,7 @@ Core::FunctionReplyObject HandlerBCContamination::bCContaminationModifyRequest(c
return ret;
}
if (request.effectStart.is_set() && (request.effectStart.get() + request.effectDuration < m_mainHandler->dds()->currentPartitionTime().toMSecsSinceEpoch()))
if (request.effectStart.has_value() && (request.effectStart.get() + request.effectDuration < m_mainHandler->dds()->currentPartitionTime().toMSecsSinceEpoch()))
return removeObject(ifs);
Database::AesBCContamination aea(ifs->data());
@@ -277,13 +277,13 @@ Core::FunctionReplyObject HandlerBCContamination::bCContaminationModifyRequest(c
/*!
* If the effect start added after creation, the max amount need to be checked
*/
if(!ifs->isActivationTimeSet() && request.effectStart.is_set())
if(!ifs->isActivationTimeSet() && request.effectStart.has_value())
{
if (isCentral)
{
if (totalAreasCentral() >= (s_maxActiveAreasCentral[static_cast<int>(AesType::AtBCContamination)] + s_maxActiveAreasCentral[static_cast<int>(AesType::AtNContamination)])
/*&& request.effectStart.is_set()*/)
/*&& request.effectStart.has_value()*/)
{
return Core::FunctionReplyObject(1, tr_lts("dds", "Too many active central B/C or N contamination areas."));
}
@@ -291,7 +291,7 @@ Core::FunctionReplyObject HandlerBCContamination::bCContaminationModifyRequest(c
else
{
if (totalAreas() >= (s_maxActiveAreas[static_cast<int>(AesType::AtBCContamination)] + s_maxActiveAreas[static_cast<int>(AesType::AtNContamination)])
/*&& request.effectStart.is_set()*/)
/*&& request.effectStart.has_value()*/)
{
return Core::FunctionReplyObject(1, tr_lts("dds", "Too many active B/C or N contamination areas."));
}
@@ -299,7 +299,7 @@ Core::FunctionReplyObject HandlerBCContamination::bCContaminationModifyRequest(c
}
// 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;
@@ -361,7 +361,7 @@ Core::FunctionReplyObject HandlerBCContamination::bCContaminationModifyRequest(c
ERROR_LOG(m_logger)<<"[bCContaminationModifyRequest] couldn't update danger area: bccontamination.id: "<<ifs->id()
<<" dangerArea.name: "<<dangerRequest.name;
}
else if (request.withDangerArea.is_set() && request.withDangerArea.get())
else if (request.withDangerArea.has_value() && request.withDangerArea.get())
{
DEBUG_LOG(m_logger)<<"[bCContaminationModifyRequest] add new danger area to bcId: " <<ifs->id();
DangerAreaModifyRequest newDangerRequest;