Adds immediate migration results

This commit is contained in:
torsten committed 2026-08-18 22:12:24 +02:00
1 parent ba4121728b
commit 6a2a0667ab
2395 files changed
+357322 -2524

No files matched your search

@@ -57,7 +57,7 @@ NGL_TARGET_LINK_LIBRARIES(svcOssCommon
PRIVATE
RTI::nddscpp2
PUBLIC
Qt5::Core
Qt6::Core
svcMsgCommon
ngldb
ddscore
@@ -164,7 +164,7 @@ CODEGEN_SQL(SRCS_exe ${xml_FILE})
NGL_ADD_SVC_ICON(SRCS_exe)
NGL_ADD_EXECUTABLE(AAR SV svcOcSituationServer ${SRCS_exe})
NGL_TARGET_LINK_LIBRARIES(svcOcSituationServer
Qt5::Core
Qt6::Core
svcOssCommon
svcOssServer
svcCoreClient
@@ -7,6 +7,7 @@
*/
#include "central_aes_data_builder.h"
#include <utility>
#include "LtsUtils/LtsUtilsCore/qbytearray_byteaccess.h"
#include "QLineF"
@@ -455,7 +456,7 @@ void addSegments(QByteArray &buf, const std::vector<AreaEffectSimulation::MineSe
AreaEffectSimulation::MineSegment lastSeg;
for (const AreaEffectSimulation::MineSegment &currentMineSegment : qAsConst(segments))
for (const AreaEffectSimulation::MineSegment &currentMineSegment : std::as_const(segments))
{
addPosition2D(buf, currentMineSegment.positionStart());
lastSeg = currentMineSegment;
@@ -7,6 +7,7 @@
*/
#include "handler_oc_aes_data.h"
#include <utility>
#include <functional>
#include <QByteArray>
@@ -61,7 +62,7 @@ bool HandlerOcAesData::init()
return false;
}
for (const auto &data : qAsConst(dataVec))
for (const auto &data : std::as_const(dataVec))
{
switch (data.aesTypeId)
{
@@ -199,7 +200,7 @@ void HandlerOcAesData::sendIedPositions()
LtsUtils::set1Byte(OcSituation::AesType::IedPositions, data);
LtsUtils::set1Byte(cnt, data);
for (const auto &pos : qAsConst(m_iedPositionsToBeSend))
for (const auto &pos : std::as_const(m_iedPositionsToBeSend))
{
LtsUtils::set2Byte(m_gimDtc->ied(pos.id()).equipmentNumber(), data);
const QPointF relCoord(m_positionConverter->relativeFromGeographic(pos.position()));
@@ -252,7 +253,7 @@ void HandlerOcAesData::collectionTimeout(OcSituation::AesType type, const std::f
if (m_demandingEquipments[type].size() > 5)
sendFunction(0); // broadcast
else
for (int eqNumber : qAsConst(m_demandingEquipments[type]))
for (int eqNumber : std::as_const(m_demandingEquipments[type]))
sendFunction(eqNumber);
//cleanup
@@ -7,6 +7,7 @@
*/
#include "handler_oc_central_aes_data.h"
#include <utility>
#include <LtsCoordTrans/lts_coord_trans.h>
#include <LtsUtilsCore/qbytearray_byteaccess.h>
@@ -472,7 +473,7 @@ void HandlerOcCentralAesData::handleSituation()
QMultiMap<qreal, qint32> distances;
for (qint32 currentAesItemId : qAsConst(m_aesItemsInRange))
for (qint32 currentAesItemId : std::as_const(m_aesItemsInRange))
{
qreal distance = calculateDistanceToCircleCenter(currentAesItemId);
@@ -638,7 +639,7 @@ QPolygonF HandlerOcCentralAesData::polygonFromForm(const std::vector<Core::GeoPo
QPolygonF result;
result.reserve(form.size());
for (const Core::GeoPosition &currentPosition : qAsConst(form))
for (const Core::GeoPosition &currentPosition : std::as_const(form))
result.append(PositionConverter::relativeFromGeographic({currentPosition.lon(), currentPosition.lat()}, m_baseCoordinate));
return result;
@@ -700,7 +701,7 @@ void HandlerOcCentralAesData::removeKickedOutAesItems(const QSet<qint32> &aesIte
AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::inner_enum::AtUnknown;
for (qint32 currentAesItemId : qAsConst(kickedOutAesItems))
for (qint32 currentAesItemId : std::as_const(kickedOutAesItems))
{
if (m_allCentralAesItemViews.contains(currentAesItemId))
aesType = m_allCentralAesItemViews.value(currentAesItemId).aesTypeId();
@@ -7,6 +7,7 @@
*/
#include "handler_oc_situation_data.h"
#include <utility>
#include <LtsCoordTrans/lts_coord_trans.h>
#include <LtsUtilsCore/qbytearray_byteaccess.h>
@@ -183,7 +184,7 @@ void HandlerOcSituationData::setRequestOcSituationData(OcSituation::SituationCen
if (m_centerEquipmentId > 0)
{
ParticipantManagement::Participant centerParticipant;
for (const auto &participant : qAsConst(m_allParticipants))
for (const auto &participant : std::as_const(m_allParticipants))
{
if (participant.equipmentNumber().is_set() && participant.equipmentNumber().get() == m_centerEquipmentId)
{
@@ -433,7 +434,7 @@ void HandlerOcSituationData::onAesItemViewChanged(const AreaEffectSimulation::Ae
void HandlerOcSituationData::onDusMineStateChanged(const AreaEffectSimulation::DusMineState &/*data*/, DataModification /*modType*/)
{
auto copy = m_dynamicParticpantData;
for (const ParticipantManagement::DynamicParticipantData &dynPartData : qAsConst(copy))
for (const ParticipantManagement::DynamicParticipantData &dynPartData : std::as_const(copy))
{
if (!m_participantWithMaybeMissingPartyId.contains(dynPartData.participantId()))
continue;
@@ -528,7 +529,7 @@ void HandlerOcSituationData::fetchParticipantsInRange()
QSet<int> curParticipants;
const QHash<int, ParticipantManagement::Participant> oldParticipants = m_participants;
for (const auto &position : qAsConst(m_allParticipantPositions))
for (const auto &position : std::as_const(m_allParticipantPositions))
{
if (!LtsUtils::isPositionTimeOutdated(m_partitionTime, position.sampleTime())) // only if position is not outdated
{
@@ -645,7 +646,7 @@ QVector<QPair<int, float>> HandlerOcSituationData::createPrioQueue() const
QVector<QPair<int, float>> participantsPrioQueue;
participantsPrioQueue.reserve(m_participantsToSend.size());
for (auto participantId : qAsConst(m_participantsToSend))
for (auto participantId : std::as_const(m_participantsToSend))
{
// ignore (currently) outdated players
if (m_outdatedParticipants.contains(participantId))
@@ -691,7 +692,7 @@ QByteArray HandlerOcSituationData::createDataStream(int maxSize,
// first: participants that are not in range any more
DEBUG_LOG(m_logger) << "m_newlyOutdatedParticipants: " << m_newlyOutdatedParticipants.size();
QSet<int> copyOfOutdated = m_newlyOutdatedParticipants;
for (const auto participantId : qAsConst(m_newlyOutdatedParticipants))
for (const auto participantId : std::as_const(m_newlyOutdatedParticipants))
{
addParticipantId(ret, participantId, OcSituation::ModificationFlag::eNone);
copyOfOutdated.remove(participantId);