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/handler_video_team.cpp
+23 -23
View File
@@ -31,36 +31,36 @@ public:
void create(const VideoTeam &videoTeam)
{
Q_ASSERT(!m_cache.contains(videoTeam.id()));
Q_ASSERT(!m_cache.contains(videoTeam.id));
Database::AvmDeviceConfig deviceConfig = toDeviceConfig(videoTeam);
if (!m_db->insert(deviceConfig))
ERROR_LOG(m_logger) << "Error while inserting device config into database";
m_cache.insert(videoTeam.id(), deviceConfig);
m_cache.insert(videoTeam.id, deviceConfig);
emit m_handler->avDbReloadNeeded();
}
void update(const VideoTeam &videoTeam)
{
Q_ASSERT(m_cache.contains(videoTeam.id()));
Q_ASSERT(m_cache.contains(videoTeam.id));
Database::AvmDeviceConfig deviceConfig = toDeviceConfig(videoTeam);
const Database::AvmDeviceConfig &oldDeviceConfig = m_cache[videoTeam.id()];
const Database::AvmDeviceConfig &oldDeviceConfig = m_cache[videoTeam.id];
deviceConfig.id = oldDeviceConfig.id;
if (!m_db->update(deviceConfig))
ERROR_LOG(m_logger) << "Error while updating device config";
m_cache[videoTeam.id()] = deviceConfig;
m_cache[videoTeam.id] = deviceConfig;
emit m_handler->avDbReloadNeeded();
}
void createOrUpdate(const VideoTeam &videoTeam)
{
if (m_cache.contains(videoTeam.id()))
if (m_cache.contains(videoTeam.id))
update(videoTeam);
else
create(videoTeam);
@@ -88,12 +88,12 @@ private:
static Database::AvmDeviceConfig toDeviceConfig(const VideoTeam &videoTeam)
{
Database::AvmDeviceConfig result;
result.context = ExerciseContext(videoTeam.exerciseId()).toString();
result.context = ExerciseContext(videoTeam.exerciseId).toString();
result.type = QStringLiteral("DEKTEC_VIDEO_CHANNEL");
result.name = QString::fromStdString(videoTeam.streamName());
result.name = QString::fromStdString(videoTeam.streamName);
result.controller = QStringLiteral("EXCAVS01");
result.definition = QStringLiteral("mode=1;ssrc=%1;port=%2;programid=%3;programtimeoffset=%4;recording=ECRS@%5")
.arg(videoTeam.ssrc()).arg(videoTeam.vtPort()).arg(videoTeam.programId()).arg(videoTeam.timeOffset()).arg(result.controller);
.arg(videoTeam.ssrc).arg(videoTeam.vtPort).arg(videoTeam.programId).arg(videoTeam.timeOffset).arg(result.controller);
return result;
}
@@ -178,7 +178,7 @@ void HandlerVideoTeam::onVideoTeamModifyRequest(const rti::core::SampleIdentity
const VideoTeamModifyRequest &request)
{
DEBUG_LOG(m_logger) << "onVideoTeamModifyRequest: " << request;
auto ret = request.id() > 0 ? videoTeamModifyRequest(request) : videoTeamCreateRequest(request);
auto ret = request.id > 0 ? videoTeamModifyRequest(request) : videoTeamCreateRequest(request);
if (ret.error())
WARNING_LOG(m_logger) << ret();
m_fts->videoTeamModifyReply(cookie, ret);
@@ -186,9 +186,9 @@ void HandlerVideoTeam::onVideoTeamModifyRequest(const rti::core::SampleIdentity
bool HandlerVideoTeam::needDeviceConfig(const VideoTeam &videoTeam) const
{
if (videoTeam.exerciseId() == 0)
if (videoTeam.exerciseId == 0)
return false;
return m_activeExercises->isActive(ExerciseContext(videoTeam.exerciseId()));
return m_activeExercises->isActive(ExerciseContext(videoTeam.exerciseId));
}
void HandlerVideoTeam::onContextActivated(const ExerciseContext &context)
@@ -196,7 +196,7 @@ void HandlerVideoTeam::onContextActivated(const ExerciseContext &context)
for (const auto *ifs : qAsConst(m_videoTeamObjMap))
{
VideoTeam ddsData = ifs->getData();
if (ddsData.exerciseId() == context.id())
if (ddsData.exerciseId == context.id())
m_deviceConfig->create(ddsData);
}
}
@@ -208,10 +208,10 @@ void HandlerVideoTeam::onContextDeactivated(const ExerciseContext &context)
if (ifs->exerciseId() == context.id())
{
VideoTeam ddsData = ifs->getData();
ddsData.exerciseId(0);
ddsData.streamName(std::string());
ddsData.exerciseId = 0;
ddsData.streamName = std::string();
ifs->updateObject(ddsData);
m_deviceConfig->remove(ddsData.id());
m_deviceConfig->remove(ddsData.id);
}
}
}
@@ -219,27 +219,27 @@ void HandlerVideoTeam::onContextDeactivated(const ExerciseContext &context)
//--------------------------------------------------------------------------------------------------
static VideoTeam convert(const VideoTeamModifyRequest &request, const VideoTeam &oldData)
{
Q_ASSERT(request.id() == oldData.id());
Q_ASSERT(request.id == oldData.id);
VideoTeam newData(oldData);
newData.streamName(request.streamName());
newData.exerciseId(request.exerciseId());
newData.streamName = request.streamName;
newData.exerciseId = request.exerciseId;
return newData;
}
//--------------------------------------------------------------------------------------------------
Core::FunctionReplyObject HandlerVideoTeam::videoTeamModifyRequest(const VideoTeamModifyRequest &request)
{
ObjectVideoTeam *ifs = m_videoTeamObjMap.value(request.id());
ObjectVideoTeam *ifs = m_videoTeamObjMap.value(request.id);
if (ifs == nullptr)
return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Video Team with id %1 not found")).arg(request.id());
DEBUG_LOG(m_logger) << "on Modify Request" << request.streamName() << " ID: " << request.name() << " exId " << request.exerciseId();
return Core::FunctionReplyObject(request.id, tr_lts("dds", "Video Team with id %1 not found")).arg(request.id);
DEBUG_LOG(m_logger) << "on Modify Request" << request.streamName << " ID: " << request.name << " exId " << request.exerciseId;
VideoTeam ddsData = convert(request, ifs->getData());
if (needDeviceConfig(ddsData))
m_deviceConfig->createOrUpdate(ddsData);
else
m_deviceConfig->tryRemove(ddsData.id());
m_deviceConfig->tryRemove(ddsData.id);
Core::FunctionReplyObject ret = ifs->updateObject(ddsData);
emit mvsChanged();