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

Migrates AreaEffectSimulation to generated rtiddsgen API

Browse Source 
Converts accessor calls to plain member access across aes service and plugin.
This commit is contained in:
berrux-dev committed 2026-09-21 02:45:07 +02:00
1 parent e8d07af320
commit 472f537313
102 files changed
+3307 -3313
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_functional_area.cpp
+43 -43
View File
@@ -15,7 +15,7 @@ namespace AreaEffectSimulation
{
HandlerFunctionalArea::HandlerFunctionalArea(MainHandler *mainHandler)
: HandlerBaseTmpl<ObjectFunctionalArea>(mainHandler, QStringLiteral("FunctionalArea"), s_areaCount[AesType::AtFunctionalArea], s_areaCountCentral[AesType::AtFunctionalArea])
: HandlerBaseTmpl<ObjectFunctionalArea>(mainHandler, QStringLiteral("FunctionalArea"), s_areaCount[static_cast<int>(AesType::AtFunctionalArea)], s_areaCountCentral[static_cast<int>(AesType::AtFunctionalArea)])
, Interface::Fts::FunctionalAreaModifyRequestHandler(mainHandler->dds()->fts())
, Interface::Fts::FunctionalAreaRemoveRequestHandler(mainHandler->dds()->fts())
{
@@ -87,7 +87,7 @@ bool HandlerFunctionalArea::init()
}
if (!ifs->data().isCentral)
{
if (totalAreas() >= s_maxActiveAreas[AesType::AtFunctionalArea])
if (totalAreas() >= s_maxActiveAreas[static_cast<int>(AesType::AtFunctionalArea)])
{
ERROR_LOG(m_logger) << "More active functional areas in database than allowed - ignoring the rest!";
ifs->removeObject();
@@ -97,7 +97,7 @@ bool HandlerFunctionalArea::init()
}
else
{
if (totalAreasCentral() >= s_maxActiveAreasCentral[AesType::AtFunctionalArea])
if (totalAreasCentral() >= s_maxActiveAreasCentral[static_cast<int>(AesType::AtFunctionalArea)])
{
ERROR_LOG(m_logger) << "More active functional areas in database than allowed - ignoring the rest!";
ifs->removeObject();
@@ -148,40 +148,40 @@ QVector<Database::AesFunctionalAreaType> HandlerFunctionalArea::loadDefaultFunct
int HandlerFunctionalArea::totalAreas() const
{
return s_areaCount[AesType::AtFunctionalArea];
return s_areaCount[static_cast<int>(AesType::AtFunctionalArea)];
}
int HandlerFunctionalArea::totalAreasCentral() const
{
return s_areaCountCentral[AesType::AtFunctionalArea];
return s_areaCountCentral[static_cast<int>(AesType::AtFunctionalArea)];
}
template<typename T>
static void fillData(const T &src, Database::AesFunctionalArea &dst)
{
if (src.id() < 0) // is the id given as negative? set id -> used by OC-Laptop
dst.id = src.id();
if (src.id < 0) // is the id given as negative? set id -> used by OC-Laptop
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.effectDuration = src.effectDuration();
dst.position.rx() = src.area().cornerBottomLeft().lon();
dst.position.ry() = src.area().cornerBottomLeft().lat();
dst.length = src.area().height();
dst.width = src.area().width();
dst.partyId = src.partyId().is_set() ? src.partyId().get() : 0;
dst.chargeTypeId = src.chargeTypeId();
dst.participantId = src.participantId().is_set() ? src.participantId().get() : 0;
dst.pointSymbol = src.pointSymbol().is_set() ? QString::fromStdString(src.pointSymbol().get()) : QString();
dst.functionalAreaTypeId = src.functionalAreaTypeId();
dst.deconMode = src.deconMode();
dst.deconTime = src.deconTime();
dst.maintMode = src.maintMode();
dst.maintTime = src.maintTime();
dst.medicMode = src.medicMode();
dst.medicTime = src.medicTime();
dst.supplyMode = src.supplyMode();
dst.supplyTime = src.supplyTime();
dst.name = QString::fromStdString(src.name);
dst.effectStart = src.effectStart.is_set() && src.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(src.effectStart.get()) : QDateTime();
dst.effectDuration = src.effectDuration;
dst.position.rx() = src.area.cornerBottomLeft.lon;
dst.position.ry() = src.area.cornerBottomLeft.lat;
dst.length = src.area.height;
dst.width = src.area.width;
dst.partyId = src.partyId.is_set() ? src.partyId.get() : 0;
dst.chargeTypeId = src.chargeTypeId;
dst.participantId = src.participantId.is_set() ? src.participantId.get() : 0;
dst.pointSymbol = src.pointSymbol.is_set() ? QString::fromStdString(src.pointSymbol.get()) : QString();
dst.functionalAreaTypeId = src.functionalAreaTypeId;
dst.deconMode = src.deconMode;
dst.deconTime = src.deconTime;
dst.maintMode = src.maintMode;
dst.maintTime = src.maintTime;
dst.medicMode = src.medicMode;
dst.medicTime = src.medicTime;
dst.supplyMode = src.supplyMode;
dst.supplyTime = src.supplyTime;
}
void HandlerFunctionalArea::onFunctionalAreaModifyRequest(const rti::core::SampleIdentity &cookie,
@@ -196,9 +196,9 @@ void HandlerFunctionalArea::onFunctionalAreaModifyRequest(const rti::core::Sampl
Core::FunctionReplyObject HandlerFunctionalArea::functionalAreaCreateRequest(const FunctionalAreaModifyRequest &request)
{
if (!request.partyId().is_set() && (request.supplyMode() != AesOperatingMode_def::OmWaitingTime))
if (!request.partyId.is_set() && (request.supplyMode != AesOperatingMode::OmWaitingTime))
return Core::FunctionReplyObject(tr_lts("dds", "Functional areas need a party id."));
if ((!request.participantId().is_set()) && (request.supplyMode() == AesOperatingMode_def::OmWaitingTime))
if ((!request.participantId.is_set()) && (request.supplyMode == AesOperatingMode::OmWaitingTime))
return Core::FunctionReplyObject(tr_lts("dds", "Functional areas Supply need a participant id."));
@@ -220,7 +220,7 @@ Core::FunctionReplyObject HandlerFunctionalArea::functionalAreaCreateRequest(con
if (ifs->data().isCentral)
{
if (totalAreasCentral() >= s_maxActiveAreasCentral[AesType::AtFunctionalArea] && request.effectStart().is_set())
if (totalAreasCentral() >= s_maxActiveAreasCentral[static_cast<int>(AesType::AtFunctionalArea)] && request.effectStart.is_set())
{
ifs->removeObject(); //Not finally deleted from db after this,Fallback if DB deletion is not working correct
@@ -231,7 +231,7 @@ Core::FunctionReplyObject HandlerFunctionalArea::functionalAreaCreateRequest(con
}
else
{
if (totalAreas() >= s_maxActiveAreas[AesType::AtFunctionalArea] && request.effectStart().is_set())
if (totalAreas() >= s_maxActiveAreas[static_cast<int>(AesType::AtFunctionalArea)] && request.effectStart.is_set())
{
ifs->removeObject(); //Not finally deleted from db after this,Fallback if DB deletion is not working correct
ifs->removeObjectFromDb();
@@ -258,16 +258,16 @@ Core::FunctionReplyObject HandlerFunctionalArea::functionalAreaCreateRequest(con
Core::FunctionReplyObject HandlerFunctionalArea::functionalAreaModifyRequest(const FunctionalAreaModifyRequest &request)
{
Core::FunctionReplyObject ret;
if (request.id() == 0 || ((request.id() < 0) && !getObjectFromMap(m_objectMap, std::abs(request.id()), ret)))
if (request.id == 0 || ((request.id < 0) && !getObjectFromMap(m_objectMap, std::abs(request.id), ret)))
return functionalAreaCreateRequest(request);
ObjectFunctionalArea *ifs = getObjectFromMap(m_objectMap, std::abs(request.id()), ret);
ObjectFunctionalArea *ifs = getObjectFromMap(m_objectMap, std::abs(request.id), ret);
if (!ifs)
return ret;
// Anzahl aktiver Areas ist erreicht, der Wirkbeginn ist (soll) gesetzt sein, aber die Area war
// vorher noch ohne Wirkbeginn
// if (totalAreas() >= s_maxActiveAreas[AesType::AtFunctionalArea] && request.effectStart().is_set() && !ifs->isObjectModifiable())
// if (totalAreas() >= s_maxActiveAreas[AesType::AtFunctionalArea] && request.effectStart.is_set() && !ifs->isObjectModifiable())
// return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Too many active functional areas."));
// Todo: IsObjectModifiable() ?!?
@@ -286,19 +286,19 @@ Core::FunctionReplyObject HandlerFunctionalArea::functionalAreaModifyRequest(con
/*!
* 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.is_set())
{
if (isCentral)
{
if (totalAreasCentral() >= s_maxActiveAreasCentral[AesType::AtFunctionalArea])
if (totalAreasCentral() >= s_maxActiveAreasCentral[static_cast<int>(AesType::AtFunctionalArea)])
{
return Core::FunctionReplyObject(1, tr_lts("dds", "Too many active central functional areas."));
}
}
else
{
if (totalAreas() >= s_maxActiveAreas[AesType::AtFunctionalArea])
if (totalAreas() >= s_maxActiveAreas[static_cast<int>(AesType::AtFunctionalArea)])
{
return Core::FunctionReplyObject(1, tr_lts("dds", "Too many active functional areas."));
}
@@ -306,7 +306,7 @@ Core::FunctionReplyObject HandlerFunctionalArea::functionalAreaModifyRequest(con
}
// For counting, only Elements being at least prepared are important:
if (request.effectStart().is_set() && ifs->isObjectModifiable())
if (request.effectStart.is_set() && ifs->isObjectModifiable())
{
@@ -326,8 +326,8 @@ Core::FunctionReplyObject HandlerFunctionalArea::functionalAreaModifyRequest(con
// Change from central to training area
if (wasCentral)
{
if (totalAreas() >= s_maxActiveAreas[AesType::AtFunctionalArea])
return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Too many active functional areas."));
if (totalAreas() >= s_maxActiveAreas[static_cast<int>(AesType::AtFunctionalArea)])
return Core::FunctionReplyObject(request.id, tr_lts("dds", "Too many active functional areas."));
m_areaCount++;
m_areaCountCentral--;
@@ -336,8 +336,8 @@ Core::FunctionReplyObject HandlerFunctionalArea::functionalAreaModifyRequest(con
}
else // Change from training area to central
{
if (totalAreasCentral() >= s_maxActiveAreasCentral[AesType::AtFunctionalArea])
return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Too many active central functional areas."));
if (totalAreasCentral() >= s_maxActiveAreasCentral[static_cast<int>(AesType::AtFunctionalArea)])
return Core::FunctionReplyObject(request.id, tr_lts("dds", "Too many active central functional areas."));
m_areaCount--;
m_areaCountCentral++;
DEBUG_LOG(m_logger) << "s_areaCount[AesType::AtFunctionalArea] = " << m_areaCount;
@@ -346,7 +346,7 @@ Core::FunctionReplyObject HandlerFunctionalArea::functionalAreaModifyRequest(con
}
}
if (request.id() < 0 && checkStateForSfm(ifs))
if (request.id < 0 && checkStateForSfm(ifs))
{
DEBUG_LOG(m_logger) << "Overwrite functinal area Effect State for OC";
aea.effectStateId = AesEffectState::EsPrepared;