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_off_route_mine.cpp
+8 -8
View File
@@ -76,20 +76,20 @@ static void fillData(const OffRouteMineModifyRequest &src, Database::AesOffRoute
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.area.cornerBottomLeft.lon;
dst.impactPosition.ry() = src.area.cornerBottomLeft.lat;
dst.width = src.area.width;
dst.length = src.area.height;
dst.rotationAngle = src.area.rotation;
dst.impactRadius = src.impactRadius.is_set() ? src.impactRadius.get() : 0;
dst.partyId = src.partyId.is_set() ? src.partyId.get() : 0;
dst.impactRadius = src.impactRadius.has_value() ? src.impactRadius.get() : 0;
dst.partyId = src.partyId.has_value() ? src.partyId.get() : 0;
dst.chargeTypeId = src.chargeTypeId;
dst.isCentral = true;
dst.triggered = false;
//dst.participantId = src.participantId.is_set() ? src.participantId.get() : 0;
//dst.externalId = src.externalId.is_set() ? src.externalId.get() : 0;
//dst.participantId = src.participantId.has_value() ? src.participantId.get() : 0;
//dst.externalId = src.externalId.has_value() ? src.externalId.get() : 0;
}
@@ -105,7 +105,7 @@ void HandlerOffRouteMine::onOffRouteMineModifyRequest(const rti::core::SampleIde
Core::FunctionReplyObject HandlerOffRouteMine::offRouteMineCreateRequest(const OffRouteMineModifyRequest &request)
{
if (totalAreasCentral() >= (s_maxActiveAreasCentral[static_cast<int>(AesType::AtOffRouteMine)]) && request.effectStart.is_set())
if (totalAreasCentral() >= (s_maxActiveAreasCentral[static_cast<int>(AesType::AtOffRouteMine)]) && request.effectStart.has_value())
return Core::FunctionReplyObject(1, tr_lts("dds", "Too many active off route mines."));
Database::AesOffRouteMine newData;
@@ -143,7 +143,7 @@ Core::FunctionReplyObject HandlerOffRouteMine::offRouteMineModifyRequest(const O
if (!ifs)
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);
// Anzahl aktiver Areas ist erreicht, der Wirkbeginn ist (soll) gesetzt sein, aber die Area war
@@ -152,7 +152,7 @@ Core::FunctionReplyObject HandlerOffRouteMine::offRouteMineModifyRequest(const O
* If the effect start added after creation, the max amount need to be checked
!*/
if (totalAreasCentral() >= (s_maxActiveAreasCentral[static_cast<int>(AesType::AtOffRouteMine)])
&& request.effectStart.is_set()
&& request.effectStart.has_value()
&& !ifs->isActivationTimeSet() // check if time before change was not setted.
/*&& !ifs->isObjectModifiable()*/)
{