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

@@ -42,7 +42,7 @@ NGL_TARGET_LINK_LIBRARIES(svcExmCommon
PRIVATE
RTI::nddscpp2
PUBLIC
Qt5::Core
Qt6::Core
ddscore
NGLLogger
ngldb
@@ -168,7 +168,7 @@ NGL_TARGET_LINK_LIBRARIES(svcExerciseManagement
nglsettings
ngltools
ProjectConfig
Qt5::Core
Qt6::Core
svcCoreClient
svcExmCommon
svcExmServer
@@ -12,8 +12,8 @@ IF(BUILD_TESTING AND TARGET svcExmClient)
# Testing DataTopic and FunctionTopic Functionality (DTC+FTC)
ADD_EXECUTABLE(exmTests ${SRCS_TEST})
TARGET_LINK_LIBRARIES(exmTests
Qt5::Core
Qt5::Test
Qt6::Core
Qt6::Test
RTI::nddscpp2
svcExmClient
svcAsmClient
@@ -49,8 +49,8 @@ IF(BUILD_TESTING AND TARGET svcExmClient)
nglcoreapplication
NGLLogger
ngltools
Qt5::Core
Qt5::Test
Qt6::Core
Qt6::Test
svcCoreClient
svcExmCommon
svcExmServer
@@ -27,8 +27,8 @@ IF(BUILD_TESTING AND TARGET svcExmCommon)
ddsdtc
ddsQoS
ProjectConfig
Qt5::Core
Qt5::Test
Qt6::Core
Qt6::Test
)
ADD_TEST(NAME exmDtUnitTest COMMAND $<TARGET_FILE:exmDtUnitTest>)
@@ -7,6 +7,7 @@
*/
#include "exercise_state_machine.h"
#include <utility>
#include "exercise_state_manager.h"
#include "exercise_state_base.h"
@@ -77,7 +78,7 @@ ExerciseStateMachine::ExerciseStateMachine(ObjectExercise* objExe, QObject *pare
// ----------------------------------------------------------------------------------------------------------
//States zur StateMachine hinzufügen
for (ExerciseStateBase *state : qAsConst(m_exerciseStates))
for (ExerciseStateBase *state : std::as_const(m_exerciseStates))
{
DEBUG_LOG(m_logger) << "Ex " << exerciseId() << ": state: " << state->exerciseState();
m_stateMachine->addState(state);
@@ -7,6 +7,7 @@
*/
#include "handler_exercise.h"
#include <utility>
#include "exm_db.h"
#include "handler_exercise_phase.h"
#include "main_handler.h"
@@ -70,7 +71,7 @@ bool HandlerExercise::init()
QVector<QPair<int, ExerciseState>> exerciseStates;
exerciseStates.reserve(dataVec.size());
// create exercise objects
for (const Database::ExmExercise &data : qAsConst(dataVec))
for (const Database::ExmExercise &data : std::as_const(dataVec))
{
ObjectExercise *ifs(new ObjectExercise(m_ddsHandler, m_db, m_exTblGen, this));
Core::FunctionReplyObject ret = ifs->createObject(data);
@@ -106,7 +107,7 @@ bool HandlerExercise::init()
return a.first < b.first;
});
for (const auto &p : qAsConst(exerciseStates))
for (const auto &p : std::as_const(exerciseStates))
m_exercisesToStart.enqueue(p.first);
m_startupExerciseTimer->start();
@@ -211,7 +212,7 @@ Core::FunctionReplyObject HandlerExercise::exerciseCreateRequest(const ExerciseC
int iCnt = 0;
QSet<int> linkedExerciseIds;
for (const ObjectExercise *ex : qAsConst(m_exeObjMap))
for (const ObjectExercise *ex : std::as_const(m_exeObjMap))
{
const auto state = ex->exerciseState();
@@ -313,7 +314,7 @@ Core::FunctionReplyObject HandlerExercise::exerciseModifyRequest(const ExerciseM
int iCntRunningExercises = 0;
QSet<int> linkedExerciseIds;
for (const ObjectExercise *ex : qAsConst(m_exeObjMap))
for (const ObjectExercise *ex : std::as_const(m_exeObjMap))
{
const auto state = ex->exerciseState();
@@ -350,7 +351,7 @@ Core::FunctionReplyObject HandlerExercise::exerciseModifyRequest(const ExerciseM
if (request.newState() == ExerciseState::Stopped)
{
int iCnt = 0;
for (const ObjectExercise *ex : qAsConst(m_exeObjMap))
for (const ObjectExercise *ex : std::as_const(m_exeObjMap))
{
const auto state = ex->exerciseState();
if (ex->id() != request.id() && state == ExerciseState::Stopped)
@@ -365,7 +366,7 @@ Core::FunctionReplyObject HandlerExercise::exerciseModifyRequest(const ExerciseM
request.newState() == ExerciseState::Paused))
{
int iCnt = 0;
for (const ObjectExercise *ex : qAsConst(m_exeObjMap))
for (const ObjectExercise *ex : std::as_const(m_exeObjMap))
{
if (ex->id() != request.id() && ex->data().hasHlaInterface && (ex->exerciseState() == ExerciseState::Started ||
ex->exerciseState() == ExerciseState::Paused))
@@ -730,7 +731,7 @@ bool HandlerExercise::checkEquipmentNumbersOnAllExercises(int exerciseIdToBeStar
(ifs->exerciseState() == ExerciseState::Paused))
{
const std::vector<ParticipantManagement::Equipment2ParticipantId> &mapping = equipmentExerciseMapping.mapping();
for (const auto &eq2p : qAsConst(mapping))
for (const auto &eq2p : std::as_const(mapping))
if (eqNoForEx.contains(eq2p.equipmentNumber()))
{
DEBUG_LOG(m_logger) << LOGFUNCTION << " !!! eq = " << eq2p.equipmentNumber() << " is already used in exercise =" << exerciseId;
@@ -811,7 +812,7 @@ QStringList HandlerExercise::doubleChannels(int exerciseAId, int exerciseBId) co
doubleChannelNames.reserve(exerciseAChannelIds.size());
for (int exerciseAChannelId : qAsConst(exerciseAChannelIds))
for (int exerciseAChannelId : std::as_const(exerciseAChannelIds))
{
if (exerciseBChannelIds.contains(exerciseAChannelId))
doubleChannelNames.append(QString::fromStdString(m_ddsHandler->avmDtc()->cnrChannel(exerciseAChannelId).name()));