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

@@ -81,9 +81,9 @@ NGL_TARGET_LINK_LIBRARIES(svcAesCommon
RTI::nddscpp2
LtsCoordTrans
PUBLIC
Qt5::Core
Qt5::Gui
Qt5::Xml
Qt6::Core
Qt6::Gui
Qt6::Xml
ddscore
svcPdmCommon
svcPpmCommon
@@ -177,7 +177,7 @@ IF (TARGET aesRecordReplayPlugin)
RecordReplay/aes_record_replay_plugin_custom.h
)
TARGET_LINK_LIBRARIES(aesRecordReplayPlugin
Qt5::Concurrent
Qt6::Concurrent
svcAesServer
svcAesClient
)
@@ -329,8 +329,8 @@ NGL_TARGET_LINK_LIBRARIES(svcAreaEffectSimulation
svcIsmClient
svcExmClient
svcAsmClient
Qt5::Core
Qt5::Gui # QVector3D
Qt6::Core
Qt6::Gui # QVector3D
RTI::nddscpp2
nglsettings
ProjectConfig
@@ -360,8 +360,8 @@ MACRO(ADD_FT_TEST type)
ModuleTests/aes_test_base.h
)
NGL_TARGET_LINK_LIBRARIES(aes_test_base
Qt5::Core
Qt5::Test
Qt6::Core
Qt6::Test
ddsconnector
LtsCommandLineParser
nglcoreapplication
@@ -403,13 +403,12 @@ NGL_ADD_EXECUTABLE(AAR SV NO_TRANSLATION aes_utils_test
)
NGL_TARGET_LINK_LIBRARIES(aes_utils_test
Qt5::Core
Qt5::Widgets
Qt6::Core
Qt6::Widgets
RTI::nddscpp2
svcAesCommon
ProjectConfig
ddsconnector
nglapplication
LtsCoordTrans
)
NGL_INSTALL(AAR SV TARGETS aes_utils_test DESTINATION bin/test)
@@ -422,8 +421,8 @@ NGL_ADD_EXECUTABLE(SV NO_TRANSLATION aes_convert_mine_area
)
NGL_TARGET_LINK_LIBRARIES(aes_convert_mine_area
Qt5::Core
# Qt5::Widgets
Qt6::Core
# Qt6::Widgets
# RTI::nddscpp2
svcAesServer
ProjectConfig
@@ -7,6 +7,7 @@
*/
#include "abstract_firing_strategy.h"
#include <utility>
#include "object_effector.h"
#include "main_handler.h"
@@ -87,7 +88,7 @@ std::vector<Core::GeoPositionRelativeTime> AbstractFiringStrategy::buildTrajecto
geometry.reserve(relativeTrajectory.size());
// Aehnlich wie Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/aes_handler.cpp Zeile 365
for (const TrajectoryPoint &trajPntRelPos : qAsConst(relativeTrajectory))
for (const TrajectoryPoint &trajPntRelPos : std::as_const(relativeTrajectory))
{
DEBUG_LOG(m_logger) << "Flugbahnpunkt: trajPntRelPos :" << trajPntRelPos; // benefit from operator<<:
@@ -187,7 +188,7 @@ int32_t AbstractFiringStrategy::gearTypeId(int chargeTypeId, int participantId)
DEBUG_LOG(m_logger) << "gearSize " << dynamicParticipantData.gear().size();
const auto& participantData_gear = dynamicParticipantData.gear();
for (const auto &gear : qAsConst(participantData_gear))
for (const auto &gear : std::as_const(participantData_gear))
{
DEBUG_LOG(m_logger) << "gear.chargeTypeId(): " << gear.chargeTypeId() << ", chargeTypeId:" << chargeTypeId;
if (gear.chargeTypeId() == chargeTypeId)
@@ -7,6 +7,7 @@
*/
#include "dm72_firing_strategy.h"
#include <utility>
#include "main_handler.h"
#include "object_effector.h"
@@ -72,7 +73,7 @@ void Dm72FiringStrategy::init()
QVector<UtmWithHeight> tempUtmTreffpunkte;
tempUtmTreffpunkte.reserve(wirkmittel.geschoss.anzahl);
for (const Treffpunkt &treffpunkt : qAsConst(wirkmittel.treffpunkte))
for (const Treffpunkt &treffpunkt : std::as_const(wirkmittel.treffpunkte))
{
const UtmCoordinate utmTreffpunkt = UtmCoordinate::fromGeographic(treffpunkt.koordinate.koordinate.longitude * deg2rad(),
treffpunkt.koordinate.koordinate.latitude * deg2rad(),
@@ -7,6 +7,7 @@
*/
#include "gmlrs_firing_strategy.h"
#include <utility>
#include "object_effector.h"
#include <TrainingAreaBase/Plugins/AdlerJson/telegrams.h>
@@ -68,7 +69,7 @@ void GmlrsFiringStrategy::init()
WirkmittelFeuerkommandoRakete wirkmittel;
wirkmittelFeuerkommandoRaketeFromJson(properties, wirkmittel, bOk);
for (const Treffpunkt &treffpunkt : qAsConst(wirkmittel.treffpunkte))
for (const Treffpunkt &treffpunkt : std::as_const(wirkmittel.treffpunkte))
{
const LtsCoordTrans::UtmCoordinate utmTreffpunkt =
LtsCoordTrans::UtmCoordinate::fromGeographic(treffpunkt.koordinate.koordinate.longitude * LtsCoordTrans::deg2rad(),
@@ -13,13 +13,19 @@ SET(UnitTestSources
IF(BUILD_TESTING)
ADD_EXECUTABLE(aesModuleTestEffectCluster ${LinkedSources} ${UnitTestSources} )
NGL_TARGET_INCLUDE_DIRECTORIES(aesModuleTestEffectCluster
PUBLIC
${CMAKE_SOURCE_DIR}/Lts/
${CMAKE_SOURCE_DIR}/Lts/Services/
)
TARGET_LINK_LIBRARIES(aesModuleTestEffectCluster
NGLLogger
nglcoreapplication
LtsCommandLineParser
LtsCoordinate
Qt5::Core
Qt5::Test
Qt6::Core
Qt6::Test
ddsconnector
svcAesCommon
svcAesClient
@@ -7,6 +7,7 @@
*/
#include "effect_cluster_module_test.h"
#include <utility>
#include <LtsCoordTrans/lts_coord_trans.h>
#include <nglapplication/nglcoreapplication.h>
@@ -934,7 +935,7 @@ int main(int argc, char *argv[])
--argc;
const QStringList &slPositionalArgs = options.positionalArguments();
for (const QString &item : qAsConst(slPositionalArgs))
for (const QString &item : std::as_const(slPositionalArgs))
std::cout << " item = " << item << std::endl;
ModuleTestEffectCluster tc(options.domainId(), options.exerciseId());
@@ -13,13 +13,19 @@ SET(UnitTestSources
IF(BUILD_TESTING)
ADD_EXECUTABLE(aesModuleTestExplosionCluster ${LinkedSources} ${UnitTestSources} )
NGL_TARGET_INCLUDE_DIRECTORIES(aesModuleTestExplosionCluster
PUBLIC
${CMAKE_SOURCE_DIR}/Lts/
${CMAKE_SOURCE_DIR}/Lts/Services/
)
TARGET_LINK_LIBRARIES(aesModuleTestExplosionCluster
NGLLogger
nglcoreapplication
LtsCommandLineParser
LtsCoordinate
Qt5::Core
Qt5::Test
Qt6::Core
Qt6::Test
ddsconnector
svcAesCommon
svcAesClient
@@ -7,6 +7,7 @@
*/
#include "explosion_cluster_module_test.h"
#include <utility>
#include <nglapplication/nglcoreapplication.h>
#include <LtsCoordTrans/lts_coord_trans.h>
@@ -265,7 +266,7 @@ void ModuleTestExplosionCluster::dumpCnt()
void ModuleTestExplosionCluster::dumpBldgStates()
{
NOTICE_LOG(m_logger) << " m_buildingStateVec.size() = " << m_buildingStateVec.size();
for (const Buildings::BuildingState &bldgState : qAsConst(m_buildingStateVec))
for (const Buildings::BuildingState &bldgState : std::as_const(m_buildingStateVec))
NOTICE_LOG(m_logger) << " bldgState: "
<< ", id = " << bldgState.id()
<< ", damagePercent = " << bldgState.damagePercent()
@@ -336,7 +337,7 @@ bool ModuleTestExplosionCluster::checkBldgStates(const QVector<int> &damagePerce
QVector<int> damagePercentIst;
damagePercentIst.reserve(m_buildingStateVec.size());
for (const Buildings::BuildingState &bldgState : qAsConst(m_buildingStateVec))
for (const Buildings::BuildingState &bldgState : std::as_const(m_buildingStateVec))
damagePercentIst.append(bldgState.damagePercent());
bool same = damagePercentIst == damagePercent;
@@ -935,7 +936,7 @@ void ModuleTestExplosionCluster::resetBldgs()
std::vector<Buildings::Building> buildingsVec;
buildingsVec.reserve(m_bldgIdToName.size());
auto bldgIds = m_bldgIdToName.keys();
for (int bldgId : qAsConst(bldgIds))
for (int bldgId : std::as_const(bldgIds))
buildingsVec.push_back( Buildings::Building(bldgId, {}) );
Buildings::SetBuildingStatesRequest requestData;
@@ -951,7 +952,7 @@ void ModuleTestExplosionCluster::resetBldgs()
QTest::qWait(100);
// check states:
for (int bldgId : qAsConst(bldgIds))
for (int bldgId : std::as_const(bldgIds))
{
const ProjectDataManagement::VulnerabilityState& bldgState = m_bldDtc->buildingState(bldgId).vulnerabilityState();
INFO_LOG(m_logger) << "resetBldgs: bldgId " << bldgId
@@ -1292,7 +1293,7 @@ void ModuleTestExplosionCluster::test_TneVerificationBremen_01()
<< ", m_data.mhPoints().size()=" << m_data.mhPoints().size();
const std::vector<Core::GeoPosition> &formRef = itemView.form();
for (const Core::GeoPosition &geoCoord : qAsConst(formRef))
for (const Core::GeoPosition &geoCoord : std::as_const(formRef))
{
const LtsCoordTrans::UtmCoordinate &utm = LtsCoordTrans::UtmCoordinate::fromGeographic(geoCoord.lon(), geoCoord.lat());
INFO_LOG(m_logger) << " TNE VERIFICATION: CHECK:" << " utm: " << utm.mgrs() << ", item=" << geoCoord;
@@ -1391,7 +1392,7 @@ void ModuleTestExplosionCluster::test_TneVerificationBremen_02()
<< ", m_data.mhPoints().size()=" << m_data.mhPoints().size();
const std::vector<Core::GeoPosition> &formRef = itemView.form();
for (const Core::GeoPosition &geoCoord : qAsConst(formRef))
for (const Core::GeoPosition &geoCoord : std::as_const(formRef))
{
const LtsCoordTrans::UtmCoordinate &utm = LtsCoordTrans::UtmCoordinate::fromGeographic(geoCoord.lon(), geoCoord.lat());
INFO_LOG(m_logger) << " TNE VERIFICATION: CHECK:" << " utm: " << utm.mgrs() << ", item=" << geoCoord;
@@ -2364,7 +2365,7 @@ void ModuleTestExplosionCluster::test_bldg_1104_effects_only()
QVERIFY2(m_counterDds.cntTrajectory == 0, "ERROR, cnt failed!!"); // 4 impacts -> 4 trajectory
std::vector<AreaEffectSimulation::SingleEffect>&singleEffects = m_effects.singleEffects();
for (const AreaEffectSimulation::SingleEffect &se : qAsConst(singleEffects))
for (const AreaEffectSimulation::SingleEffect &se : std::as_const(singleEffects))
{
// Since there is no trajectory, no intersection is calculated.
// Therefore the impacts are on the ground.
@@ -2741,7 +2742,7 @@ int main(int argc, char *argv[])
--argc;
const QStringList &slPositionalArgs = options.positionalArguments();
for (const QString &item : qAsConst(slPositionalArgs))
for (const QString &item : std::as_const(slPositionalArgs))
std::cout << " item = " << item << std::endl;
// enable_create_bulk only if it´s explicitly called by user:
@@ -12,13 +12,19 @@ SET(UnitTestSources
NGL_ADD_EXECUTABLE(SV aesModuleTestLimits ${LinkedSources} ${UnitTestSources} )
NGL_TARGET_INCLUDE_DIRECTORIES(aesModuleTestLimits
PUBLIC
${CMAKE_SOURCE_DIR}/Lts/
${CMAKE_SOURCE_DIR}/Lts/Services/
)
NGL_TARGET_LINK_LIBRARIES(aesModuleTestLimits
NGLLogger
nglcoreapplication
LtsCommandLineParser
LtsCoordTrans
Qt5::Core
Qt5::Test
Qt6::Core
Qt6::Test
ddsconnector
svcAesCommon
svcAesClient
@@ -7,6 +7,7 @@
*/
#include "limits_module_test.h"
#include <utility>
#include "qtestcase.h"
#include <nglapplication/nglcoreapplication.h>
#include <LtsCoordTrans/lts_coord_trans.h>
@@ -71,7 +72,7 @@ void ModuleTestLimits::testExplosionClusterCentral()
int counter = 0;
const auto &items = m_aesDtc->explosionClusters();
for (const auto &item : qAsConst(items))
for (const auto &item : std::as_const(items))
{
if (item.effectStateId() == AesEffectState::EsPrepared && item.isCentral() == true)
++counter;
@@ -104,7 +105,7 @@ void ModuleTestLimits::testExplosionClusterDecentral()
int counter = 0;
const auto &items = m_aesDtc->explosionClusters();
for (const auto &item : qAsConst(items))
for (const auto &item : std::as_const(items))
{
if ((item.effectStateId() == AesEffectState::EsPrepared) && (item.isCentral() == false))
++counter;
@@ -140,7 +141,7 @@ void ModuleTestLimits::testAirSupports()
int counter = 0;
const auto &items = m_aesDtc->explosionClusters();
for (const auto &item : qAsConst(items))
for (const auto &item : std::as_const(items))
{
if (item.effectStateId() == AesEffectState::EsPrepared && item.isCentral() && m_pdmDtc->gearClassFromChargeTypeId(item.chargeStruct().chargeTypeId()) == ProjectDataManagement::GearClass::AirSupport)
++counter;
@@ -173,7 +174,7 @@ void ModuleTestLimits::testMineAreaCentral()
int counter = 0;
const auto &items = m_aesDtc->mineAreas();
for (const auto &item : qAsConst(items))
for (const auto &item : std::as_const(items))
{
if ((item.effectStateId() == AesEffectState::EsPrepared) && (item.isCentral() == true))
++counter;
@@ -207,7 +208,7 @@ void ModuleTestLimits::testMineAreaDecentral()
int counter = 0;
const auto &items = m_aesDtc->mineAreas();
for (const auto &curMineArea : qAsConst(items))
for (const auto &curMineArea : std::as_const(items))
{
if ((curMineArea.effectStateId() == AesEffectState::EsPrepared) && (curMineArea.isCentral() == false))
++counter;
@@ -234,7 +235,7 @@ void ModuleTestLimits::testMineAreaDecentral()
int counter2 = 0;
const auto &mineAreas = m_aesDtc->mineAreas();
for (const auto &item : qAsConst(mineAreas))
for (const auto &item : std::as_const(mineAreas))
{
if ((item.effectStateId() == AesEffectState::EsPrepared) &&
!item.isCentral() &&
@@ -270,7 +271,7 @@ void ModuleTestLimits::testNBCCentral()
int counter = 0;
const auto &items = m_aesDtc->nContaminations();
for (const auto &item : qAsConst(items))
for (const auto &item : std::as_const(items))
{
if (item.effectStateId() == AesEffectState::EsPrepared && item.isCentral() == true)
++counter;
@@ -305,7 +306,7 @@ void ModuleTestLimits::testNBCDecentral()
int counter = 0;
const auto &items = m_aesDtc->nContaminations();
for (const auto &item : qAsConst(items))
for (const auto &item : std::as_const(items))
{
if (item.effectStateId() == AesEffectState::EsPrepared && item.isCentral() == false)
++counter;
@@ -337,7 +338,7 @@ void ModuleTestLimits::testOffRouteMines()
int counter = 0;
const auto &items = m_aesDtc->offRouteMines();
for (const auto &item : qAsConst(items))
for (const auto &item : std::as_const(items))
{
if (item.effectStateId() == AesEffectState::EsPrepared && item.isCentral() == true)
++counter;
@@ -369,7 +370,7 @@ void ModuleTestLimits::testBoobyTraps()
int counter = 0;
const auto &items = m_aesDtc->boobyTraps();
for (const auto &item : qAsConst(items))
for (const auto &item : std::as_const(items))
{
if (item.effectStateId() == AesEffectState::EsPrepared && item.isCentral() == true)
++counter;
@@ -404,7 +405,7 @@ void ModuleTestLimits::testBCCCentral()
int counter = 0;
const auto &items = m_aesDtc->bCContaminations();
for (const auto &item : qAsConst(items))
for (const auto &item : std::as_const(items))
{
if (item.effectStateId() == AesEffectState::EsPrepared && item.isCentral() == true)
++counter;
@@ -439,7 +440,7 @@ void ModuleTestLimits::testBCCDecentral()
int counter = 0;
const auto &items = m_aesDtc->bCContaminations();
for (const auto &item : qAsConst(items))
for (const auto &item : std::as_const(items))
{
if (item.effectStateId() == AesEffectState::EsPrepared && item.isCentral() == false)
++counter;
@@ -474,7 +475,7 @@ void ModuleTestLimits::testFADecentral()
int counter = 0;
const auto &items = m_aesDtc->functionalAreas();
for (const auto &item : qAsConst(items))
for (const auto &item : std::as_const(items))
{
if (item.effectStateId() == AesEffectState::EsPrepared && item.isCentral() == false)
++counter;
@@ -511,7 +512,7 @@ void ModuleTestLimits::testFACentral()
int counter = 0;
const auto &items = m_aesDtc->functionalAreas();
for (const auto &item : qAsConst(items))
for (const auto &item : std::as_const(items))
{
if (item.effectStateId() == AesEffectState::EsPrepared && item.isCentral() == true)
++counter;
@@ -1192,7 +1193,7 @@ void ModuleTestLimits::deleteAesAreas()
const QVector<AesEffectState::type> sts = {AesEffectState::EsExpired, AesEffectState::EsRemoved, AesEffectState::EsActivated};
auto clusters = m_aesDtc->explosionClusters();
for (auto cluster : qAsConst(clusters))
for (auto cluster : std::as_const(clusters))
{
if (!sts.contains(cluster.effectStateId().underlying()))
{
@@ -1202,7 +1203,7 @@ void ModuleTestLimits::deleteAesAreas()
}
}
auto nbcs = m_aesDtc->nContaminations();
for (auto nbc : qAsConst(nbcs))
for (auto nbc : std::as_const(nbcs))
{
if (!sts.contains(nbc.effectStateId().underlying()))
{
@@ -1212,7 +1213,7 @@ void ModuleTestLimits::deleteAesAreas()
}
}
auto orms = m_aesDtc->offRouteMines();
for (auto orm : qAsConst(orms))
for (auto orm : std::as_const(orms))
{
if (!sts.contains(orm.effectStateId().underlying()))
{
@@ -1222,7 +1223,7 @@ void ModuleTestLimits::deleteAesAreas()
}
}
auto bts = m_aesDtc->boobyTraps();
for (auto bt : qAsConst(bts))
for (auto bt : std::as_const(bts))
{
if (!sts.contains(bt.effectStateId().underlying()))
{
@@ -1232,7 +1233,7 @@ void ModuleTestLimits::deleteAesAreas()
}
}
auto mas = m_aesDtc->mineAreas();
for (auto ma : qAsConst(mas))
for (auto ma : std::as_const(mas))
{
if (!sts.contains(ma.effectStateId().underlying()))
{
@@ -1242,7 +1243,7 @@ void ModuleTestLimits::deleteAesAreas()
}
}
auto bccs = m_aesDtc->bCContaminations();
for (auto bcc : qAsConst(bccs))
for (auto bcc : std::as_const(bccs))
{
if (!sts.contains(bcc.effectStateId().underlying()))
{
@@ -1252,7 +1253,7 @@ void ModuleTestLimits::deleteAesAreas()
}
}
auto fas = m_aesDtc->functionalAreas();
for (auto fa : qAsConst(fas))
for (auto fa : std::as_const(fas))
{
if (!sts.contains(fa.effectStateId().underlying()))
{
@@ -1262,7 +1263,7 @@ void ModuleTestLimits::deleteAesAreas()
}
}
auto tas = m_aesDtc->technicalAreas();
for (auto ta : qAsConst(tas))
for (auto ta : std::as_const(tas))
{
if (!sts.contains(ta.effectStateId().underlying()))
{
@@ -1273,7 +1274,7 @@ void ModuleTestLimits::deleteAesAreas()
}
auto eas = m_aesDtc->explosionAreas();
for (auto ea : qAsConst(eas))
for (auto ea : std::as_const(eas))
{
if (!sts.contains(ea.effectStateId().underlying()))
{
@@ -1284,7 +1285,7 @@ void ModuleTestLimits::deleteAesAreas()
}
auto ess = m_aesDtc->explosionSingles();
for (auto es : qAsConst(ess))
for (auto es : std::as_const(ess))
{
if (!sts.contains(es.effectStateId().underlying()))
{
@@ -1360,7 +1361,7 @@ int main(int argc, char *argv[])
const QStringList &slPositionalArgs = options.positionalArguments();
for (const QString &item : qAsConst(slPositionalArgs))
for (const QString &item : std::as_const(slPositionalArgs))
std::cout << " item = " << item << std::endl;
// enable_create_bulk only if it´s explicitly called by user:
@@ -13,13 +13,19 @@ SET(UnitTestSources
IF(BUILD_TESTING)
ADD_EXECUTABLE(aesModuleTestOthers ${LinkedSources} ${UnitTestSources} )
NGL_TARGET_INCLUDE_DIRECTORIES(aesModuleTestOthers
PUBLIC
${CMAKE_SOURCE_DIR}/Lts/
${CMAKE_SOURCE_DIR}/Lts/Services/
)
TARGET_LINK_LIBRARIES(aesModuleTestOthers
NGLLogger
nglcoreapplication
LtsCommandLineParser
LtsCoordinate
Qt5::Core
Qt5::Test
Qt6::Core
Qt6::Test
ddsconnector
svcAesCommon
svcAesClient
@@ -7,6 +7,7 @@
*/
#include "aes_others_module_test.h"
#include <utility>
#include <nglapplication/nglcoreapplication.h>
#include <LtsCoordTrans/lts_coord_trans.h>
@@ -812,7 +813,7 @@ int main(int argc, char *argv[])
--argc;
const QStringList &slPositionalArgs = options.positionalArguments();
for (const QString &item : qAsConst(slPositionalArgs))
for (const QString &item : std::as_const(slPositionalArgs))
std::cout << " item = " << item << std::endl;
// // enable_create_bulk only if it´s explicitly called by user:
@@ -20,6 +20,7 @@ NGL_ADD_LIBRARY2(WS SV HLA Trajectory SHARED
)
NGL_TARGET_INCLUDE_DIRECTORIES(Trajectory
INTERFACE
${CMAKE_CURRENT_SOURCE_DIR}/../../
${CMAKE_CURRENT_SOURCE_DIR}/../
)
NGL_TARGET_LINK_LIBRARIES(Trajectory
@@ -31,8 +32,8 @@ NGL_TARGET_LINK_LIBRARIES(Trajectory
LtsElevation
LtsUtilsCore
LtsCoordTrans
Qt5::Core
Qt5::Gui
Qt6::Core
Qt6::Gui
)
ADD_SUBDIRECTORY(UnitTest_Trajectory)
@@ -15,15 +15,25 @@ SET(UnitTestSources
)
IF(BUILD_TESTING)
ADD_EXECUTABLE(aesUnitTestTrajectory ${LinkedSources} ${UnitTestSources} )
NGL_ADD_EXECUTABLE(SV aesUnitTestTrajectory ${LinkedSources} ${UnitTestSources} )
NGL_TARGET_INCLUDE_DIRECTORIES(aesUnitTestTrajectory
PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/../../
${CMAKE_SOURCE_DIR}/Lts/Services/AreaEffectSimulation
${CMAKE_SOURCE_DIR}/Lts/
${CMAKE_SOURCE_DIR}/Lts/Services/
${CMAKE_BINARY_DIR}/Lts/
)
TARGET_LINK_LIBRARIES(aesUnitTestTrajectory
NGLLogger
nglcoreapplication
svcAesCommon
Qt5::Core
Qt5::Gui
Qt5::Test)
Trajectory
Qt6::Core
Qt6::Gui
Qt6::Test)
ADD_TEST(NAME aesUnitTestTrajectory COMMAND $<TARGET_FILE:aesUnitTestTrajectory>)
@@ -7,6 +7,7 @@
*/
#include "trajectory_unit_test.h"
#include <utility>
#include <Trajectory/trajectory_helper.h>
#include <Trajectory/trajectory_generator.h>
#include <Trajectory/trajectory_generator_vulcano.h>
@@ -991,7 +992,7 @@ void UnitTestTrajectory::test_vulcano_trajectory()
}
int i=0;
for (auto &item : qAsConst(trajectoryOut))
for (auto &item : std::as_const(trajectoryOut))
INFO_LOG(m_logger) << "i = " << i++ << ", item " << item;
}
@@ -8,6 +8,7 @@
*/
#include "trajectory_generator.h"
#include <utility>
#include "trajectory_generator_vulcano.h"
#include <Plugins/ExerciseManagement/exm_data_plugin_interface.h>
#include <Plugins/AssetManagement/asm_data_plugin_interface.h>
@@ -199,7 +200,7 @@ bool TrajectoryGenerator::generateTrajectoryVulcano(const QPoint3D &originatorPo
{
QPoint4D startPoint = trajectoryMetricOut.first();
for (const QPoint4D &p4D : qAsConst(trajectoryMetricOut))
for (const QPoint4D &p4D : std::as_const(trajectoryMetricOut))
{
output << p4D.x() - startPoint.x() << ";"
<< p4D.y() - startPoint.y() << ";"
@@ -231,7 +232,7 @@ bool TrajectoryGenerator::generateTrajectoryVulcano(const QPoint3D &originatorPo
trajectoryTimeAwareOut.clear();
trajectoryTimeAwareOut.reserve(trajectoryMetricOut.size());
for (const QPoint4D& pnt4d : qAsConst(trajectoryMetricOut))
for (const QPoint4D& pnt4d : std::as_const(trajectoryMetricOut))
{
LtsCoordTrans::UtmCoordinate pntUtm(idealHitUtm.zone, pnt4d.x(), pnt4d.y());
const QPointF &pntGeo = pntUtm.geographic();
@@ -8,6 +8,7 @@
*/
#include "trajectory_generator_vulcano.h"
#include <utility>
#include <QObject>
#include <QPointF>
@@ -171,7 +172,7 @@ bool TrajectoryGeneratorVulcano::trajectoryVulcano(const QPoint3D &origin, const
trajectoryOut.reserve(phase1_bal.size()+5);
int cnt = 0;
for (const QPointF &xyVertex : qAsConst(phase1_bal))
for (const QPointF &xyVertex : std::as_const(phase1_bal))
{
// translate from XY to XYZ
const QPoint3D p3d_offset(xyVertex.x() * factorX, // xyVertex.x()
@@ -15,13 +15,20 @@ SET(UnitTestSources
SOURCE_GROUP( UnitTestSources FILES ${UnitTestSources} )
IF(BUILD_TESTING)
ADD_EXECUTABLE(aesUnitTestTrajectorySplitter ${LinkedSources} ${UnitTestSources} )
NGL_ADD_EXECUTABLE(SV aesUnitTestTrajectorySplitter ${LinkedSources} ${UnitTestSources} )
NGL_TARGET_INCLUDE_DIRECTORIES(aesUnitTestTrajectorySplitter
PUBLIC
${CMAKE_SOURCE_DIR}/Lts/
${CMAKE_SOURCE_DIR}/Lts/Services/
${CMAKE_BINARY_DIR}/Lts/
)
TARGET_LINK_LIBRARIES(aesUnitTestTrajectorySplitter
NGLLogger
nglcoreapplication
Qt5::Core
Qt5::Test
Qt6::Core
Qt6::Test
svcAesCommon
)
@@ -11,15 +11,22 @@ SET(UnitTestSources
)
IF(BUILD_TESTING)
ADD_EXECUTABLE(aesUnitTestFireAutomaton ${LinkedSources} ${UnitTestSources} )
NGL_ADD_EXECUTABLE(SV aesUnitTestFireAutomaton ${LinkedSources} ${UnitTestSources} )
NGL_TARGET_INCLUDE_DIRECTORIES(aesUnitTestFireAutomaton
PUBLIC
${CMAKE_SOURCE_DIR}/Lts/
${CMAKE_SOURCE_DIR}/Lts/Services/
${CMAKE_BINARY_DIR}/Lts/
)
TARGET_LINK_LIBRARIES(aesUnitTestFireAutomaton
NGLLogger
nglcoreapplication
LtsCommandLineParser
LtsCoordinate
Qt5::Core
Qt5::Test
Qt6::Core
Qt6::Test
ddsconnector
svcAesCommon
svcAesClient
@@ -19,6 +19,9 @@ NGL_ADD_EXECUTABLE(AAR SV NO_TRANSLATION aes_statemachine_test
NGL_TARGET_INCLUDE_DIRECTORIES( aes_statemachine_test
PUBLIC
${CMAKE_CURRENT_BINARY_DIR}/..
${CMAKE_SOURCE_DIR}/Lts/
${CMAKE_SOURCE_DIR}/Lts/Services/
${CMAKE_BINARY_DIR}/Lts/
)
@@ -35,8 +38,8 @@ NGL_TARGET_LINK_LIBRARIES(aes_statemachine_test
svcIsmClient
svcAsmClient
svcExmClient
Qt5::Core
Qt5::Test
Qt6::Core
Qt6::Test
)
NGL_TARGET_COMPILE_DEFINITIONS(aes_statemachine_test PRIVATE AES_STATEMACHINE_TEST)
IF(TARGET aes_statemachine_test)
@@ -13,14 +13,21 @@ SET(UnitTestSources
SOURCE_GROUP( UnitTestSources FILES ${UnitTestSources} )
IF(BUILD_TESTING)
ADD_EXECUTABLE(aesUnitTestBasics ${LinkedSources} ${UnitTestSources} )
NGL_ADD_EXECUTABLE(SV aesUnitTestBasics ${LinkedSources} ${UnitTestSources} )
NGL_TARGET_INCLUDE_DIRECTORIES(aesUnitTestBasics
PUBLIC
${CMAKE_SOURCE_DIR}/Lts/
${CMAKE_SOURCE_DIR}/Lts/Services/
${CMAKE_BINARY_DIR}/Lts/
)
TARGET_LINK_LIBRARIES(aesUnitTestBasics
NGLLogger
nglcoreapplication
LtsCoordTrans
Qt5::Core
Qt5::Test
Qt6::Core
Qt6::Test
svcAesCommon
)
@@ -7,6 +7,7 @@
*/
#include "basics_unit_test.h"
#include <utility>
#include <nglapplication/nglcoreapplication.h>
#include <AreaEffectSimulation/aes.hpp>
@@ -246,7 +247,7 @@ void UnitTestBasics::test_fireTimer10()
QStringList logSl1 = ft.getLogHistorie();
QVERIFY2(logSl1.size() == 1, "getCommandHistorie failed");
for (const auto &log : qAsConst(logSl1))
for (const auto &log : std::as_const(logSl1))
NOTICE_LOG(m_logger) << "log ='" << log << "'";
}
@@ -319,7 +320,7 @@ void UnitTestBasics::test_fireTimer20()
// QList<QVariant> arguments = spyStateChanged.takeFirst(); // take the first signal
// NOTICE_LOG(m_logger) << " spyStateChanged.count() " << spyStateChanged.count();
// for (const QList<QVariant> &argument : qAsConst(spyStateChanged))
// for (const QList<QVariant> &argument : std::as_const(spyStateChanged))
// NOTICE_LOG(m_logger) << " spyStateChanged . argument " << argument.first().toInt();
// check order of signal paramter:
@@ -13,14 +13,21 @@ SET(UnitTestSources
SOURCE_GROUP( UnitTestSources FILES ${UnitTestSources} )
IF(BUILD_TESTING)
ADD_EXECUTABLE(aesUnitTestPolygons ${LinkedSources} ${UnitTestSources} )
NGL_ADD_EXECUTABLE(SV aesUnitTestPolygons ${LinkedSources} ${UnitTestSources} )
NGL_TARGET_INCLUDE_DIRECTORIES(aesUnitTestPolygons
PUBLIC
${CMAKE_SOURCE_DIR}/Lts/
${CMAKE_SOURCE_DIR}/Lts/Services/
${CMAKE_BINARY_DIR}/Lts/
)
TARGET_LINK_LIBRARIES(aesUnitTestPolygons
NGLLogger
nglcoreapplication
LtsCoordTrans
Qt5::Core
Qt5::Test
Qt6::Core
Qt6::Test
svcAesCommon
)
@@ -7,6 +7,7 @@
*/
#include "polygons_unit_test.h"
#include <utility>
#include <Services/AreaEffectSimulation/Utils/polygons.h>
#include <nglapplication/nglcoreapplication.h>
@@ -210,7 +211,7 @@ void UnitTestPolygons::test_explosionClusterSingleExplosionsGAUSS_Mtp()
qCritical() << "rotation_deg = " << rotation_deg
<< ", mtpRotationNorthDegree = " << mtpRotationNorthDegree
<< ", explosionClusterDb = " << singleExplosions;
for (const auto &singleExplosion : qAsConst(singleExplosions))
for (const auto &singleExplosion : std::as_const(singleExplosions))
qDebug() << "singleExUtm: " << LtsCoordTrans::UtmCoordinate::fromGeographic(singleExplosion).mgrs();
size_t i = 0;
@@ -242,7 +243,7 @@ void UnitTestPolygons::test_explosionClusterSingleExplosionsGAUSS_Mtp()
qCritical() << "rotation_deg = " << rotation_deg
<< ", mtpRotationNorthDegree = " << mtpRotationNorthDegree
<< " explosionClusterDb = " << singleExplosions;
for (const auto &singleExplosion : qAsConst(singleExplosions))
for (const auto &singleExplosion : std::as_const(singleExplosions))
qCritical() << "singleExUtm: " << LtsCoordTrans::UtmCoordinate::fromGeographic(singleExplosion).mgrs();
size_t i = 0;
@@ -279,7 +280,7 @@ void UnitTestPolygons::test_explosionClusterSingleExplosionsGAUSS_Mtp()
<< ", zog = " << zog
<< ", mtpRotationNorthDegree = " << mtpRotationNorthDegree
<< " explosionClusterDb = " << singleExplosions;
for (const auto &singleExplosion : qAsConst(singleExplosions))
for (const auto &singleExplosion : std::as_const(singleExplosions))
qCritical() << "singleExUtm: " << LtsCoordTrans::UtmCoordinate::fromGeographic(singleExplosion).mgrs();
size_t i = 0;
@@ -13,13 +13,20 @@ SET(UnitTestSources
SOURCE_GROUP( UnitTestSources FILES ${UnitTestSources} )
IF(BUILD_TESTING)
ADD_EXECUTABLE(aesUnitTestTneAlgorithmen ${LinkedSources} ${UnitTestSources} )
NGL_ADD_EXECUTABLE(SV aesUnitTestTneAlgorithmen ${UnitTestSources} )
NGL_TARGET_INCLUDE_DIRECTORIES(aesUnitTestTneAlgorithmen
PUBLIC
${CMAKE_SOURCE_DIR}/Lts/
${CMAKE_SOURCE_DIR}/Lts/Services/
${CMAKE_BINARY_DIR}/Lts/
)
TARGET_LINK_LIBRARIES(aesUnitTestTneAlgorithmen
NGLLogger
nglcoreapplication
Qt5::Core
Qt5::Test
Qt6::Core
Qt6::Test
svcAesCommon
)
@@ -6,6 +6,7 @@
*/
#include "icons.h"
#include <utility>
#include "polygons.h"
#include <AreaEffectSimulation/aes.hpp>
@@ -54,7 +55,7 @@ static QPixmap pixmapFromPolygons(const QVector<PolygonData> &datas,
for (const PolygonData &data : datas)
{
polyUtm.clear();
for (const QPointF &point : qAsConst(data.poly))
for (const QPointF &point : std::as_const(data.poly))
{
LtsCoordTrans::UtmCoordinate pointUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(point, zone);
polyUtm << QPointF(pointUtm.x, pointUtm.y);
@@ -66,7 +67,7 @@ static QPixmap pixmapFromPolygons(const QVector<PolygonData> &datas,
bounding.reserve(4 * datas.size());
// Does not matter, how the total polygon looks as we just need the bounding rect.
// << is cheaper than .united()
for (const QPolygonF &polyUtmLocal : qAsConst(polysUtm))
for (const QPolygonF &polyUtmLocal : std::as_const(polysUtm))
bounding << polyUtmLocal;
// center to center / Todo:: Does it always work?
@@ -89,7 +90,7 @@ static QPixmap pixmapFromPolygons(const QVector<PolygonData> &datas,
QPainter p(&pix);
int i = 0;
for (const PolygonData &d : qAsConst(datas))
for (const PolygonData &d : std::as_const(datas))
{
QPolygonF mPoly = mTrans.map(polysUtm.at(i++));
mPoly = mScale.map(mPoly);
@@ -6,6 +6,7 @@
*/
#include "polygons.h"
#include <utility>
#include "tne_algorithmen.h"
#include <aes.hpp>
@@ -112,7 +113,7 @@ static QPolygonF utmToGeogrphic(const QPolygonF &polyUtm, const LtsCoordTrans::U
{
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;
}
@@ -476,7 +477,7 @@ QVector<QPointF> effectClusterSingleExplosionsGAUSS(const Database::AesEffectClu
vec.reserve(impactCount);
const QTransform trans(fromRotation(-effectCluster.rotationAngle)); // Compass, not mathematical!
for (const QPointF &point : qAsConst(impactsGAUSS))
for (const QPointF &point : std::as_const(impactsGAUSS))
{
QPointF p = impactPositionUtm.geographic(trans.map(point));
DEBUG_LOG(logger) << "Point = " << p;
@@ -552,7 +553,7 @@ QVector<QPointF> effectClusterSingleExplosionsGAUSS_Mtp(const Database::AesEffec
QVector<LtsCoordTrans::UtmCoordinate> mtps_asRealUtm;
mtps_asRealUtm.reserve(mtps_asUtm.size());
for (const QPointF &mtp_asUtm : qAsConst(mtps_asUtm))
for (const QPointF &mtp_asUtm : std::as_const(mtps_asUtm))
{
// convert QPointF back to UtmCoordinate: pay attention to order!!!
const LtsCoordTrans::UtmCoordinate mtpUtm(impactPositionUtm.zone, mtp_asUtm.x(), mtp_asUtm.y());
@@ -591,7 +592,7 @@ QVector<QPointF> effectClusterSingleExplosionsGAUSS_Mtp(const Database::AesEffec
int idx = 0;
const QTransform transform(fromRotation(-mtpRotationNorthDegree)); // Compass, not mathematical!
for (const QPointF &point : qAsConst(impactsGAUSS))
for (const QPointF &point : std::as_const(impactsGAUSS))
{
// which mtp:
int mtpIdx = (idx++ % mtps_asUtm.size()); // modulo
@@ -606,7 +607,7 @@ QVector<QPointF> effectClusterSingleExplosionsGAUSS_Mtp(const Database::AesEffec
<< ", randomNumber=" << randomNumber << " singleWidthOut=" << singleWidthOut << " singleHeightOut=" << singleHeightOut
<< " rot=" << explosionCluster.rotationAngle;
for (auto item : qAsConst(finalVec))
for (auto item : std::as_const(finalVec))
{
const LtsCoordTrans::UtmCoordinate &utm = LtsCoordTrans::UtmCoordinate::fromGeographic(item);
qCritical() << " TNE VERIFICATION: CHECK:"
@@ -900,7 +901,7 @@ QVector<QPointF> explosionClusterSingleExplosionsGAUSS(const Database::AesExplos
vec.reserve(impactCount);
const QTransform trans(fromRotation(-explosionCluster.rotationAngle)); // Compass, not mathematical!
for (const QPointF &point : qAsConst(impactsGAUSS))
for (const QPointF &point : std::as_const(impactsGAUSS))
{
QPointF p = impactPositionUtm.geographic(trans.map(point));
DEBUG_LOG(logger) << "Point = " << p;
@@ -977,7 +978,7 @@ QVector<QPointF> explosionClusterSingleExplosionsGAUSS_Mtp(const Database::AesEx
QVector<LtsCoordTrans::UtmCoordinate> mtps_asRealUtm;
mtps_asRealUtm.reserve(mtps_asUtm.size());
for (const QPointF &mtp_asUtm : qAsConst(mtps_asUtm))
for (const QPointF &mtp_asUtm : std::as_const(mtps_asUtm))
{
// convert QPointF back to UtmCoordinate: pay attention to order!!!
const LtsCoordTrans::UtmCoordinate mtpUtm(impactPositionUtm.zone, mtp_asUtm.x(), mtp_asUtm.y());
@@ -1016,7 +1017,7 @@ QVector<QPointF> explosionClusterSingleExplosionsGAUSS_Mtp(const Database::AesEx
int idx = 0;
const QTransform transform(fromRotation(-mtpRotationNorthDegree)); // Compass, not mathematical!
for (const QPointF &point : qAsConst(impactsGAUSS))
for (const QPointF &point : std::as_const(impactsGAUSS))
{
// which mtp:
int mtpIdx = (idx++ % mtps_asUtm.size()); // modulo
@@ -1031,7 +1032,7 @@ QVector<QPointF> explosionClusterSingleExplosionsGAUSS_Mtp(const Database::AesEx
<< ", randomNumber=" << randomNumber << " singleWidthOut=" << singleWidthOut << " singleHeightOut=" << singleHeightOut
<< " rot=" << explosionCluster.rotationAngle;
for (auto item : qAsConst(finalVec))
for (auto item : std::as_const(finalVec))
{
const LtsCoordTrans::UtmCoordinate &utm = LtsCoordTrans::UtmCoordinate::fromGeographic(item);
qCritical() << " TNE VERIFICATION: CHECK:"
@@ -1678,7 +1679,7 @@ LtsUtils::QPoint3D calculateFiringUnitCenterNonRecursive(const std::shared_ptr<P
int childCount = 0;
LtsUtils::QPoint3D pos;
for (int childId : qAsConst(childIds))
for (int childId : std::as_const(childIds))
{
const ParticipantManagement::ParticipantPosition &childPos = ppmDtc->participantPosition(childId);
if (childPos.participantId() != childId)
@@ -1731,7 +1732,7 @@ std::vector<Core::GeoPosition2D> dangerAreaDefaultSegments(const QPointF &center
// polyUtm = QTransform().rotate(0).map(polyUtm);
LtsCoordTrans::UtmCoordinate impactPositionUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(centerPos);
const QPolygonF poly(utmToGeogrphic(polyUtm, impactPositionUtm));
for (const auto &p : qAsConst(poly))
for (const auto &p : std::as_const(poly))
segments.push_back(Core::GeoPosition2D(p.x(), p.y()));
return segments;
@@ -6,6 +6,7 @@
*/
#include "handler_explosion_single_central.h"
#include <utility>
#include "main_handler.h"
#include <LtsCoordTrans/lts_coord_trans.h>
@@ -35,7 +36,7 @@ bool HandlerExplosionSingleCentral::init()
return true;
}
// create indirect fire single objects
for (const Database::AesExplosionSingleCentral &dbData : qAsConst(dataVec))
for (const Database::AesExplosionSingleCentral &dbData : std::as_const(dataVec))
{
ObjectExplosionSingleCentral *ifs(new ObjectExplosionSingleCentral(m_mainHandler, this));
connect(ifs, &ObjectExplosionSingleCentral::effectStateChanged, this, &HandlerExplosionSingleCentral::onEffectStateChanged);
@@ -6,6 +6,7 @@
* $Author$
*/
#include "aes_dtc_impl_custom.h"
#include <utility>
#include <DDS/DTC/generic_dtc.h>
#include <DDS/Generic/generic_data_reader.h>
#include <QElapsedTimer>
@@ -120,7 +121,7 @@ AreaEffectSimulation::AesType DtcImplCustom::aesItemIdFromExternalId(long long e
QMap<qint32, AreaEffectSimulation::BCContamination> bcConts = bCContaminations();
aesItemId = 0;
for (const AreaEffectSimulation::BCContamination &bcCont : qAsConst(bcConts))
for (const AreaEffectSimulation::BCContamination &bcCont : std::as_const(bcConts))
{
if (bcCont.externalId() == externalId)
{
@@ -132,7 +133,7 @@ AreaEffectSimulation::AesType DtcImplCustom::aesItemIdFromExternalId(long long e
return AreaEffectSimulation::AesType_def::AtBCContamination;
QMap<qint32, AreaEffectSimulation::NContamination> nConts = nContaminations();
for (const AreaEffectSimulation::NContamination &nCont: qAsConst(nConts))
for (const AreaEffectSimulation::NContamination &nCont: std::as_const(nConts))
{
if (nCont.externalId() == externalId)
{
@@ -144,7 +145,7 @@ AreaEffectSimulation::AesType DtcImplCustom::aesItemIdFromExternalId(long long e
return AreaEffectSimulation::AesType_def::AtNContamination;
QMap<qint32, AreaEffectSimulation::ExplosionArea> explAreas = explosionAreas();
for (const AreaEffectSimulation::ExplosionArea &explArea : qAsConst(explAreas))
for (const AreaEffectSimulation::ExplosionArea &explArea : std::as_const(explAreas))
{
if (explArea.externalId() == externalId)
{
@@ -156,7 +157,7 @@ AreaEffectSimulation::AesType DtcImplCustom::aesItemIdFromExternalId(long long e
return AreaEffectSimulation::AesType_def::AtExplosionArea;
QMap<qint32, AreaEffectSimulation::ExplosionSingle> explSingles = explosionSingles();
for (const AreaEffectSimulation::ExplosionSingle &explSingle : qAsConst(explSingles))
for (const AreaEffectSimulation::ExplosionSingle &explSingle : std::as_const(explSingles))
{
if (explSingle.externalId() == externalId)
{
@@ -168,7 +169,7 @@ AreaEffectSimulation::AesType DtcImplCustom::aesItemIdFromExternalId(long long e
return AreaEffectSimulation::AesType_def::AtExplosionSingle;
QMap<qint32, AreaEffectSimulation::MineArea> mAreas = mineAreas();
for(const AreaEffectSimulation::MineArea &mArea : qAsConst(mAreas))
for(const AreaEffectSimulation::MineArea &mArea : std::as_const(mAreas))
{
if (mArea.externalId() == externalId)
{
@@ -180,7 +181,7 @@ AreaEffectSimulation::AesType DtcImplCustom::aesItemIdFromExternalId(long long e
return AreaEffectSimulation::AesType_def::AtMineArea;
QMap<qint32, AreaEffectSimulation::MineCorridor> mCorridors = mineCorridors();
for (const AreaEffectSimulation::MineCorridor &mCorridor : qAsConst(mCorridors))
for (const AreaEffectSimulation::MineCorridor &mCorridor : std::as_const(mCorridors))
{
if (mCorridor.externalId() == externalId)
{
@@ -352,7 +353,7 @@ QVector<TrajectoryTimeAware> DtcImplCustom::trajectoriesTimeAwareFromOriginatorI
const QMap<qint32, AreaEffectSimulation::TrajectoryTimeAware> &trajectoryTimeAwareMap = trajectoryTimeAwares();
for (const AreaEffectSimulation::TrajectoryTimeAware &trajectoryTimeAware : qAsConst(trajectoryTimeAwareMap))
for (const AreaEffectSimulation::TrajectoryTimeAware &trajectoryTimeAware : std::as_const(trajectoryTimeAwareMap))
{
// be aware of: [E01562-259] use originatorId, originatorTypeId (instead of aesItemId, aesTypeId)
if ((trajectoryTimeAware.originatorId() == originatorId) &&
@@ -401,7 +402,7 @@ void DtcImplCustom::initDAO()
// // We don´t realy know, how many to reserve:
// trajectoriesFromAesIdVec.reserve(120); // 2024-09 N.Thoden: 120 ist maximum per area
// for (const AreaEffectSimulation::TrajectoryTimeAware &trajectoryTimeAware : qAsConst(trajectoryTimeAwareMap))
// for (const AreaEffectSimulation::TrajectoryTimeAware &trajectoryTimeAware : std::as_const(trajectoryTimeAwareMap))
// {
// if (trajectoryTimeAware.aesItemId() == aesId)
// trajectoriesFromAesIdVec.push_back(trajectoryTimeAware);
@@ -6,6 +6,7 @@
*/
#include "handler_air_support_impact.h"
#include <utility>
#include "main_handler.h"
namespace AreaEffectSimulation
@@ -28,7 +29,7 @@ bool HandlerAirSupportImpact::init()
}
// create air support impact objects
for (const Database::AesAirSupportImpact &dbData : qAsConst(dataVec))
for (const Database::AesAirSupportImpact &dbData : std::as_const(dataVec))
{
ObjectAirSupportImpact *ifs(new ObjectAirSupportImpact(m_mainHandler, this));
connect(ifs, &ObjectAirSupportImpact::effectStateChanged, this, &HandlerAirSupportImpact::onEffectStateChanged);
@@ -8,6 +8,7 @@
#pragma once
#include "main_handler.h"
#include <utility>
#include "logger.h"
#include <QObject>
@@ -132,7 +133,7 @@ public:
{
m_areaCount = 0;
m_areaCountCentral = 0;
for (const Obj *area : qAsConst(m_objectMap))
for (const Obj *area : std::as_const(m_objectMap))
{
if (area->isObjectInTrainingArea()) // meanwhile an ugly name, means EsPrepared, EsActivated, EsPaused
{
@@ -7,6 +7,7 @@
*/
#include "handler_borderline.h"
#include <utility>
#include "object_borderline.h"
@@ -47,13 +48,13 @@ bool HandlerBorderline::init()
// contains all segments of an borderline in ascending order
QVector<Database::AesBorderlineSegment> dbBorderlineSegments;
for (const Database::AesBorderline &dbBorderline : qAsConst(borderlineVec))
for (const Database::AesBorderline &dbBorderline : std::as_const(borderlineVec))
{
if (dbBorderline.effectStateId == AesEffectState_def::EsRemoved)
continue;
dbBorderlineSegments.clear();
for (const Database::AesBorderlineSegment &segment : qAsConst(segmentVec))
for (const Database::AesBorderlineSegment &segment : std::as_const(segmentVec))
{
if (segment.borderlineId == dbBorderline.privBorderlineId)
dbBorderlineSegments.insert(segment.positionIndex, segment);
@@ -7,6 +7,7 @@
*/
#include "handler_charge_administration.h"
#include <utility>
#include "object_charge_administration.h"
namespace AreaEffectSimulation
@@ -52,7 +53,7 @@ bool HandlerChargeAdministration::init()
int HandlerChargeAdministration::getObjectChargeAdministrationId(int partyId, int chargeTypeId, ProjectDataManagement::EffectSource effectSourceId)
{
for (ObjectChargeAdministration *val : qAsConst(m_chargeAdminObjMap))
for (ObjectChargeAdministration *val : std::as_const(m_chargeAdminObjMap))
{
if (val->data().partyId == partyId && val->data().chargeTypeId == chargeTypeId && val->data().effectSourceId == effectSourceId)
return val->id();
@@ -117,7 +118,7 @@ Core::FunctionReplyObject HandlerChargeAdministration::chargeAdministrationModif
Core::FunctionReplyObject HandlerChargeAdministration::claimPlannedCharge(int chargeTypeId, int partyId, int count)
{
for (ObjectChargeAdministration *val : qAsConst(m_chargeAdminObjMap))
for (ObjectChargeAdministration *val : std::as_const(m_chargeAdminObjMap))
{
if (val->data().partyId == partyId && val->data().chargeTypeId == chargeTypeId)
return val->claimPlannedCharge(count);
@@ -140,7 +141,7 @@ Core::FunctionReplyObject HandlerChargeAdministration::consumeCharge(int chargeT
DEBUG_LOG(m_logger) << "effectSource: " << effectSource;
for (ObjectChargeAdministration *val : qAsConst(m_chargeAdminObjMap))
for (ObjectChargeAdministration *val : std::as_const(m_chargeAdminObjMap))
{
if (val->data().partyId == partyId && val->data().chargeTypeId == chargeTypeId && val->data().effectSourceId == effectSource)
{
@@ -155,7 +156,7 @@ Core::FunctionReplyObject HandlerChargeAdministration::consumeCharge(int chargeT
int HandlerChargeAdministration::availableCharge(int chargeTypeId, int partyId) const
{
for (ObjectChargeAdministration *val : qAsConst(m_chargeAdminObjMap))
for (ObjectChargeAdministration *val : std::as_const(m_chargeAdminObjMap))
{
if (val->data().partyId == partyId && val->data().chargeTypeId == chargeTypeId)
return val->availableCharge();
@@ -1,4 +1,5 @@
#include "handler_charge_effect.h"
#include <utility>
#include "handler_charge_administration.h"
#include "handler_effect_cluster.h"
@@ -52,7 +53,7 @@ bool HandlerChargeEffect::init()
ObjectChargeEffect::s_afterglowMsecs = Settings::getChargeEffectAfterGlow();
for (const Database::AesChargeEffect &currentChargeEffectData : qAsConst(chargeEffectDbData))
for (const Database::AesChargeEffect &currentChargeEffectData : std::as_const(chargeEffectDbData))
{
ObjectChargeEffect *newChargeEffect = new ObjectChargeEffect(currentChargeEffectData, m_mainHandler, this);
@@ -7,6 +7,7 @@
*/
#include "handler_danger_area.h"
#include <utility>
#include "object_danger_area.h"
#include <TrainingAreaBase/tab_dtc.h>
@@ -42,11 +43,11 @@ bool HandlerDangerArea::init()
// create area mine objects
QVector<Database::AesDangerSegment> mySegments;
for (const Database::AesDangerArea &area : qAsConst(areaVec))
for (const Database::AesDangerArea &area : std::as_const(areaVec))
{
// Gather segments
mySegments.clear();
for (const Database::AesDangerSegment &mas : qAsConst(segmentVec))
for (const Database::AesDangerSegment &mas : std::as_const(segmentVec))
{
if (mas.dangerAreaId == area.privDangerAreaId)
mySegments << mas;
@@ -8,6 +8,7 @@
*/
#include "handler_effect_cluster.h"
#include <utility>
#include "handler_charge_administration.h"
#include "object_effect_cluster.h"
#include "settings.h"
@@ -632,7 +633,7 @@ Core::FunctionReplyObject HandlerEffectCluster::effectClusterModifyRequest(const
void HandlerEffectCluster::recountActiveAreas()
{
s_currentAirSupportCount = 0;
for (const auto *area : qAsConst(m_objectMap))
for (const auto *area : std::as_const(m_objectMap))
{
if (area->isObjectInTrainingArea()) // meanwhile an ugly name, means EsPrepared, EsActivated, EsPaused
{
@@ -681,7 +682,7 @@ void HandlerEffectCluster::onEffectClusterFireHaltRequest(const rti::core::Sampl
QMap<int, ObjectEffectCluster *> effectClusterPartyMap;
for (const auto *area : qAsConst(m_objectMap))
for (const auto *area : std::as_const(m_objectMap))
{
if (area->data().partyId == request.partyId())
{
@@ -701,7 +702,7 @@ void HandlerEffectCluster::onEffectClusterFireHaltRequest(const rti::core::Sampl
case ProjectDataManagement::L22_FireHaltCategory::A: // Feuer Halt Allgemein
{
// all control operations are halted
for (auto *ifs : qAsConst(effectClusterPartyMap))
for (auto *ifs : std::as_const(effectClusterPartyMap))
{
EffectClusterPauseResumeRequest req;
@@ -718,7 +719,7 @@ void HandlerEffectCluster::onEffectClusterFireHaltRequest(const rti::core::Sampl
{
// Ongoing combat operations are halted after comparing the extent of
// the fire hold with the corresponding target coordinate and circular area.
for (auto *ifs : qAsConst(effectClusterPartyMap))
for (auto *ifs : std::as_const(effectClusterPartyMap))
{
const double lonRad = request.longitude().is_set() ? request.longitude().get() * LtsCoordTrans::deg2rad() : 0.0;
const double latRad = request.latitude().is_set() ? request.latitude().get() * LtsCoordTrans::deg2rad() : 0.0;
@@ -746,7 +747,7 @@ void HandlerEffectCluster::onEffectClusterFireHaltRequest(const rti::core::Sampl
// Unlike "Check Fire" (Feuer Halt), any rounds already loaded in a Panzerhaubitze (PzH) are still fired,
// followed by an EX-FQ(FN) report. Once the weapon system confirms execution,
// the engagement is closed and the target area status is set to "expired."
for (auto *ifs : qAsConst(effectClusterPartyMap))
for (auto *ifs : std::as_const(effectClusterPartyMap))
{
DEBUG_LOG(m_logger) << "[Feuer Einstellen ----- markAsExpired] " << "effectClusterId: " << ifs->data().id;
@@ -755,7 +756,7 @@ void HandlerEffectCluster::onEffectClusterFireHaltRequest(const rti::core::Sampl
break;
}
case ProjectDataManagement::L22_FireHaltCategory::C: // Aufheben Feuer Halt Allgemein
for (auto *ifs : qAsConst(effectClusterPartyMap))
for (auto *ifs : std::as_const(effectClusterPartyMap))
{
DEBUG_LOG(m_logger) << "[Aufheben Feuer Halt Allgemein] " << "effectClusterId: " << ifs->data().id;
@@ -768,7 +769,7 @@ void HandlerEffectCluster::onEffectClusterFireHaltRequest(const rti::core::Sampl
break;
case ProjectDataManagement::L22_FireHaltCategory::F: // Aufheben Feuer Halt Referenziert
{
for (auto *ifs : qAsConst(effectClusterPartyMap))
for (auto *ifs : std::as_const(effectClusterPartyMap))
{
const double lonRad = request.longitude().is_set() ? request.longitude().get() * LtsCoordTrans::deg2rad() : 0.0; // optional<lonRad>
const double latRad = request.latitude().is_set() ? request.latitude().get() * LtsCoordTrans::deg2rad() : 0.0; // optional <latRad>
@@ -8,6 +8,7 @@
*/
#include "handler_explosion_cluster.h"
#include <utility>
#include "handler_charge_administration.h"
#include <Services/AreaEffectSimulation/Utils/polygons.h>
#include <ProjectDataManagement/pdm_translation.h>
@@ -611,7 +612,7 @@ Core::FunctionReplyObject HandlerExplosionCluster::modifyPartyParticipant(qint32
void HandlerExplosionCluster::recountActiveAreas()
{
s_currentAirSupportCount = 0;
for (const auto *area : qAsConst(m_objectMap))
for (const auto *area : std::as_const(m_objectMap))
{
if (area->isObjectInTrainingArea()) // meanwhile an ugly name, means EsPrepared, EsActivated, EsPaused
{
@@ -6,6 +6,7 @@
*/
#include "handler_explosion_single.h"
#include <utility>
#include "main_handler.h"
#include <Services/AreaEffectSimulation/Utils/polygons.h>
@@ -30,7 +31,7 @@ bool HandlerExplosionSingle::init()
return true;
}
// create indirect fire single objects
for (const Database::AesExplosionSingle &dbData : qAsConst(dataVec))
for (const Database::AesExplosionSingle &dbData : std::as_const(dataVec))
{
ObjectExplosionSingle *ifs(new ObjectExplosionSingle(m_mainHandler, this));
connect(ifs, &ObjectExplosionSingle::effectStateChanged, this, &HandlerExplosionSingle::onEffectStateChanged);
@@ -7,6 +7,7 @@
*/
#include "handler_functional_area.h"
#include <utility>
#include "Utils/polygons.h"
#include <QPolygonF>
@@ -51,7 +52,7 @@ bool HandlerFunctionalArea::init()
return false;
}
for (const Database::AesFunctionalAreaType &currentFunctionalAreaType : qAsConst(functionalAreaTypeVec))
for (const Database::AesFunctionalAreaType &currentFunctionalAreaType : std::as_const(functionalAreaTypeVec))
{
FunctionalAreaType *ddsData = new FunctionalAreaType(currentFunctionalAreaType.id,
@@ -74,7 +75,7 @@ bool HandlerFunctionalArea::init()
// create functional area objects
for (const Database::AesFunctionalArea &dbData : qAsConst(dataVec))
for (const Database::AesFunctionalArea &dbData : std::as_const(dataVec))
{
ObjectFunctionalArea *ifs(new ObjectFunctionalArea(m_mainHandler, this));
connect(ifs, &ObjectFunctionalArea::effectStateChanged, this, &HandlerFunctionalArea::onEffectStateChanged);
@@ -7,6 +7,7 @@
*/
#include "handler_gas_pipe.h"
#include <utility>
#include "object_gas_pipe.h"
#include <QTimer>
#include "Utils/polygons.h"
@@ -50,13 +51,13 @@ bool HandlerGasPipe::init()
// contains all segments of an gasPipe in ascending order
QVector<Database::AesGasPipeSegment> dbGasPipeSegments;
for (const Database::AesGasPipe &dbGasPipe : qAsConst(gasPipeVec))
for (const Database::AesGasPipe &dbGasPipe : std::as_const(gasPipeVec))
{
if (dbGasPipe.effectStateId == AesEffectState_def::EsRemoved)
continue;
dbGasPipeSegments.clear();
for (const Database::AesGasPipeSegment &segment : qAsConst(segmentVec))
for (const Database::AesGasPipeSegment &segment : std::as_const(segmentVec))
{
if (segment.gasPipeId == dbGasPipe.privGasPipeId)
dbGasPipeSegments.insert(segment.positionIndex, segment);
@@ -7,6 +7,7 @@
*/
#include "handler_mine_area.h"
#include <utility>
#include "Utils/polygons.h"
#include "handler_effect_cluster.h"
#include "handler_mine_corridor.h"
@@ -69,7 +70,7 @@ bool HandlerMineArea::init()
}
// create area mine objects
for (const Database::AesMineArea &area : qAsConst(areaVec))
for (const Database::AesMineArea &area : std::as_const(areaVec))
{
if (area.layingProcedureTypeId == AesMaLayingProcedureType::LptArtillery && !area.isCentral
@@ -159,7 +160,7 @@ void HandlerMineArea::redistributeMines(int aesId, QList<Database::AesMineAreaTr
DEBUG_LOG(m_logger) << "Putting mines from " << aesId << " into other MineAreas if applicable or in NullArea.";
// check if any other MineArea will handle some of the mines
for (const auto &mineArea : qAsConst(m_objectMap))
for (const auto &mineArea : std::as_const(m_objectMap))
{
if (mineArea->id() != aesId)
{
@@ -185,7 +186,7 @@ void HandlerMineArea::redistributeMines(int aesId, QList<Database::AesMineAreaTr
bool HandlerMineArea::removeDuplicateMine(int mineId)
{
for (const auto &mineArea : qAsConst(m_objectMap))
for (const auto &mineArea : std::as_const(m_objectMap))
{
if (mineArea->isDusMineArea() && mineArea->hasMine(mineId))
{
@@ -621,7 +622,7 @@ Core::FunctionReplyObject HandlerMineArea::mineResetRequest(const MineResetReque
DEBUG_LOG(m_logger) << "Resetting all unassociated DUS mines (NullArea) and all DUS mine areas";
// Do this first!
m_nullArea->resetMines();
for (auto mineAreaObj : qAsConst(m_objectMap))
for (auto mineAreaObj : std::as_const(m_objectMap))
{
if (!mineAreaObj->isDusMineArea() && !mineAreaObj->isConcreteMine())
continue;
@@ -805,7 +806,7 @@ void HandlerMineArea::onNewMineCorridor(const AesItemView &aiv)
if (aiv.effectStateId() != AesEffectState::EsActivated)
return;
for (ObjectMineArea *ma : qAsConst(m_objectMap))
for (ObjectMineArea *ma : std::as_const(m_objectMap))
{
if (intersects(ma->boundingRect(), aiv.form()))
ma->clearCorridor(aiv);
@@ -1183,7 +1184,7 @@ void HandlerMineArea::onTimeoutEquipNo(int equipNo, int chargeTypeId)
std::vector<Core::GeoPosition2D> vec;
vec.reserve(points.size());
for (QPointF bbPoint : qAsConst(points))
for (QPointF bbPoint : std::as_const(points))
{
Core::GeoPosition2D pos;
pos.lon(bbPoint.x());
@@ -1192,7 +1193,7 @@ void HandlerMineArea::onTimeoutEquipNo(int equipNo, int chargeTypeId)
vec.push_back(pos);
}
// vec.reserve(boundingBox.size());
// for( QPointF bbPoint : qAsConst(boundingBox))
// for( QPointF bbPoint : std::as_const(boundingBox))
// {
// Core::GeoPosition2D pos;
// LtsCoordTrans::UtmCoordinate utm;
@@ -1259,7 +1260,7 @@ bool HandlerMineArea::checkIfNullMineIsInArea(const std::vector<AreaEffectSimula
QVector<Database::AesMineAreaSegment> vecSeg;
vecSeg.reserve(segments.size());
for (const AreaEffectSimulation::MineSegment &seg : qAsConst(segments))
for (const AreaEffectSimulation::MineSegment &seg : std::as_const(segments))
{
Database::AesMineAreaSegment dbSeg;
dbSeg.startPosition = QPointF(seg.positionStart().lon(), seg.positionStart().lat());
@@ -1303,7 +1304,7 @@ bool HandlerMineArea::containsPointInExpandedMinefield(const QPointF &positionGe
mineAreaPolygonUtm.push_back(QPointF(pointMineAreaUtm.x, pointMineAreaUtm.y));
}
for (const QPointF &mineAreaPointUTM : qAsConst(mineAreaPolygonUtm))
for (const QPointF &mineAreaPointUTM : std::as_const(mineAreaPolygonUtm))
{
double x = pointUtm.x - mineAreaPointUTM.x();
@@ -7,6 +7,7 @@
*/
#include "handler_mine_corridor.h"
#include <utility>
#include "object_mine_corridor.h"
#include "mine_corridor_creator.h"
@@ -47,11 +48,11 @@ bool HandlerMineCorridor::init()
// create area mine objects
QVector<Database::AesMineCorridorSegment> mySegments;
for (const Database::AesMineCorridor &area : qAsConst(areaVec))
for (const Database::AesMineCorridor &area : std::as_const(areaVec))
{
// Gather segments
mySegments.clear();
for (const Database::AesMineCorridorSegment &mas : qAsConst(segmentVec))
for (const Database::AesMineCorridorSegment &mas : std::as_const(segmentVec))
{
if (mas.mineCorridorId == area.id)
mySegments << mas;
@@ -7,6 +7,7 @@
*/
#include "handler_ncontamination.h"
#include <utility>
#include "Utils/polygons.h"
#include <QPolygonF>
@@ -33,7 +34,7 @@ bool HandlerNContamination::init()
DEBUG_LOG(m_logger) << "TotalC: " << totalAreasCentral() << " Total: " << totalAreas();
for (const Database::AesNContamination &dbData : qAsConst(dataVec))
for (const Database::AesNContamination &dbData : std::as_const(dataVec))
{
ObjectNContamination *ifs(new ObjectNContamination(m_mainHandler, this));
connect(ifs, &ObjectNContamination::effectStateChanged, this, &HandlerNContamination::onEffectStateChanged);
@@ -7,6 +7,7 @@
*/
#include "handler_recon_area.h"
#include <utility>
#include <Services/AreaEffectSimulation/Utils/polygons.h>
#include <QPolygonF>
@@ -31,7 +32,7 @@ bool HandlerReconArea::init()
}
// create Recon area objects
for (const Database::AesReconArea &dbData : qAsConst(dataVec))
for (const Database::AesReconArea &dbData : std::as_const(dataVec))
{
ObjectReconArea *ifs(new ObjectReconArea(m_mainHandler, this));
connect(ifs, &ObjectReconArea::effectStateChanged, this, &HandlerReconArea::onEffectStateChanged);
@@ -7,6 +7,7 @@
*/
#include "handler_technical_area.h"
#include <utility>
#include <QPolygonF>
@@ -31,7 +32,7 @@ bool HandlerTechnicalArea::init()
}
// create Technical area objects
for (const Database::AesTechnicalArea &dbData : qAsConst(dataVec))
for (const Database::AesTechnicalArea &dbData : std::as_const(dataVec))
{
ObjectTechnicalArea *ifs(new ObjectTechnicalArea(m_mainHandler, this));
connect(ifs, &ObjectTechnicalArea::effectStateChanged, this, &HandlerTechnicalArea::onEffectStateChanged);
@@ -6,6 +6,7 @@
*/
#include "meteo_data_provider.h"
#include <utility>
#include "main_handler.h"
#include <LtsCoordTrans/lts_coord_trans.h>
#include "settings.h"
@@ -55,7 +56,7 @@ MeteoDataManagement::MeteoData MeteoDataProvider::getNearestWeather(const Core::
LtsCoordTrans::UtmCoordinate utm(LtsCoordTrans::UtmCoordinate::fromGeographic(pos.lon(), pos.lat()));
double nearestDistanceSquared = std::numeric_limits<double>::max();
MeteoDataManagement::MeteoData retMd;
for (const auto &md : qAsConst(m_meteoData))
for (const auto &md : std::as_const(m_meteoData))
{
if (md.isStaticMeteoData())
continue;
@@ -95,7 +96,7 @@ void MeteoDataProvider::initWeatherData()
return;
m_mdmDtc->waitForHistoricalDataMeteoData();
m_meteoData = m_mdmDtc->meteoDatas();
for (const auto &data : qAsConst(m_meteoData))
for (const auto &data : std::as_const(m_meteoData))
if (data.isStaticMeteoData())
{
m_staticWeatherId = data.id();
@@ -7,6 +7,7 @@
*/
#include "mine_corridor_creator.h"
#include <utility>
#include "object_mine_corridor.h"
#include <TrainingAreaBase/tab_dtc.h>
@@ -97,7 +98,7 @@ void MineCorridorCreator::checkCorridorData(bool bFinished)
DEBUG_LOG(m_logger) << "Checking corridor data (finished: " << bFinished << ") for equipment " << m_equipNo;
std::vector<LtsCoordTrans::UtmCoordinate> coords;
coords.reserve(m_sortedCorridorData.size());
for (const auto &c : qAsConst(m_sortedCorridorData))
for (const auto &c : std::as_const(m_sortedCorridorData))
coords.push_back(c);
const auto coordsSmoothed = ramerDouglasPeucker(coords, s_smoothDistance);
DEBUG_LOG(m_logger) << "Calculated points:";
@@ -8,6 +8,7 @@
#pragma once
#include <QObject>
#include <utility>
#include <QPolygonF>
#include <QTimer>
@@ -148,7 +149,7 @@ class ObjectBase : public QObject
{
QPolygonF out;
out.reserve(in.size());
for (const auto &pos : qAsConst(in))
for (const auto &pos : std::as_const(in))
out.push_back(QPointF(pos.lon(), pos.lat()));
return out;
@@ -7,6 +7,7 @@
*/
#include "object_borderline.h"
#include <utility>
#include "special_area_provider.h"
#include <QPolygonF>
@@ -125,7 +126,7 @@ Core::FunctionReplyObject ObjectBorderline::updateObject(const Database::AesBord
}
// update all AesBorderlineSegments in database
for (const Database::AesBorderlineSegment &segment : qAsConst(tmpDbSegments))
for (const Database::AesBorderlineSegment &segment : std::as_const(tmpDbSegments))
{
if (!m_mainHandler->db()->update(segment))
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Error updating AesBorderlineSegment-data in database."));
@@ -6,6 +6,7 @@
*/
#include "object_danger_area.h"
#include <utility>
#include "special_area_provider.h"
#include "Utils/polygons.h"
@@ -130,7 +131,7 @@ Core::FunctionReplyObject ObjectDangerArea::updateObject(const Database::AesDang
for (size_t i = 0; i < segments.size(); ++i)
tmpSegments[i].position = QPointF(segments[i].lon(), segments[i].lat());
for (const Database::AesDangerSegment &segment : qAsConst(tmpSegments))
for (const Database::AesDangerSegment &segment : std::as_const(tmpSegments))
{
if (!m_mainHandler->db()->update(segment))
return Core::FunctionReplyObject(data.id, tr_lts("dds", "Error updating AesDangerSegment-data in database."));
@@ -241,7 +242,7 @@ void ObjectDangerArea::removeTopics()
auto dts = m_mainHandler->dds()->dts();
dts->removeDangerAreaByKey(m_data.id);
dts->removeAesItemViewByKey(1000 * m_data.id + AesType::inner_enum::AtDangerArea);
for (int idx : qAsConst(m_correlatedAesItems))
for (int idx : std::as_const(m_correlatedAesItems))
dts->removeDangerAreaCorrelatedAesItemByKey(idForCorrelatedItem(idx));
m_correlatedAesItems.clear();
emit removeAiv(m_data.id);
@@ -254,7 +255,7 @@ void ObjectDangerArea::onUpdateCorrelation()
// If Danger Area is not active, remove correlations and return
if (effectState() != AesEffectState::EsActivated)
{
for(int oldItem : qAsConst(m_correlatedAesItems))
for(int oldItem : std::as_const(m_correlatedAesItems))
m_mainHandler->dds()->dts()->removeDangerAreaCorrelatedAesItemByKey(idForCorrelatedItem(oldItem));
m_correlatedAesItems.clear();
return;
@@ -7,6 +7,7 @@
*/
#include "object_effect_cluster.h"
#include <utility>
#include "Utils/polygons.h"
#include "handler_charge_administration.h"
#include "handler_charge_effect.h"
@@ -461,9 +462,9 @@ Core::FunctionReplyObject ObjectEffectCluster::updateObject(const Database::AesE
int oldImpactCount = 0;
int newImpactCount = 0;
for (const auto &oldEffector : qAsConst(m_effectorData))
for (const auto &oldEffector : std::as_const(m_effectorData))
oldImpactCount += oldEffector.chargeAmount;
for (const auto &newEffector : qAsConst(effectorDatas))
for (const auto &newEffector : std::as_const(effectorDatas))
newImpactCount += newEffector.chargeAmount;
if (oldImpactCount != newImpactCount)
@@ -686,7 +687,7 @@ bool ObjectEffectCluster::initialCalculations(QString *reasonOut)
mtps_asUtm.resize(m_data.impactCount);
m_temporaryData.mhPoints.reserve(mtps_asUtm.size());
for (const QPointF &mtp_asUtm : qAsConst(mtps_asUtm))
for (const QPointF &mtp_asUtm : std::as_const(mtps_asUtm))
{
LtsCoordTrans::UtmCoordinate temp(impactPositionUtm.zone, mtp_asUtm.x(), mtp_asUtm.y());
m_temporaryData.mhPoints.emplace_back(Core::GeoPosition2D(temp.geographic().x(), temp.geographic().y()));
@@ -1435,7 +1436,7 @@ void ObjectEffectCluster::publishAiv()
const QVector<QPointF> &singleExplosions = Polygons::effectClusterSingleExplosionsGAUSS_Mtp(m_data, m_effectorData);
singleEffectsRef.reserve(singleExplosions.size());
for (const QPointF &singleExplosion : qAsConst(singleExplosions))
for (const QPointF &singleExplosion : std::as_const(singleExplosions))
{
SingleEffect se;
se.singleEffectState(AesSingleEffectState_def::SesScheduled);
@@ -1616,7 +1617,7 @@ void ObjectEffectCluster::markAsExpired(bool fireLoadedRound)
DEBUG_LOG(m_logger) << "TimerTimeout we will now send Confirmation for " << m_data.id;
// send confirmation for all Effectors then mark as expired (with false)
for (const auto effector : qAsConst(m_effectorData))
for (const auto effector : std::as_const(m_effectorData))
{
onSendConfirmationReportToTab(effector.participantId);
}
@@ -2036,7 +2037,7 @@ void ObjectEffectCluster::onEffectorFired(int participantId, int aesItemId, cons
if (chargeEffectIds.size() > 1) // we need to find the last and first one
{
for (const auto id : qAsConst(chargeEffectIds))
for (const auto id : std::as_const(chargeEffectIds))
{
const auto &chargeEffect = m_mainHandler->chargeEffectHandler()->getChargeEffectById(id);
if (chargeEffect->getEffectStart() > lastChargeEffect.second)
@@ -2547,7 +2548,7 @@ bool ObjectEffectCluster::generateTrajectoryVulcanoSpecific(int explosionNumber,
// "convert" from time-aware curve 'back' to time-unaware trajectoryGeometry
tdRef.trajectoryGeometry.clear();
for (const Core::GeoPositionRelativeTime &geoPosRelTime : qAsConst(tdRef.trajectoryTimeAware.geometry()))
for (const Core::GeoPositionRelativeTime &geoPosRelTime : std::as_const(tdRef.trajectoryTimeAware.geometry()))
tdRef.trajectoryGeometry.emplace_back(geoPosRelTime); // implicit // downcast
tdRef.peakHeightAbs = peakHeightRelToOrigin + originatorPosition_geo.z();
@@ -2722,7 +2723,7 @@ void ObjectEffectCluster::sendCalculateTrajectoryAdlerRequest(const QVector<Data
QString reason;
for (const auto &data : qAsConst(effectorData))
for (const auto &data : std::as_const(effectorData))
{
DEBUG_LOG(m_logger) << "TRY to send Calcualte TrajecotryAdlerReuqest for participantId=" << data.participantId;
@@ -3048,7 +3049,7 @@ void ObjectEffectCluster::publishTrajectory(int explosionIndex)
#define REDUCED_DISTRIBUTION // [GUEZE-2462] Darstellung Flugparabel Steilfeuer
#ifdef REDUCED_DISTRIBUTION
const int trajSize = trajectoryGeometry.size();
for (const Core::GeoPosition &pos3D : qAsConst(trajectoryGeometry))
for (const Core::GeoPosition &pos3D : std::as_const(trajectoryGeometry))
{
// if (!m_isAirSupportSource)
{
@@ -3076,7 +3077,7 @@ void ObjectEffectCluster::publishTrajectory(int explosionIndex)
} // for
#else
for (const Core::GeoPosition &pos3D : qAsConst(trajectoryGeometry))
for (const Core::GeoPosition &pos3D : std::as_const(trajectoryGeometry))
{
geometryRef.emplace_back(Core::GeoPositionRelativeTime(pos3D.lon(), pos3D.lat(), pos3D.z(), idx * flightDurationMSecSeg));
++idx;
@@ -7,6 +7,7 @@
*/
#include "object_explosion_cluster.h"
#include <utility>
#include "Utils/polygons.h"
#include "handler_charge_administration.h"
#include "handler_trajectory.h"
@@ -299,7 +300,7 @@ Core::FunctionReplyObject ObjectExplosionCluster::createObject(const Database::A
// DEBUG_LOG(m_logger) << "data.damagePercent() > 80. Check, if m_trajectoryCont contains building:" << data.id()
// << " aesItemId=" << m_aiv.aesItemId();
// for (const TracjectoryData &tracjectoryData : qAsConst(m_trajectoryCont))
// for (const TracjectoryData &tracjectoryData : std::as_const(m_trajectoryCont))
// {
// DEBUG_LOG(m_logger) << "print_m_trajectory"
// << " value: index=" << tracjectoryData.index
@@ -514,7 +515,7 @@ bool ObjectExplosionCluster::initialCalculations(QString *reasonOut)
mtps_asUtm.resize(m_data.impactCount);
m_temporaryData.mhPoints.reserve(mtps_asUtm.size());
for (const QPointF &mtp_asUtm : qAsConst(mtps_asUtm))
for (const QPointF &mtp_asUtm : std::as_const(mtps_asUtm))
{
LtsCoordTrans::UtmCoordinate temp(impactPositionUtm.zone, mtp_asUtm.x(), mtp_asUtm.y());
m_temporaryData.mhPoints.emplace_back(Core::GeoPosition2D(temp.geographic().x(), temp.geographic().y()));
@@ -1515,7 +1516,7 @@ void ObjectExplosionCluster::publishAiv()
int explosionIndex = 0;
singleEffectsRef.reserve(singleExplosions.size());
for (const QPointF &singleExplosion : qAsConst(singleExplosions))
for (const QPointF &singleExplosion : std::as_const(singleExplosions))
{
SingleEffect se;
se.singleEffectState(AesSingleEffectState_def::SesScheduled);
@@ -1652,7 +1653,7 @@ void ObjectExplosionCluster::removeTopics()
#ifdef USE_TRAJECTORY_VIA_HANDLER
// remove TrajectoryTimeAware created via Handler:
// topicIds are stored at m_trajectoryHandlerExplosionIndexToTopicId
for (int topicId : qAsConst(m_trajectoryHandlerExplosionIndexToTopicId))
for (int topicId : std::as_const(m_trajectoryHandlerExplosionIndexToTopicId))
{
dts->removeTrajectoryTimeAwareByKey(topicId);
}
@@ -2478,7 +2479,7 @@ bool ObjectExplosionCluster::generateTrajectoryVulcanoSpecific(int explosionNumb
// "convert" from time-aware curve 'back' to time-unaware trajectoryGeometry
tdRef.trajectoryGeometry.clear();
for (const Core::GeoPositionRelativeTime &geoPosRelTime : qAsConst(tdRef.trajectoryTimeAware.geometry()))
for (const Core::GeoPositionRelativeTime &geoPosRelTime : std::as_const(tdRef.trajectoryTimeAware.geometry()))
tdRef.trajectoryGeometry.emplace_back(geoPosRelTime); // implicit // downcast
tdRef.peakHeightAbs = peakHeightRelToOrigin + originatorPosition_geo.z();
@@ -2749,7 +2750,7 @@ void ObjectExplosionCluster::publishTrajectory(int explosionIndex)
#define REDUCED_DISTRIBUTION // [GUEZE-2462] Darstellung Flugparabel Steilfeuer
#ifdef REDUCED_DISTRIBUTION
const int trajSize = trajectoryGeometry.size();
for (const Core::GeoPosition &pos3D : qAsConst(trajectoryGeometry))
for (const Core::GeoPosition &pos3D : std::as_const(trajectoryGeometry))
{
// if (!m_isAirSupportSource)
{
@@ -2777,7 +2778,7 @@ void ObjectExplosionCluster::publishTrajectory(int explosionIndex)
} // for
#else
for (const Core::GeoPosition &pos3D : qAsConst(trajectoryGeometry))
for (const Core::GeoPosition &pos3D : std::as_const(trajectoryGeometry))
{
geometryRef.emplace_back(Core::GeoPositionRelativeTime(pos3D.lon(), pos3D.lat(), pos3D.z(), idx * flightDurationMSecSeg));
++idx;
@@ -2930,7 +2931,7 @@ void ObjectExplosionCluster::dump(const char *file, int lineNo) const
DEBUG_LOG(m_logger) << m_data.id << ", DUMP: m_trajectoryCont.keys()= " << trajectoryContKeys;
DEBUG_LOG(m_logger) << m_data.id << ", DUMP: m_publisedTrajectoriesForDebug.size = " << m_publisedTrajectoriesForDebug.size();
for (const auto &item : qAsConst(m_publisedTrajectoriesForDebug))
for (const auto &item : std::as_const(m_publisedTrajectoriesForDebug))
DEBUG_LOG(m_logger) << m_data.id << ", DUMP: m_publisedTrajectoriesForDebug = " << item;
DEBUG_LOG(m_logger) << "END ******* DUMP: id = " << m_data.id << ", name = '" << m_data.name << "' **************";
@@ -7,6 +7,7 @@
*/
#include "object_gas_pipe.h"
#include <utility>
#include "special_area_provider.h"
#include <QPolygonF>
@@ -133,7 +134,7 @@ Core::FunctionReplyObject ObjectGasPipe::updateObject(const Database::AesGasPipe
}
// update all AesGasPipeSegments in database
for (const Database::AesGasPipeSegment &segment : qAsConst(tmpDbSegments))
for (const Database::AesGasPipeSegment &segment : std::as_const(tmpDbSegments))
{
if (!m_mainHandler->db()->update(segment))
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Error updating AesGasPipeSegment-data in database."));
@@ -6,6 +6,7 @@
*/
#include "object_mine_area.h"
#include <utility>
#include "handler_mine_area.h"
#include "qtransform.h"
#include "special_area_provider.h"
@@ -116,7 +117,7 @@ int ObjectMineArea::getMineIdByIndex(int index) const
DEBUG_LOG(m_logger) << "getMineIdByIndex index: " << index;
int count = 0;
for (const Database::AesMineAreaTriggeredMines &tm : qAsConst(m_triggeredMines))
for (const Database::AesMineAreaTriggeredMines &tm : std::as_const(m_triggeredMines))
{
DEBUG_LOG(m_logger) << "tm: mineId: " << tm.mineId;
if (count == index)
@@ -150,7 +151,7 @@ void ObjectMineArea::clearCorridor(const AesItemView &aiv)
QVector<int> minesToTrigger;
minesToTrigger.reserve(m_triggeredMines.size());
for (const Database::AesMineAreaTriggeredMines &tm : qAsConst(m_triggeredMines))
for (const Database::AesMineAreaTriggeredMines &tm : std::as_const(m_triggeredMines))
{
LtsCoordTrans::UtmCoordinate utmMinePos = LtsCoordTrans::UtmCoordinate::fromGeographic(tm.position, zone);
if (aivUtmPoly.containsPoint(QPointF(utmMinePos.x, utmMinePos.y), Qt::OddEvenFill))
@@ -170,14 +171,14 @@ void ObjectMineArea::clearBuildings()
DEBUG_LOG(m_logger) << "mseIds size: " << mseIds.size();
QVector<int> minesToTrigger;
for (int mseId : qAsConst(mseIds))
for (int mseId : std::as_const(mseIds))
{
DEBUG_LOG(m_logger) << "mseId: " << mseId;
const QPolygonF &footprint = m_mainHandler->dds()->ismDtc()->getUtmFootprintById(mseId, zoneOut, isGroundLevel);
minesToTrigger.clear();
minesToTrigger.reserve(m_triggeredMines.size());
for (const Database::AesMineAreaTriggeredMines &tm : qAsConst(m_triggeredMines))
for (const Database::AesMineAreaTriggeredMines &tm : std::as_const(m_triggeredMines))
{
const LtsCoordTrans::UtmCoordinate &utmMinePos = LtsCoordTrans::UtmCoordinate::fromGeographic(tm.position, zoneOut);
if (footprint.containsPoint(QPointF(utmMinePos.x, utmMinePos.y), Qt::OddEvenFill))
@@ -349,7 +350,7 @@ bool ObjectMineArea::publishTriggeredImpacts()
tis.bitfield().resize((m_triggeredMines.size() + 7) / 8);
int i = 0;
for (const auto &mine : qAsConst(m_triggeredMines))
for (const auto &mine : std::as_const(m_triggeredMines))
{
// Triggered Impact == 0, if mine is disarmed/exploded
LtsUtils::BitArray::setBit(tis.bitfield(), i++, !mine.isTriggered);
@@ -373,7 +374,7 @@ bool ObjectMineArea::publishDusMineStatus()
dms.mines().resize(m_triggeredMines.size());
int i = 0;
for (const auto &mine : qAsConst(m_triggeredMines))
for (const auto &mine : std::as_const(m_triggeredMines))
{
const DusMine entry(mine.mineId, mine.isTriggered, mine.chargeTypeId, {mine.position.x(), mine.position.y()});
dms.mines()[i++] = entry;
@@ -399,7 +400,7 @@ Core::FunctionReplyObject ObjectMineArea::changeSegmentsToLine(bool sortMines)
QVector<LtsCoordTrans::UtmCoordinate> polyUtm;
polyUtm.reserve(m_mineAreaPolygon.size());
for (const QPointF &point : qAsConst(m_mineAreaPolygon))
for (const QPointF &point : std::as_const(m_mineAreaPolygon))
{
LtsCoordTrans::UtmCoordinate posUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(point.x(), point.y());
DEBUG_LOG(m_logger) << "mineArea Polygon: " << posUtm.mgrs();
@@ -408,14 +409,14 @@ Core::FunctionReplyObject ObjectMineArea::changeSegmentsToLine(bool sortMines)
QVector<LtsCoordTrans::UtmCoordinate> minesUtm;
minesUtm.reserve(m_triggeredMines.size());
for (const Database::AesMineAreaTriggeredMines &tm : qAsConst(m_triggeredMines))
for (const Database::AesMineAreaTriggeredMines &tm : std::as_const(m_triggeredMines))
{
LtsCoordTrans::UtmCoordinate posUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(tm.position.x(), tm.position.y());
DEBUG_LOG(m_logger) << "triggeredMines: " << posUtm.mgrs();
minesUtm.append(posUtm);
}
for (const Database::AesMineAreaTriggeredMines &tm : qAsConst(m_triggeredMines))
for (const Database::AesMineAreaTriggeredMines &tm : std::as_const(m_triggeredMines))
{
Core::GeoPosition2D geoPos = Core::GeoPosition2D(tm.position.x(), tm.position.y());
vec.append(geoPos);
@@ -434,7 +435,7 @@ Core::FunctionReplyObject ObjectMineArea::changeSegmentsToLine(bool sortMines)
// In case of MineLayerPoisition (Not Sorting) with DUS Mines and more than 2 Mines (1 Segment) we
// ignore the mines and just use the segments positions (Start is the startingPos of the the first segment
// then add all end Positions of all segments
for (const auto &segment : qAsConst(m_segments))
for (const auto &segment : std::as_const(m_segments))
{
if (vecSorted.empty())
vecSorted.push_back(Core::GeoPosition2D(segment.startPosition.x(), segment.startPosition.y()));
@@ -472,7 +473,7 @@ Core::FunctionReplyObject ObjectMineArea::changeSegmentsToLine(bool sortMines)
DEBUG_LOG(m_logger) << "Distance between startPos and pos: " << length;
Core::GeoPosition2D newPos = pos;
for (const Core::GeoPosition2D &pos2 : qAsConst(vec))
for (const Core::GeoPosition2D &pos2 : std::as_const(vec))
{
if (pos2 == pos || pos2 == startPos)
continue;
@@ -1034,7 +1035,7 @@ bool ObjectMineArea::containsPointInExpandedMinefield(const QPointF &positionGeo
const double distance = 0.5;
for (const QPointF &mineAreaPointUTM : qAsConst(mineAreaPolygonUtm))
for (const QPointF &mineAreaPointUTM : std::as_const(mineAreaPolygonUtm))
{
double x = pointUtm.x - mineAreaPointUTM.x();
@@ -1138,7 +1139,7 @@ void ObjectMineArea::updateMineByOldMineId(Database::AesMineAreaTriggeredMines &
int ObjectMineArea::mineCount()
{
double totalLength = 0.0;
for (const Database::AesMineAreaSegment &segment : qAsConst(m_segments))
for (const Database::AesMineAreaSegment &segment : std::as_const(m_segments))
{
LtsCoordTrans::UtmCoordinate startPositionUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(segment.startPosition);
LtsCoordTrans::UtmCoordinate endPositionUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(segment.endPosition, startPositionUtm.zone);
@@ -1351,7 +1352,7 @@ void ObjectMineArea::onPublishData()
std::vector<MineSegment> segVec;
segVec.reserve(m_segments.size());
for (const auto &segment : qAsConst(m_segments))
for (const auto &segment : std::as_const(m_segments))
segVec.emplace_back(
MineSegment(Core::GeoPosition2D(segment.startPosition.x(), segment.startPosition.y()), Core::GeoPosition2D(segment.endPosition.x(), segment.endPosition.y())));
@@ -1442,7 +1443,7 @@ void ObjectMineArea::publishAiv()
aiv2.effectStart(toMSec(m_data.effectStart));
aiv2.form().clear();
aiv2.form().reserve(m_triggeredMines.size());
for (const auto &tm : qAsConst(m_triggeredMines))
for (const auto &tm : std::as_const(m_triggeredMines))
aiv2.form().resize(aiv2.form().size() + 1, Core::GeoPosition(tm.position.x(), tm.position.y(), 0.0));
aiv2.boundingBoxBottomLeft(aiv.boundingBoxBottomLeft());
aiv2.boundingBoxTopRight(aiv.boundingBoxTopRight());
@@ -1493,7 +1494,7 @@ Core::FunctionReplyObject ObjectMineArea::createGeoSegmentsFromMineData(double &
std::vector<Core::GeoPosition2D> tempMinePos;
tempMinePos.reserve(m_triggeredMines.size() + mineData.size());
for (const auto &t : qAsConst(m_triggeredMines))
for (const auto &t : std::as_const(m_triggeredMines))
tempMinePos.emplace_back(Core::GeoPosition2D(t.position.x(), t.position.y()));
for (const auto &md : mineData)
@@ -6,6 +6,7 @@
*/
#include "object_mine_area_null.h"
#include <utility>
#include "special_area_provider.h"
#include <QPolygonF>
@@ -73,7 +74,7 @@ bool ObjectMineAreaNull::isVirtualMine() const
int ObjectMineAreaNull::lastConcreteMineNo()
{
int lastMineNo = 0;
for (const Database::AesMineAreaTriggeredMines &mine : qAsConst(m_triggeredMines))
for (const Database::AesMineAreaTriggeredMines &mine : std::as_const(m_triggeredMines))
{
// NOTE: igniterType/IgniterFunciton = 0 as long as AesMineAreaTriggeredMines does not contain values
DEBUG_LOG(m_logger) << "mine: chargeTypeId " << mine.chargeTypeId << ", mineId: " << mine.mineId;
@@ -245,7 +246,7 @@ void ObjectMineAreaNull::publishAiv()
vec.reserve(m_triggeredMines.size());
QPolygonF tmp;
tmp.reserve(m_triggeredMines.size());
for (const auto &mine : qAsConst(m_triggeredMines))
for (const auto &mine : std::as_const(m_triggeredMines))
{
vec.emplace_back(Core::GeoPosition(mine.position.x(), mine.position.y(), 0));
tmp.push_back(mine.position);
@@ -285,7 +286,7 @@ bool ObjectMineAreaNull::publishTriggeredImpacts()
tis.setId(dds::core::optional<rti::core::int64>(m_setId));
int i = 0;
for (const auto &mine : qAsConst(m_triggeredMines))
for (const auto &mine : std::as_const(m_triggeredMines))
{
// Triggered Impact == 0, if mine is disarmed/exploded
LtsUtils::BitArray::setBit(tis.bitfield(), i++, !mine.isTriggered);
@@ -307,7 +308,7 @@ bool ObjectMineAreaNull::publishDusMineStatus()
dms.mines().resize(m_triggeredMines.size());
dms.setId(dds::core::optional<rti::core::int64>(m_setId));
int i = 0;
for (const auto &mine : qAsConst(m_triggeredMines))
for (const auto &mine : std::as_const(m_triggeredMines))
{
const DusMine entry(mine.mineId, mine.isTriggered, mine.chargeTypeId, {mine.position.x(), mine.position.y()});
dms.mines()[i++] = entry;
@@ -328,7 +329,7 @@ QPolygonF ObjectMineAreaNull::generateForm()
vec.reserve(m_triggeredMines.size());
QPolygonF tmp;
tmp.reserve(m_triggeredMines.size());
for (const auto &mine : qAsConst(m_triggeredMines))
for (const auto &mine : std::as_const(m_triggeredMines))
{
vec.emplace_back(Core::GeoPosition(mine.position.x(), mine.position.y(), 0));
tmp.push_back(mine.position);
@@ -6,6 +6,7 @@
*/
#include "object_mine_corridor.h"
#include <utility>
#include "special_area_provider.h"
#include "Utils/polygons.h"
@@ -140,7 +141,7 @@ Core::FunctionReplyObject ObjectMineCorridor::updateObject(const Database::AesMi
for (size_t i = 0; i < segments.size(); ++i)
tmpSegments[i].position = QPointF(segments[i].lon(), segments[i].lat());
for (const Database::AesMineCorridorSegment &segment : qAsConst(tmpSegments))
for (const Database::AesMineCorridorSegment &segment : std::as_const(tmpSegments))
{
if (!m_mainHandler->db()->update(segment))
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Error updating AesMineCorridorSegment-data in database."));