Adds immediate migration results
This commit is contained in:
2395 files changed
+357322
-2524
No files matched your search
+3
-3
@@ -98,9 +98,9 @@ NGL_TARGET_LINK_LIBRARIES(svcHighLevelArchitecture
|
||||
nglcoreapplication
|
||||
NGLLogger
|
||||
nglsettings
|
||||
Qt5::Core
|
||||
Qt5::Network
|
||||
Qt5::WebSockets
|
||||
Qt6::Core
|
||||
Qt6::Network
|
||||
Qt6::WebSockets
|
||||
svcAesClient
|
||||
svcCoreClient
|
||||
svcExmClient
|
||||
|
||||
+4
-3
@@ -3,6 +3,7 @@
|
||||
|
||||
|
||||
#include "ngs_connector.h"
|
||||
#include <utility>
|
||||
#include "ngs_handler.h"
|
||||
#include "ppm_handler.h"
|
||||
#include "damage_model.h"
|
||||
@@ -354,7 +355,7 @@ void NgsConnector::unsubscribeFromNgs()
|
||||
rpr2::IObserverWeaponFireIntClass &wf = m_somPlayer->getObserverWeaponFireIntClass(*m_iaWeaponFireCallback);
|
||||
wf.unsubscribe();
|
||||
}
|
||||
for (rpr2::IPlayerBaseEntityObjInstance *player : qAsConst(m_playerMap))
|
||||
for (rpr2::IPlayerBaseEntityObjInstance *player : std::as_const(m_playerMap))
|
||||
player->deleteObjectInstance(getSimTime());
|
||||
|
||||
m_playerMap.clear();
|
||||
@@ -959,7 +960,7 @@ QPolygonF NgsConnector::utmToGeogrphic(const QPolygonF &polyUtm, const LtsCoordT
|
||||
{
|
||||
QPolygonF poly;
|
||||
poly.reserve(polyUtm.size());
|
||||
for (const QPointF &point : qAsConst(polyUtm))
|
||||
for (const QPointF &point : std::as_const(polyUtm))
|
||||
poly << base.geographic(point);
|
||||
return poly;
|
||||
}
|
||||
@@ -1459,7 +1460,7 @@ void NgsConnector::onNewEventReport(const rpr2::IObserverEventReportIntInstance
|
||||
vecGears.reserve(gears.size());
|
||||
|
||||
QString gearsString;
|
||||
for (const auto &gear : qAsConst(gears))
|
||||
for (const auto &gear : std::as_const(gears))
|
||||
{
|
||||
vecGears.push_back(gear);
|
||||
gearsString.append(tr("[GearId: %1, GearTypeId; %2] ").arg(gear.gearId()).arg(gear.gearTypeId()));
|
||||
|
||||
+2
-1
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "ngs_handler.h"
|
||||
#include <utility>
|
||||
#include <Common/logger.h>
|
||||
#include "ngs_connector.h"
|
||||
#include "socketreader.h"
|
||||
@@ -100,7 +101,7 @@ void NgsHandler::initSocketReaders()
|
||||
|
||||
void NgsHandler::deInitSocketReaders()
|
||||
{
|
||||
for (SocketReader *sr : qAsConst(m_socketReaders))
|
||||
for (SocketReader *sr : std::as_const(m_socketReaders))
|
||||
sr->stopThread();
|
||||
m_socketReaders.clear();
|
||||
}
|
||||
|
||||
+7
-6
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "ppm_handler.h"
|
||||
#include <utility>
|
||||
#include "ngs_handler.h"
|
||||
#include <Common/participantinformation.h>
|
||||
|
||||
@@ -158,7 +159,7 @@ int PpmHandler::getEquipmentNo(int participantId) const
|
||||
|
||||
int PpmHandler::getParticipantIdByExternalId(int externalId) const
|
||||
{
|
||||
for(const auto &part : qAsConst(m_partData))
|
||||
for(const auto &part : std::as_const(m_partData))
|
||||
{
|
||||
if (part.externalId() == externalId)
|
||||
return part.id();
|
||||
@@ -415,7 +416,7 @@ void PpmHandler::startPublishToNgs()
|
||||
|
||||
INFO_LOG(m_logger) << "(Re)Adding all players, size: " << m_partData.size();
|
||||
|
||||
for (const ParticipantManagement::Participant &participant : qAsConst(m_partData))
|
||||
for (const ParticipantManagement::Participant &participant : std::as_const(m_partData))
|
||||
createParticipant(participant);
|
||||
}
|
||||
|
||||
@@ -680,7 +681,7 @@ ProjectDataManagement::ChargeType PpmHandler::chargeTypeFromDisEntity(const std:
|
||||
m_chargeTypes = m_dtcPdm->chargeTypes();
|
||||
}
|
||||
|
||||
for (const auto &item : qAsConst(m_chargeTypes))
|
||||
for (const auto &item : std::as_const(m_chargeTypes))
|
||||
{
|
||||
if (item.disEntity() == disEntity)
|
||||
return item;
|
||||
@@ -696,7 +697,7 @@ ProjectDataManagement::ChargeType PpmHandler::chargeTypeFromTasCodeDirect(int32_
|
||||
m_chargeTypes = m_dtcPdm->chargeTypes();
|
||||
}
|
||||
|
||||
for (const auto &item : qAsConst(m_chargeTypes))
|
||||
for (const auto &item : std::as_const(m_chargeTypes))
|
||||
{
|
||||
if (item.legacyId() == tasCode)
|
||||
return item;
|
||||
@@ -713,7 +714,7 @@ int PpmHandler::gearTypeIdFromChargeTypeId(int chargeTypeId)
|
||||
}
|
||||
|
||||
int gearTypeId = 999999999;
|
||||
for (const auto &item : qAsConst(m_gearTypeChargeTypes))
|
||||
for (const auto &item : std::as_const(m_gearTypeChargeTypes))
|
||||
{
|
||||
if (item.chargeTypeId() == chargeTypeId)
|
||||
if (item.gearTypeId() < gearTypeId)
|
||||
@@ -834,7 +835,7 @@ int PpmHandler::partyIdFromForceIdentifier(rpr2::ForceIdentifierEnum8::ET fi)
|
||||
m_partyData = m_dtcPpm->partys();
|
||||
}
|
||||
|
||||
for (const ParticipantManagement::Party &item : qAsConst(m_partyData))
|
||||
for (const ParticipantManagement::Party &item : std::as_const(m_partyData))
|
||||
{
|
||||
if (fi == getRprForceIdentifierFromPpmForceIdentifier(item.hlaForceIdentifier()))
|
||||
return item.id();
|
||||
|
||||
+3
-2
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "web_socket_handler.h"
|
||||
#include <utility>
|
||||
|
||||
#include "main_handler.h"
|
||||
#include "ngs_handler.h"
|
||||
@@ -24,7 +25,7 @@ WebSocketHandler::WebSocketHandler(int exerciseId, MainHandler *mainHandler, QOb
|
||||
|
||||
WebSocketHandler::~WebSocketHandler()
|
||||
{
|
||||
for (const auto &s : qAsConst(m_webSockets))
|
||||
for (const auto &s : std::as_const(m_webSockets))
|
||||
s->disconnect(this);
|
||||
}
|
||||
|
||||
@@ -54,7 +55,7 @@ bool WebSocketHandler::sendTelegramInternal(const TrainingAreaBase::TetraIcd::Tr
|
||||
DEBUG_LOG(m_logger) << "jsonStr: " << jsonStr;
|
||||
|
||||
bool bOk = false;
|
||||
for (auto wsw : qAsConst(m_webSockets))
|
||||
for (auto wsw : std::as_const(m_webSockets))
|
||||
{
|
||||
if (wsw->sendTextMessage(jsonStr, exerciseId))
|
||||
bOk = true;
|
||||
|
||||
+1
-1
@@ -37,7 +37,7 @@ NGL_TARGET_LINK_LIBRARIES(HlaCommon
|
||||
LtsCoordTrans # ParticipantPosition
|
||||
NGLLogger
|
||||
nglsettings
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
svcPpmClient # ParticipantInformation
|
||||
svcPpmCommon
|
||||
ngltools # NGL::findProjectConfigFiles
|
||||
|
||||
+3
-3
@@ -143,9 +143,9 @@ NGL_TARGET_LINK_LIBRARIES(svcHighLevelArchitecture
|
||||
nglcoreapplication
|
||||
NGLLogger
|
||||
nglsettings
|
||||
Qt5::Core
|
||||
Qt5::Network
|
||||
Qt5::WebSockets
|
||||
Qt6::Core
|
||||
Qt6::Network
|
||||
Qt6::WebSockets
|
||||
svcAesClient
|
||||
svcCoreClient
|
||||
svcExmClient
|
||||
|
||||
+2
-1
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "aes_handler.h"
|
||||
#include <utility>
|
||||
#include "ngs_handler.h"
|
||||
#include <Common/participantposition.h>
|
||||
|
||||
@@ -320,7 +321,7 @@ void AesHandler::onEffectsChanged(const Effects &data, DataModification modType)
|
||||
|
||||
|
||||
int curSeIndex = -1;
|
||||
for (const AreaEffectSimulation::SingleEffect &se : qAsConst(singleEffectsRef))
|
||||
for (const AreaEffectSimulation::SingleEffect &se : std::as_const(singleEffectsRef))
|
||||
{
|
||||
++curSeIndex;
|
||||
|
||||
|
||||
+4
-3
@@ -3,6 +3,7 @@
|
||||
|
||||
|
||||
#include "ngs_connector.h"
|
||||
#include <utility>
|
||||
#include "ngs_handler.h"
|
||||
#include "ppm_handler.h"
|
||||
#include "damage_model.h"
|
||||
@@ -376,12 +377,12 @@ void NgsConnector::unsubscribeFromNgs()
|
||||
minefieldBreachObjClass.unsubscribe();
|
||||
}
|
||||
|
||||
for (rpr2::IPlayerBaseEntityObjInstance *player : qAsConst(m_playerMap))
|
||||
for (rpr2::IPlayerBaseEntityObjInstance *player : std::as_const(m_playerMap))
|
||||
player->deleteObjectInstance(getSimTime());
|
||||
|
||||
m_playerMap.clear();
|
||||
|
||||
for (rpr2::IPlayerEnvironmentObjectObjInstance *environmentObject : qAsConst(m_environmentObjects))
|
||||
for (rpr2::IPlayerEnvironmentObjectObjInstance *environmentObject : std::as_const(m_environmentObjects))
|
||||
environmentObject->deleteObjectInstance(getSimTime());
|
||||
|
||||
m_environmentObjects.clear();
|
||||
@@ -1654,7 +1655,7 @@ QPolygonF NgsConnector::utmToGeogrphic(const QPolygonF &polyUtm, const LtsCoordT
|
||||
{
|
||||
QPolygonF poly;
|
||||
poly.reserve(polyUtm.size());
|
||||
for (const QPointF &point : qAsConst(polyUtm))
|
||||
for (const QPointF &point : std::as_const(polyUtm))
|
||||
poly << base.geographic(point);
|
||||
return poly;
|
||||
}
|
||||
|
||||
+5
-4
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "ppm_handler.h"
|
||||
#include <utility>
|
||||
#include "ngs_handler.h"
|
||||
#include <Common/participantinformation.h>
|
||||
|
||||
@@ -162,7 +163,7 @@ int PpmHandler::getEquipmentNo(int participantId) const
|
||||
|
||||
int PpmHandler::getParticipantIdByExternalId(int externalId) const
|
||||
{
|
||||
for(const auto &part : qAsConst(m_partData))
|
||||
for(const auto &part : std::as_const(m_partData))
|
||||
{
|
||||
if (part.externalId() == externalId)
|
||||
return part.id();
|
||||
@@ -457,7 +458,7 @@ void PpmHandler::startPublishToNgs()
|
||||
|
||||
INFO_LOG(m_logger) << "(Re)Adding all players, size: " << m_partData.size();
|
||||
|
||||
for (const ParticipantManagement::Participant &participant : qAsConst(m_partData))
|
||||
for (const ParticipantManagement::Participant &participant : std::as_const(m_partData))
|
||||
createParticipant(participant);
|
||||
}
|
||||
|
||||
@@ -649,7 +650,7 @@ ProjectDataManagement::ChargeType PpmHandler::chargeTypeFromDisEntity(const std:
|
||||
m_dtcPdm = nullptr;
|
||||
}
|
||||
|
||||
for (const auto &item : qAsConst(m_chargeTypes))
|
||||
for (const auto &item : std::as_const(m_chargeTypes))
|
||||
{
|
||||
if (item.disEntity() == disEntity)
|
||||
return item;
|
||||
@@ -766,7 +767,7 @@ int PpmHandler::partyIdFromForceIdentifier(rpr2::ForceIdentifierEnum8::ET fi)
|
||||
m_partyData = m_dtcPpm->partys();
|
||||
}
|
||||
|
||||
for (const ParticipantManagement::Party &item : qAsConst(m_partyData))
|
||||
for (const ParticipantManagement::Party &item : std::as_const(m_partyData))
|
||||
{
|
||||
if (fi == getRprForceIdentifierFromPpmForceIdentifier(item.hlaForceIdentifier()))
|
||||
return item.id();
|
||||
|
||||
+3
-2
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "web_socket_handler.h"
|
||||
#include <utility>
|
||||
|
||||
#include "main_handler.h"
|
||||
#include "ngs_handler.h"
|
||||
@@ -24,7 +25,7 @@ WebSocketHandler::WebSocketHandler(int exerciseId, MainHandler *mainHandler, QOb
|
||||
|
||||
WebSocketHandler::~WebSocketHandler()
|
||||
{
|
||||
for (const auto &s : qAsConst(m_webSockets))
|
||||
for (const auto &s : std::as_const(m_webSockets))
|
||||
s->disconnect(this);
|
||||
}
|
||||
|
||||
@@ -54,7 +55,7 @@ bool WebSocketHandler::sendTelegramInternal(const TrainingAreaBase::TetraIcd::Tr
|
||||
DEBUG_LOG(m_logger) << "jsonStr: " << jsonStr;
|
||||
|
||||
bool bOk = false;
|
||||
for (const auto &wsw : qAsConst(m_webSockets))
|
||||
for (const auto &wsw : std::as_const(m_webSockets))
|
||||
{
|
||||
if (wsw->sendTextMessage(jsonStr, exerciseId))
|
||||
bOk = true;
|
||||
|
||||
+4
-4
@@ -101,10 +101,10 @@ NGL_TARGET_LINK_LIBRARIES(hlaTestTool
|
||||
nglcoreapplication
|
||||
NGLLogger
|
||||
nglsettings
|
||||
Qt5::Core
|
||||
Qt5::Gui
|
||||
Qt5::Network
|
||||
Qt5::WebSockets
|
||||
Qt6::Core
|
||||
Qt6::Gui
|
||||
Qt6::Network
|
||||
Qt6::WebSockets
|
||||
ngltools
|
||||
# LtsUtilsDds
|
||||
NGS::NGS
|
||||
|
||||
+4
-3
@@ -3,6 +3,7 @@
|
||||
|
||||
|
||||
#include "ngs_connector.h"
|
||||
#include <utility>
|
||||
#include "ngs_handler.h"
|
||||
#include "damage_model.h"
|
||||
#include <Common/settings.h>
|
||||
@@ -372,12 +373,12 @@ void NgsConnector::unsubscribeFromNgs()
|
||||
minefieldBreachObjClass.unsubscribe();
|
||||
}
|
||||
|
||||
for (rpr2::IPlayerBaseEntityObjInstance *player : qAsConst(m_playerMap))
|
||||
for (rpr2::IPlayerBaseEntityObjInstance *player : std::as_const(m_playerMap))
|
||||
player->deleteObjectInstance(getSimTime());
|
||||
|
||||
m_playerMap.clear();
|
||||
|
||||
for (rpr2::IPlayerEnvironmentObjectObjInstance *environmentObject : qAsConst(m_environmentObjects))
|
||||
for (rpr2::IPlayerEnvironmentObjectObjInstance *environmentObject : std::as_const(m_environmentObjects))
|
||||
environmentObject->deleteObjectInstance(getSimTime());
|
||||
|
||||
m_environmentObjects.clear();
|
||||
@@ -1308,7 +1309,7 @@ QPolygonF NgsConnector::utmToGeogrphic(const QPolygonF &polyUtm, const LtsCoordT
|
||||
{
|
||||
QPolygonF poly;
|
||||
poly.reserve(polyUtm.size());
|
||||
for (const QPointF &point : qAsConst(polyUtm))
|
||||
for (const QPointF &point : std::as_const(polyUtm))
|
||||
poly << base.geographic(point);
|
||||
return poly;
|
||||
}
|
||||
|
||||
+2
-1
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "ngs_handler.h"
|
||||
#include <utility>
|
||||
#include "ngs_connector.h"
|
||||
#include "web_socket_interface.h"
|
||||
#include "ws_telegrams.h"
|
||||
@@ -31,7 +32,7 @@ WsInterface::WsInterface(std::shared_ptr<NgsHandler> ngsHandler, QObject *parent
|
||||
WsInterface::~WsInterface()
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
|
||||
for (auto client : qAsConst(m_clients))
|
||||
for (auto client : std::as_const(m_clients))
|
||||
{
|
||||
client->disconnect(this);
|
||||
client->close();
|
||||
|
||||
Reference in new issue
Block a user