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

Migrates Participant and OperatorManagement to generated rtiddsgen API

Browse Source 
Converts accessor calls to plain member access in ppm and opm services and plugins.
This commit is contained in:
berrux-dev committed 2026-09-21 02:46:44 +02:00
1 parent bdb2461737
commit 95071993f5
36 files changed
+513 -529
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ModuleTests/ppm_tests.cpp
+91 -91
View File
@@ -136,20 +136,20 @@ void ParticipantManagement::PpmTests::tryCreateTemplate()
std::vector<ParticipantManagement::TemplateData> data;
ParticipantManagement::TemplateData td;
td.modId(100);
td.name("Test Template 100");
td.designator("100");
td.hierarchyNumber(100);
td.typeId(19);
td.superiorModId(1);
td.tacticalIdentifier("100");
td.modId = 100;
td.name = "Test Template 100";
td.designator = "100";
td.hierarchyNumber = 100;
td.typeId = 19;
td.superiorModId = 1;
td.tacticalIdentifier = "100";
data.push_back(td);
m_dtc->waitForHistoricalDataTemplateParticipant();
ParticipantManagement::TemplateParticipant tp = m_dtc->templateParticipant(1);
const ParticipantManagement::TemplateData tdSup(m_dtc->convertFromParticipantTemplateToTemplateData(tp));
DEBUG_LOG(m_logger) << "SuperiorModId: " << tdSup.modId();
DEBUG_LOG(m_logger) << "SuperiorModId: " << tdSup.modId;
data.push_back(tdSup);
@@ -168,18 +168,18 @@ void ParticipantManagement::PpmTests::tryCreateParticipant()
INFO_LOG(m_logger) << "Trying to send Create ParticipantData per ModifyParticipantData";
ParticipantManagement::ParticipantData ptd;
ptd.modId(1);
ptd.name("Test Participant 1");
ptd.typeId(m_typeId);
ptd.partyId(m_partyId);
ptd.equipmentNumber(m_equipmentId);
ptd.hierarchyNumber(1);
ptd.assignState(ParticipantManagement::ParticipantAssignState_def::HandoutExcon);
ptd.modId = 1;
ptd.name = "Test Participant 1";
ptd.typeId = m_typeId;
ptd.partyId = m_partyId;
ptd.equipmentNumber = m_equipmentId;
ptd.hierarchyNumber = 1;
ptd.assignState = ParticipantManagement::ParticipantAssignState::HandoutExcon;
std::vector<ParticipantManagement::ParticipantData> data;
data.push_back(ptd);
ModifyParticipantDataRequest req;
req.data(data);
req.data = data;
if (!m_ftc->modifyParticipantDataRequest(req,this))
{
@@ -196,11 +196,11 @@ void ParticipantManagement::PpmTests::tryUpdateInfoParticipant()
INFO_LOG(m_logger) << "Trying to send update info per registerForParticantRequest";
ParticipantManagement::RegisterParticipantRequest rpr;
rpr.participantId(m_participantId);
rpr.equipmentNumber(m_equipmentId);
rpr.assignState(ParticipantManagement::ParticipantAssignState_def::HandoutExcon);
rpr.identification("Test Indentification");
rpr.info("Test Info2");
rpr.participantId = m_participantId;
rpr.equipmentNumber = m_equipmentId;
rpr.assignState = ParticipantManagement::ParticipantAssignState::HandoutExcon;
rpr.identification = "Test Indentification";
rpr.info = "Test Info2";
if (!m_ftc->registerParticipantRequest(rpr,this))
{
@@ -216,11 +216,11 @@ void ParticipantManagement::PpmTests::tryRegisterParticipant()
INFO_LOG(m_logger) << "Trying to send registerForParticantRequest";
ParticipantManagement::RegisterParticipantRequest rpr;
rpr.participantId(m_participantId);
rpr.equipmentNumber(m_equipmentId);
rpr.assignState(ParticipantManagement::ParticipantAssignState_def::HandoutExcon);
rpr.identification("Test");
rpr.info("Test Info");
rpr.participantId = m_participantId;
rpr.equipmentNumber = m_equipmentId;
rpr.assignState = ParticipantManagement::ParticipantAssignState::HandoutExcon;
rpr.identification = "Test";
rpr.info = "Test Info";
if (!m_ftc->registerParticipantRequest(rpr,this))
{
@@ -237,18 +237,18 @@ void ParticipantManagement::PpmTests::tryCreateParty()
ParticipantManagement::Party party;
party.name("Test Party AAA");
party.role(ParticipantManagement::Role::Friend);
party.color(-65536);
party.fadingColor(-65536);
party.name = "Test Party AAA";
party.role = ParticipantManagement::Role::Friend;
party.color = -65536;
party.fadingColor = -65536;
ModifyPartyDataRequest req;
req.id(-1);
req.name(party.name());
req.color(party.color());
req.fadingColor(party.fadingColor());
req.role(party.role());
req.isUsedBy(false);
req.id = -1;
req.name = party.name;
req.color = party.color;
req.fadingColor = party.fadingColor;
req.role = party.role;
req.isUsedBy = false;
if (!m_ftc->modifyPartyDataRequest(req, this))
{
@@ -256,17 +256,17 @@ void ParticipantManagement::PpmTests::tryCreateParty()
failExit();
}
party.name("Test Party BBB");
party.role(ParticipantManagement::Role::Friend);
party.color(-16711936);
party.fadingColor(-16711936);
party.name = "Test Party BBB";
party.role = ParticipantManagement::Role::Friend;
party.color = -16711936;
party.fadingColor = -16711936;
req.id(-1);
req.name(party.name());
req.color(party.color());
req.fadingColor(party.fadingColor());
req.role(party.role());
req.isUsedBy(false);
req.id = -1;
req.name = party.name;
req.color = party.color;
req.fadingColor = party.fadingColor;
req.role = party.role;
req.isUsedBy = false;
if (!m_ftc->modifyPartyDataRequest(req, this))
{
@@ -274,17 +274,17 @@ void ParticipantManagement::PpmTests::tryCreateParty()
failExit();
}
party.name("Test Party CCC");
party.role(ParticipantManagement::Role::Enemy);
party.color(-16711936);
party.fadingColor(-16711936);
party.name = "Test Party CCC";
party.role = ParticipantManagement::Role::Enemy;
party.color = -16711936;
party.fadingColor = -16711936;
req.id(-1);
req.name(party.name());
req.color(party.color());
req.fadingColor(party.fadingColor());
req.role(party.role());
req.isUsedBy(false);
req.id = -1;
req.name = party.name;
req.color = party.color;
req.fadingColor = party.fadingColor;
req.role = party.role;
req.isUsedBy = false;
if (!m_ftc->modifyPartyDataRequest(req, this))
{
@@ -292,17 +292,17 @@ void ParticipantManagement::PpmTests::tryCreateParty()
failExit();
}
party.name("Test Party DDD");
party.role(ParticipantManagement::Role::Enemy);
party.color(-16711936);
party.fadingColor(-16711936);
party.name = "Test Party DDD";
party.role = ParticipantManagement::Role::Enemy;
party.color = -16711936;
party.fadingColor = -16711936;
req.id(-1);
req.name(party.name());
req.color(party.color());
req.fadingColor(party.fadingColor());
req.role(party.role());
req.isUsedBy(false);
req.id = -1;
req.name = party.name;
req.color = party.color;
req.fadingColor = party.fadingColor;
req.role = party.role;
req.isUsedBy = false;
if (!m_ftc->modifyPartyDataRequest(req, this))
{
@@ -323,19 +323,19 @@ void ParticipantManagement::PpmTests::tryModifyParty()
m_dtc->waitForHistoricalDataParty();
party = m_dtc->party(m_partyId);
if (party.id() < 0)
if (party.id < 0)
{
ERROR_LOG(m_logger) << "Party not found: id = " << m_partyId;
failExit();
}
ModifyPartyDataRequest req;
req.id(m_partyId);
req.name(std::string("Test Party ")+QString::number(m_partyId).toStdString()); // updating name
req.color(party.color());
req.fadingColor(party.fadingColor());
req.role(party.role());
req.isUsedBy(true); // updating isUsed
req.id = m_partyId;
req.name = std::string("Test Party ")+QString::number(m_partyId).toStdString(); // updating name
req.color = party.color;
req.fadingColor = party.fadingColor;
req.role = party.role;
req.isUsedBy = true; // updating isUsed
if (!m_ftc->modifyPartyDataRequest(req, this))
{
@@ -355,18 +355,18 @@ void ParticipantManagement::PpmTests::tryRemoveParty()
m_dtc->waitForHistoricalDataParty();
party = m_dtc->party(m_partyId);
if (party.id() < 0)
if (party.id < 0)
{
ERROR_LOG(m_logger) << "Party not found: id = " << m_partyId;
failExit();
}
RemovePartyRequest req;
req.partyId(m_partyId);
req.partyId = m_partyId;
if (!m_ftc->removePartyRequest(req,this))
{
if (party.isUsedBy())
if (party.isUsedBy)
{
INFO_LOG(m_logger) << "Not possible to delete used party!" ;
successExit();
@@ -387,7 +387,7 @@ void ParticipantManagement::PpmTests::trySyncParties()
INFO_LOG(m_logger) << "Trying to sync parties with Ex 0";
SyncPartiesRequest req;
req.exerciseId(42);
req.exerciseId = 42;
if (!m_ftc->syncPartiesRequest(req, this))
{
@@ -407,15 +407,15 @@ void ParticipantManagement::PpmTests::tryChangeUsed()
m_dtc->waitForHistoricalDataParty();
party = m_dtc->party(m_partyId);
if (party.id() < 0)
if (party.id < 0)
{
ERROR_LOG(m_logger) << "Party not found: id = " << m_partyId;
failExit();
}
ChangePartyUsedStateRequest req;
req.partyId(m_partyId);
req.isUsedBy(false); // updating isUsed
req.partyId = m_partyId;
req.isUsedBy = false; // updating isUsed
if (!m_ftc->changePartyUsedStateRequest(req, this))
{
@@ -433,14 +433,14 @@ void ParticipantManagement::PpmTests::tryCreateEquipmentType()
INFO_LOG(m_logger) << "Trying to send Create EquipmentType per ModifyEquipmentTypeDataRequest";
ParticipantManagement::EquipmentType etd;
etd.id(1);
etd.name("Test Equipment Type 1");
etd.minEquipNo(1000);
etd.maxEquipNo(1999);
etd.traVulnerabilityModelId(1);
etd.traPlayerTypeId(110);
etd.wmsTypeClass(ParticipantManagement::WmsTypeClass::Human);
etd.deletedInWms(false);
etd.id = 1;
etd.name = "Test Equipment Type 1";
etd.minEquipNo = 1000;
etd.maxEquipNo = 1999;
etd.traVulnerabilityModelId = 1;
etd.traPlayerTypeId = 110;
etd.wmsTypeClass = ParticipantManagement::WmsTypeClass::Human;
etd.deletedInWms = false;
std::vector<ParticipantManagement::EquipmentType> data;
data.push_back(etd);
@@ -581,7 +581,7 @@ void ParticipantManagement::PpmTests::onRemovePartyReply(const Core::FunctionRep
m_dtc->waitForHistoricalDataParty();
party = m_dtc->party(m_partyId);
if (replyObject.error() && !party.isUsedBy())
if (replyObject.error() && !party.isUsedBy)
{
onError(replyObject.translated());
return;
@@ -593,8 +593,8 @@ void ParticipantManagement::PpmTests::onRemovePartyReply(const Core::FunctionRep
void ParticipantManagement::PpmTests::onRegisterParticipantReply(const RegisterReply &reply)
{
ERROR_LOG(m_logger) << "onRegisterParticipantReply " << reply.errorString() << "exerciseId: " << reply.exerciseId();
for ( std::string str : reply.errorParams())
ERROR_LOG(m_logger) << "onRegisterParticipantReply " << reply.errorString << "exerciseId: " << reply.exerciseId;
for ( std::string str : reply.errorParams)
ERROR_LOG(m_logger) << "error params: " << str;
}