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

Migrates EffectShow and AssetManagement to generated rtiddsgen API

Browse Source 
Converts accessor calls to plain member access across esc and asm services.
This commit is contained in:
berrux-dev committed 2026-09-21 02:46:24 +02:00
1 parent a09979afdd
commit bdb2461737
39 files changed
+818 -818
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_mine_area.cpp
+21 -21
View File
@@ -28,11 +28,11 @@ Database::EsmEffectShow EffectShowMineArea::getEffectShow()
Database::EsmEffectShow esmEffectShow;
esmEffectShow.id = 0;
esmEffectShow.name = QLatin1String("MIN");
esmEffectShow.startTime = m_mineArea.effectStart().is_set() ? m_mineArea.effectStart().get() : 0;
esmEffectShow.duration = m_mineArea.effectDuration();
esmEffectShow.startTime = m_mineArea.effectStart.is_set() ? m_mineArea.effectStart.get() : 0;
esmEffectShow.duration = m_mineArea.effectDuration;
esmEffectShow.centerPosition = m_centerPos.geographic();
esmEffectShow.idAreaEffectSimulation = m_mineArea.id();
esmEffectShow.nameAreaEfffectSimulation = QString::fromStdString(m_mineArea.name());
esmEffectShow.idAreaEffectSimulation = m_mineArea.id;
esmEffectShow.nameAreaEfffectSimulation = QString::fromStdString(m_mineArea.name);
esmEffectShow.esmParticipantId = -1;
esmEffectShow.numOfVolley = 1; //Hardcode??
esmEffectShow.shotsPerVolley = 18;
@@ -43,10 +43,10 @@ Database::EsmEffectShow EffectShowMineArea::getEffectShow()
updateEffectShow(esmEffectShow);
for (const auto &seg : m_mineArea.segments())
for (const auto &seg : m_mineArea.segments)
{
const Core::GeoPosition2D &posGeo = seg.positionStart();
LtsCoordTrans::UtmCoordinate pos = LtsCoordTrans::UtmCoordinate::fromGeographic(posGeo.lon(), posGeo.lat(), m_utmZone);
const Core::GeoPosition2D &posGeo = seg.positionStart;
LtsCoordTrans::UtmCoordinate pos = LtsCoordTrans::UtmCoordinate::fromGeographic(posGeo.lon, posGeo.lat, m_utmZone);
DEBUG_LOG(m_logger) << "Start Pos Segm.: " << pos.mgrs();
}
DEBUG_LOG(m_logger) << "Center Pos Effect Show: " << LtsCoordTrans::mgrsFromGeographic(esmEffectShow.centerPosition.x(), esmEffectShow.centerPosition.y());
@@ -55,27 +55,27 @@ Database::EsmEffectShow EffectShowMineArea::getEffectShow()
//-----------------------------------------------------------------------------
void EffectShowMineArea::updateEffectShow(Database::EsmEffectShow &data)
{
data.nameAreaEfffectSimulation = QString::fromStdString(m_mineArea.name());
data.duration = m_mineArea.effectDuration() / 10;
data.nameAreaEfffectSimulation = QString::fromStdString(m_mineArea.name);
data.duration = m_mineArea.effectDuration / 10;
if (data.duration > (3600 * 1000))
data.duration = 3600 * 1000;
if (m_mineArea.effectStart().is_set())
data.startTime = m_mineArea.effectStart().get() + m_mineArea.effectDuration() - data.duration;
if (m_mineArea.effectStart.is_set())
data.startTime = m_mineArea.effectStart.get() + m_mineArea.effectDuration - data.duration;
else
data.startTime = 0;
data.typeOfAmmunition = m_mineArea.chargeStruct().chargeTypeId();
data.typeOfAmmunition = m_mineArea.chargeStruct.chargeTypeId;
}
//-----------------------------------------------------------------------------
void EffectShowMineArea::calculatePositions()
{
// start position of the segment
Core::GeoPosition2D geoPosStart = m_segment.positionStart();
Core::GeoPosition2D geoPosEnd = m_segment.positionEnd();
LtsCoordTrans::UtmCoordinate startPositionUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(geoPosStart.lon(), geoPosStart.lat(), m_utmZone);
Core::GeoPosition2D geoPosStart = m_segment.positionStart;
Core::GeoPosition2D geoPosEnd = m_segment.positionEnd;
LtsCoordTrans::UtmCoordinate startPositionUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(geoPosStart.lon, geoPosStart.lat, m_utmZone);
if (m_utmZone == -1)
m_utmZone = startPositionUtm.zone;
LtsCoordTrans::UtmCoordinate endPositionUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(geoPosEnd.lon(), geoPosEnd.lat(), m_utmZone);
LtsCoordTrans::UtmCoordinate endPositionUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(geoPosEnd.lon, geoPosEnd.lat, m_utmZone);
const QLineF line({startPositionUtm.x, startPositionUtm.y}, {endPositionUtm.x, endPositionUtm.y});
// length/2 of the segment
@@ -99,11 +99,11 @@ void EffectShowMineArea::calculatePositions()
//-----------------------------------------------------------------------------
int EffectShowMineArea::getEffectAreaWidth() const
{
Core::GeoPosition2D geoPosStart = m_segment.positionStart();
Core::GeoPosition2D geoPosEnd = m_segment.positionEnd();
Core::GeoPosition2D geoPosStart = m_segment.positionStart;
Core::GeoPosition2D geoPosEnd = m_segment.positionEnd;
LtsCoordTrans::UtmCoordinate startPositionUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(geoPosStart.lon(), geoPosStart.lat(), m_utmZone);
LtsCoordTrans::UtmCoordinate endPositionUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(geoPosEnd.lon(), geoPosEnd.lat(), m_utmZone);
LtsCoordTrans::UtmCoordinate startPositionUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(geoPosStart.lon, geoPosStart.lat, m_utmZone);
LtsCoordTrans::UtmCoordinate endPositionUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(geoPosEnd.lon, geoPosEnd.lat, m_utmZone);
const QLineF line({startPositionUtm.x, startPositionUtm.y}, {endPositionUtm.x, endPositionUtm.y});
int segmentLength = line.length();
@@ -114,7 +114,7 @@ int EffectShowMineArea::getEffectAreaWidth() const
//-----------------------------------------------------------------------------
int EffectShowMineArea::getEffectAreaDepth() const
{
int segmentWidth = qRound(m_mineArea.width());
int segmentWidth = qRound(m_mineArea.width);
if (segmentWidth <= 50) return 50;
if (segmentWidth >= 300) return 300;
return (((segmentWidth + 25) / 50) * 50);