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/object_functional_area.cpp
+32 -32
View File
@@ -42,7 +42,7 @@ Core::FunctionReplyObject ObjectFunctionalArea::createObject(const Database::Aes
m_dataAesFunctionalArea = data;
if (data.supplyMode == AesOperatingMode_def::OmWaitingTime)
if (data.supplyMode == AesOperatingMode::OmWaitingTime)
{
setIsCentral = true;
m_data.participantId = data.participantId;
@@ -198,23 +198,23 @@ void ObjectFunctionalArea::publishAiv()
const QRectF bounds(poly.boundingRect());
AesItemView aiv(m_aiv);
aiv.aesItemId(m_data.id);
aiv.chargeStruct().chargeTypeId(m_data.chargeTypeId);
aiv.effectStart(toMSec(m_data.effectStart));
ddsVecFromPoly(poly, aiv.form());
aiv.boundingBoxBottomLeft(Core::GeoPosition2D(bounds.bottomLeft().x(), bounds.bottomLeft().y()));
aiv.boundingBoxTopRight(Core::GeoPosition2D(bounds.topRight().x(), bounds.topRight().y()));
aiv.aesTypeId(AesType::AtFunctionalArea);
aiv.effectStateId(effectState());
aiv.id(1000 * m_data.id + AesType::AtFunctionalArea);
aiv.aesItemId = m_data.id;
aiv.chargeStruct.chargeTypeId = m_data.chargeTypeId;
aiv.effectStart = toMSec(m_data.effectStart);
ddsVecFromPoly(poly, aiv.form);
aiv.boundingBoxBottomLeft = Core::GeoPosition2D(bounds.bottomLeft().x(), bounds.bottomLeft().y());
aiv.boundingBoxTopRight = Core::GeoPosition2D(bounds.topRight().x(), bounds.topRight().y());
aiv.aesTypeId = AesType::AtFunctionalArea;
aiv.effectStateId = effectState();
aiv.id = 1000 * m_data.id + static_cast<int>(AesType::AtFunctionalArea);
if (m_data.partyId != 0)
aiv.partyId(m_data.partyId);
aiv.partyId = m_data.partyId;
checkIsCentralAndPublish(aiv.form(), m_aiv.form(), m_data.isCentral);
checkIsCentralAndPublish(aiv.form, m_aiv.form, m_data.isCentral);
if (aiv != m_aiv)
{
aiv.sampleTime(partitionTimeMSec());
aiv.sampleTime = partitionTimeMSec();
m_aiv = aiv;
m_mainHandler->dds()->dts()->publish(aiv);
emit newAiv(aiv);
@@ -225,7 +225,7 @@ void ObjectFunctionalArea::removeTopics()
{
auto dts = m_mainHandler->dds()->dts();
dts->removeFunctionalAreaByKey(m_data.id);
dts->removeAesItemViewByKey(1000 * m_data.id + AesType::AtFunctionalArea);
dts->removeAesItemViewByKey(1000 * m_data.id + static_cast<int>(AesType::AtFunctionalArea));
emit removeAiv(m_data.id);
}
@@ -237,7 +237,7 @@ QPolygonF ObjectFunctionalArea::generateForm()
QPointF ObjectFunctionalArea::geographic2Utm(const Core::GeoPosition2D &geoPos, int *zone)
{
const int zoneToUse = zone ? *zone : -1;
auto utm = LtsCoordTrans::UtmCoordinate::fromGeographic(geoPos.lon(), geoPos.lat(), zoneToUse);
auto utm = LtsCoordTrans::UtmCoordinate::fromGeographic(geoPos.lon, geoPos.lat, zoneToUse);
if (zone)
*zone = utm.zone;
return QPointF(utm.x, utm.y);
@@ -247,10 +247,10 @@ QPointF ObjectFunctionalArea::geographic2Utm(const Core::GeoPosition2D &geoPos,
void ObjectFunctionalArea::onParticipantPositionChanged(const ParticipantManagement::ParticipantPosition &data, DataModification modType)
{
if (modType != DataModification::eRemoved && (data.participantId() == m_data.participantId))
if (modType != DataModification::eRemoved && (data.participantId == m_data.participantId))
{
DEBUG_LOG(m_logger) << " onParticipantPositionChanged....."
<< " participantId=" << data.participantId()
<< " participantId=" << data.participantId
<< " aesId=" << m_data.id
<< " suppyParticipantId=" << m_data.participantId;
DEBUG_LOG(m_logger) << "Supply Truck: onParticipantPositionChanged: " << data;
@@ -258,10 +258,10 @@ void ObjectFunctionalArea::onParticipantPositionChanged(const ParticipantManagem
{
int zone = -1;
DEBUG_LOG(m_logger) << "New Supply Truck Position participantId: " << data.participantId()
<< " pos: lat=" << data.pos().lat() << " lon=" << data.pos().lon();
DEBUG_LOG(m_logger) << "New Supply Truck Position participantId: " << data.participantId
<< " pos: lat=" << data.pos.lat << " lon=" << data.pos.lon;
const QPointF participantPosUtmPoint = geographic2Utm(data.pos(), &zone);
const QPointF participantPosUtmPoint = geographic2Utm(data.pos, &zone);
DEBUG_LOG(m_logger) << "participantPosUtmPoint=" << participantPosUtmPoint.x() << "/" << participantPosUtmPoint.y()
<< " zone=" << zone;
@@ -275,7 +275,7 @@ void ObjectFunctionalArea::onParticipantPositionChanged(const ParticipantManagem
//double squareDistance = LtsCoordTrans::squareDistance(participantPosUtmPoint, activationPosUtmPoint);
const double distanceSquared = LtsCoordTrans::squareDistance(data.pos().lon(), data.pos().lat(), m_activatePos.lon(), m_activatePos.lat());
const double distanceSquared = LtsCoordTrans::squareDistance(data.pos.lon, data.pos.lat, m_activatePos.lon, m_activatePos.lat);
DEBUG_LOG(m_logger) << "squareDistance=" << distanceSquared
<< " distance = " << sqrt(distanceSquared)
<< " getMaximumStepLengthStanding=" << Settings::getMaximumStepLengthStanding();
@@ -299,23 +299,23 @@ void ObjectFunctionalArea::onParticipantPositionChanged(const ParticipantManagem
}
}
}
m_data.position.setX(data.pos().lon());
m_data.position.setY(data.pos().lat());
m_data.partyId = data.partyId();
m_data.position.setX(data.pos.lon);
m_data.position.setY(data.pos.lat);
m_data.partyId = data.partyId;
m_data.isCentral = true;
m_dataAesFunctionalArea.position.setX(data.pos().lon());
m_dataAesFunctionalArea.position.setY(data.pos().lat());
m_dataAesFunctionalArea.partyId = data.partyId();
m_dataAesFunctionalArea.position.setX(data.pos.lon);
m_dataAesFunctionalArea.position.setY(data.pos.lat);
m_dataAesFunctionalArea.partyId = data.partyId;
m_dataAesFunctionalArea.isCentral = true;
{
int zone = -1;
const QPointF participantPosUtmPoint = geographic2Utm(data.pos(), &zone);
const QPointF participantPosUtmPoint = geographic2Utm(data.pos, &zone);
QPointF utmPointShift;
utmPointShift.setX(participantPosUtmPoint.x() - m_dataAesFunctionalArea.length / 2);
utmPointShift.setY(participantPosUtmPoint.y() - m_dataAesFunctionalArea.width / 2);
DEBUG_LOG(m_logger) << "data.pos=" << data.pos()
DEBUG_LOG(m_logger) << "data.pos=" << data.pos
<< " participantPosUtmPoint=" << participantPosUtmPoint.x() << "/" << participantPosUtmPoint.y()
<< " utmPointShift=" << utmPointShift.x() << "/" << utmPointShift.y()
<< " length=" << m_dataAesFunctionalArea.length
@@ -330,8 +330,8 @@ void ObjectFunctionalArea::onParticipantPositionChanged(const ParticipantManagem
QPointF point = utm.geographic();
m_activatePos.lon(point.x());
m_activatePos.lat(point.y());
m_activatePos.lon = point.x();
m_activatePos.lat = point.y();
m_dataAesFunctionalArea.position.setX(point.x());
m_dataAesFunctionalArea.position.setY(point.y());
m_data.position.setX(point.x());
@@ -361,7 +361,7 @@ void ObjectFunctionalArea::myTimerSlot()
// m_activePosAvailable = false;
m_data.effectStateId = AesEffectState::EsActivated;
m_dataAesFunctionalArea.effectStateId = AesEffectState::EsActivated;
DEBUG_LOG(m_logger) << "TimerSlot Setze Supply-Truck active aesItemId=" << m_aiv.aesItemId()
DEBUG_LOG(m_logger) << "TimerSlot Setze Supply-Truck active aesItemId=" << m_aiv.aesItemId
<< " participantId=" << m_data.participantId
<< " effectStateId=" << m_data.effectStateId;
DEBUG_LOG(m_logger) << "onParticipantPositionChanged: Vor updateObject";