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

Migrates remaining services and plugins to generated rtiddsgen API

Browse Source 
Converts accessor calls to plain member access across the residual service set.
This commit is contained in:
berrux-dev committed 2026-09-21 02:47:48 +02:00
1 parent 6a8c31b735
commit c3eda18234
104 files changed
+2424 -2430
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_emergency_call.cpp
+48 -48
View File
@@ -76,18 +76,18 @@ bool HandlerEmergencyCall::init()
bool HandlerEmergencyCall::createEmergencyCallObject(const AlarmManagement::AlmEmergencyCall &data)
{
if (!isNewEmergencyCall(data) || std::isnan(data.position().lat()))
if (!isNewEmergencyCall(data) || std::isnan(data.position.lat))
return false;
Database::AlmEmergencyCall newData;
newData.id = 0;
newData.operatorId = 0;
newData.sampleTime = data.sampleTime();
newData.incomingTime = data.sampleTime();
newData.sampleTime = data.sampleTime;
newData.incomingTime = data.sampleTime;
newData.expired = false;
newData.issi = data.issi();
newData.position.setX(data.position().lon());
newData.position.setY(data.position().lat());
newData.issi = data.issi;
newData.position.setX(data.position.lon);
newData.position.setY(data.position.lat);
newData.comment = QStringLiteral("");
newData.name = QStringLiteral("");
ObjectEmergencyCall *ifs(new ObjectEmergencyCall(m_mainHandler, this));
@@ -111,18 +111,18 @@ void HandlerEmergencyCall::onEmergencyCallAcknowledgeRequest(const rti::core::Sa
if (ret.error())
WARNING_LOG(m_logger)<< ret();
if (request.expired())
if (request.expired)
{
AcknowledgeSOSInAllExercises ackInEx;
ackInEx.id(request.id());
ackInEx.timestamp(request.timestamp());
ackInEx.incomingTime(request.incomingTime());
ackInEx.name(request.name());
ackInEx.issi(request.issi());
ackInEx.operatorId(request.operatorId());
ackInEx.comment(request.comment());
ackInEx.expired(request.expired());
WARNING_LOG(m_logger) << "onEmergencyCallAcknowledgeRequest: issi: "<<ackInEx.issi();
ackInEx.id = request.id;
ackInEx.timestamp = request.timestamp;
ackInEx.incomingTime = request.incomingTime;
ackInEx.name = request.name;
ackInEx.issi = request.issi;
ackInEx.operatorId = request.operatorId;
ackInEx.comment = request.comment;
ackInEx.expired = request.expired;
WARNING_LOG(m_logger) << "onEmergencyCallAcknowledgeRequest: issi: "<<ackInEx.issi;
m_mainHandler->dds()->publishSOS()->write(ackInEx);
}
m_mainHandler->dds()->ftsAlm()->emergencyCallAcknowledgeReply(cookie,ret);
@@ -134,8 +134,8 @@ Core::FunctionReplyObject HandlerEmergencyCall::emergencyCallAcknowledgeRequest(
for(auto _ifs : qAsConst(m_emergencyObjMap))
{
auto data = _ifs->getData();
if (data.issi == request.issi()
&& data.incomingTime == request.incomingTime()
if (data.issi == request.issi
&& data.incomingTime == request.incomingTime
&& !data.expired)
{
ifs = _ifs;
@@ -145,8 +145,8 @@ Core::FunctionReplyObject HandlerEmergencyCall::emergencyCallAcknowledgeRequest(
if (ifs == nullptr)
{
WARNING_LOG(m_logger)<<" Couldn't acknowledge SOS with issi: " <<request.issi()<< ": already acknowledged or issi doesn't exist.";
return Core::FunctionReplyObject(request.id(), tr_lts("dds", "already acknowledged or issi(%1) couldn't be found")).arg(request.issi());
WARNING_LOG(m_logger)<<" Couldn't acknowledge SOS with issi: " <<request.issi<< ": already acknowledged or issi doesn't exist.";
return Core::FunctionReplyObject(request.id, tr_lts("dds", "already acknowledged or issi(%1) couldn't be found")).arg(request.issi);
}
if (ifs->getData().expired) // if already expired do nothing
@@ -155,15 +155,15 @@ Core::FunctionReplyObject HandlerEmergencyCall::emergencyCallAcknowledgeRequest(
return Core::FunctionReplyObject(ifs->getData().id);
}
WARNING_LOG(m_logger) << "emergencyCallAcknowledgeRequest: issi found!: "<<request.issi()<<" ifs->state: "<<ifs->getData().expired;
WARNING_LOG(m_logger) << "emergencyCallAcknowledgeRequest: issi found!: "<<request.issi<<" ifs->state: "<<ifs->getData().expired;
Database::AlmEmergencyCall newData(ifs->getData());
newData.expired = true;
newData.issi = request.issi();
newData.sampleTime = request.timestamp();
newData.deleted = request.timestamp();
newData.operatorId = request.operatorId();
newData.name = QString::fromStdString(request.name());
newData.comment = QString::fromStdString(request.comment());
newData.issi = request.issi;
newData.sampleTime = request.timestamp;
newData.deleted = request.timestamp;
newData.operatorId = request.operatorId;
newData.name = QString::fromStdString(request.name);
newData.comment = QString::fromStdString(request.comment);
return ifs->updateObject(newData);
}
@@ -173,8 +173,8 @@ bool HandlerEmergencyCall::isExerciseValidForEmergencyCall() const
exmDtc->waitForHistoricalDataExercise();
const ExerciseManagement::Exercise exercise = exmDtc->exercise(m_mainHandler->dds()->exerciseId());
if (exercise.state() != ExerciseManagement::ExerciseState::Started
&& exercise.state() != ExerciseManagement::ExerciseState::Paused)
if (exercise.state != ExerciseManagement::ExerciseState::Started
&& exercise.state != ExerciseManagement::ExerciseState::Paused)
return false;
return true;
@@ -185,8 +185,8 @@ bool HandlerEmergencyCall::isNewEmergencyCall(const AlmEmergencyCall &newdata)
for(const auto &ifs : qAsConst(m_emergencyObjMap))
{
const auto &data = ifs->getData();
if (data.issi == newdata.issi()
&& data.incomingTime == newdata.incomingTime()
if (data.issi == newdata.issi
&& data.incomingTime == newdata.incomingTime
&& !data.expired)
{
WARNING_LOG(m_logger)<<" SOS EXISTS and not yet quit! issi: "<<data.issi<<" incomingTime: "<<data.incomingTime<<" expired: "<<data.expired;
@@ -202,16 +202,16 @@ void HandlerEmergencyCall::onEmergencyCallChanged(const TrainingAreaBase::Emerge
return;
AlarmManagement::AlmEmergencyCall emc;
emc.id(0);
emc.operatorId(0); // global
emc.sampleTime(data.sampleTime());
emc.incomingTime(data.sampleTime());
emc.expired(false);
emc.issi(data.equipmentNumber());
emc.id = 0;
emc.operatorId = 0; // global
emc.sampleTime = data.sampleTime;
emc.incomingTime = data.sampleTime;
emc.expired = false;
emc.issi = data.equipmentNumber;
Core::GeoPosition position;
position.lat(data.position().lat());
position.lon(data.position().lon());
emc.position(position);
position.lat = data.position.lat;
position.lon = data.position.lon;
emc.position = position;
createEmergencyCallObject(emc);
}
@@ -222,14 +222,14 @@ void HandlerEmergencyCall::onAcknowledgeSOSInExercises(const AcknowledgeSOSInAll
Q_UNUSED(modType)
EmergencyCallAcknowledgeRequest request;
request.comment(data.comment());
request.expired(data.expired());
request.id(data.id());
request.issi(data.issi());
request.incomingTime(data.incomingTime());
request.name(data.name());
request.timestamp(data.timestamp());
request.operatorId(data.operatorId());
request.comment = data.comment;
request.expired = data.expired;
request.id = data.id;
request.issi = data.issi;
request.incomingTime = data.incomingTime;
request.name = data.name;
request.timestamp = data.timestamp;
request.operatorId = data.operatorId;
emergencyCallAcknowledgeRequest(request);
DEBUG_LOG(m_logger)<< "onAcknowledgeEmergencyInExercises END ";