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

Migrates residual Lts sources to generated rtiddsgen API

Browse Source 
Adds NmeaManagement tests, fixes codegen includes and Qt6 SerialPort CMake target.
This commit is contained in:
berrux-dev committed 2026-09-23 12:05:37 +02:00
1 parent 5485a90385
commit 881d44f4dd
512 files changed
+6887 -6426
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_video_receiver.cpp
+37 -37
View File
@@ -30,7 +30,7 @@ ObjectVideoReceiver::~ObjectVideoReceiver()
Core::FunctionReplyObject ObjectVideoReceiver::createObject(const VideoReceiver &data)
{
m_data = data;
if (m_data.id() <= 0)
if (m_data.id <= 0)
{
Database::AvmVideoReceiver dbData;
dbData = toDbData(data);
@@ -38,55 +38,55 @@ Core::FunctionReplyObject ObjectVideoReceiver::createObject(const VideoReceiver
if (!m_db->insert(dbData))
return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting AvmVideoReceiver-data into database"));
m_data.id(dbData.id);
DEBUG_LOG(m_logger) << "New Id: " << m_data.id();
m_data.id = dbData.id;
DEBUG_LOG(m_logger) << "New Id: " << m_data.id;
}
// Publish Data via DTS
onPublishData();
return Core::FunctionReplyObject(m_data.id());
return Core::FunctionReplyObject(m_data.id);
}
//-------------------------------------------------------------------------------------------------------------
Core::FunctionReplyObject ObjectVideoReceiver::updateObject(const VideoReceiver &data)
{
m_data = data;
DEBUG_LOG(m_logger) << "ObjectVideoReceiver::updateObject id=" << data.id()
<< " isActive=" << data.isActive()
<< " hostName=" << data.hostName()
<< " isLocked=" << data.isLocked();
DEBUG_LOG(m_logger) << "ObjectVideoReceiver::updateObject id=" << data.id
<< " isActive=" << data.isActive
<< " hostName=" << data.hostName
<< " isLocked=" << data.isLocked;
Database::AvmVideoReceiver dbData(toDbData(data));
if (!m_db->update(dbData))
return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Error updating VideoReceiver2 into database"));
return Core::FunctionReplyObject(data.id, tr_lts("dds", "Error updating VideoReceiver2 into database"));
DEBUG_LOG(m_logger) << "Data changed for VideoReceiver Id: " << data.id();
DEBUG_LOG(m_logger) << "Data changed for VideoReceiver Id: " << data.id;
// Publish Data via DTS
onPublishData();
return Core::FunctionReplyObject(data.id());
return Core::FunctionReplyObject(data.id);
}
//-------------------------------------------------------------------------------------------------------------
Core::FunctionReplyObject ObjectVideoReceiver::removeObject()
{
if (!m_db->removeAvmVideoReceiver(m_data.id()))
return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "Video Receiver with id %1 can not be removed from DB")).arg(m_data.id());
if (!m_db->removeAvmVideoReceiver(m_data.id))
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Video Receiver with id %1 can not be removed from DB")).arg(m_data.id);
if (!m_dts->removeVideoReceiverByKey(m_data.id()))
return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "Video Receiver with id %1 can not be removed from DDS")).arg(m_data.id());
if (!m_dts->removeVideoReceiverByKey(m_data.id))
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Video Receiver with id %1 can not be removed from DDS")).arg(m_data.id);
return Core::FunctionReplyObject(m_data.id());
return Core::FunctionReplyObject(m_data.id);
}
//-------------------------------------------------------------------------------------------------------------
void ObjectVideoReceiver::onPublishData()
{
INFO_LOG(m_logger) << "Publish MvsVideoReceiver-data to dds (" << m_data.id() << ") ...";
INFO_LOG(m_logger) << "Publish MvsVideoReceiver-data to dds (" << m_data.id << ") ...";
if (!m_dts->publish(m_data))
ERROR_LOG(m_logger) << "Error publishing MvsVideoReceiver-data to dds";
@@ -97,15 +97,15 @@ Database::AvmVideoReceiver ObjectVideoReceiver::toDbData(const VideoReceiver &dd
{
Database::AvmVideoReceiver dbData;
dbData.id = ddsData.id();
dbData.streamName = QString::fromStdString(ddsData.streamName());
dbData.mainStructureElementId = ddsData.mainStructureElementId();
dbData.teamId = ddsData.teamId();
dbData.isActive = ddsData.isActive();
dbData.info = QString::fromStdString(ddsData.info());
dbData.hostName = QString::fromStdString(ddsData.hostName());
dbData.frequency = ddsData.frequency();
dbData.isLocked = ddsData.isLocked();
dbData.id = ddsData.id;
dbData.streamName = QString::fromStdString(ddsData.streamName);
dbData.mainStructureElementId = ddsData.mainStructureElementId;
dbData.teamId = ddsData.teamId;
dbData.isActive = ddsData.isActive;
dbData.info = QString::fromStdString(ddsData.info);
dbData.hostName = QString::fromStdString(ddsData.hostName);
dbData.frequency = ddsData.frequency;
dbData.isLocked = ddsData.isLocked;
return dbData;
}
@@ -114,19 +114,19 @@ Database::AvmVideoReceiver ObjectVideoReceiver::toDbData(const VideoReceiver &dd
AudioVideoManagement::VideoReceiver ObjectVideoReceiver::toDdsData(const Database::AvmVideoReceiver &dbData)
{
AudioVideoManagement::VideoReceiver ddsData;
ddsData.id(dbData.id);
ddsData.streamName(dbData.streamName.toStdString());
ddsData.mainStructureElementId(dbData.mainStructureElementId);
ddsData.teamId(dbData.teamId);
ddsData.isActive(dbData.isActive);
ddsData.isLocked(dbData.isLocked);
ddsData.info(dbData.info.toStdString());
ddsData.hostName(dbData.hostName.toStdString());
ddsData.frequency(dbData.frequency);
ddsData.id = dbData.id;
ddsData.streamName = dbData.streamName.toStdString();
ddsData.mainStructureElementId = dbData.mainStructureElementId;
ddsData.teamId = dbData.teamId;
ddsData.isActive = dbData.isActive;
ddsData.isLocked = dbData.isLocked;
ddsData.info = dbData.info.toStdString();
ddsData.hostName = dbData.hostName.toStdString();
ddsData.frequency = dbData.frequency;
// init data not in db
ddsData.dbm(0);
ddsData.snr(0);
ddsData.dbm = 0;
ddsData.snr = 0;
return ddsData;
} // end of toDdsData()