torstenandCopilot
7173785915
Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
104 lines
3.2 KiB
C++
104 lines
3.2 KiB
C++
/**
|
|
* Handler for the HMI language
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
|
|
#include "object_video_team.h"
|
|
#include "dds_handler.h"
|
|
#include "logger.h"
|
|
|
|
namespace AudioVideoManagement
|
|
{
|
|
//-------------------------------------------------------------------------------------------------------------
|
|
ObjectVideoTeam::ObjectVideoTeam(Interface::Dts *dts,
|
|
DatabaseInterface *db)
|
|
: m_dts(dts)
|
|
, m_db(db)
|
|
, m_logger(getLogger("ObjectVideoTeam"))
|
|
{
|
|
}
|
|
|
|
//-------------------------------------------------------------------------------------------------------------
|
|
ObjectVideoTeam::~ObjectVideoTeam()
|
|
{
|
|
}
|
|
|
|
//-------------------------------------------------------------------------------------------------------------
|
|
Core::FunctionReplyObject ObjectVideoTeam::createObject(const VideoTeam &data)
|
|
{
|
|
Q_ASSERT(m_data.id() <= 0);
|
|
Q_ASSERT(data.id() > 0); // only allow creation from existing db-entries
|
|
|
|
m_data = data;
|
|
|
|
// Publish Data via DTS
|
|
onPublishData();
|
|
|
|
return Core::FunctionReplyObject(m_data.id());
|
|
}
|
|
|
|
//-------------------------------------------------------------------------------------------------------------
|
|
Core::FunctionReplyObject ObjectVideoTeam::updateObject(const VideoTeam &data)
|
|
{
|
|
if (!isValid())
|
|
return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Object not valid/blocked"));
|
|
|
|
m_data = data;
|
|
Database::AvmVideoTeam dbData(toDbData(data));
|
|
if (!m_db->update(dbData))
|
|
return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Error updating VideoTeam into database"));
|
|
|
|
DEBUG_LOG(m_logger) << "Data changed for VideoTeam Id: " << data.id();
|
|
|
|
// Publish Data via DTS
|
|
onPublishData();
|
|
|
|
return Core::FunctionReplyObject(data.id());}
|
|
|
|
//-------------------------------------------------------------------------------------------------------------
|
|
void ObjectVideoTeam::onPublishData()
|
|
{
|
|
INFO_LOG(m_logger) << "Publish AvmVideoTeam-data to dds (" << m_data.id() << ") ...";
|
|
|
|
if (!m_dts->publish(m_data))
|
|
ERROR_LOG(m_logger) << "Error publishing AvmVideoTeam-data to dds";
|
|
}
|
|
|
|
//-------------------------------------------------------------------------------------------------------------
|
|
Database::AvmVideoTeam ObjectVideoTeam::toDbData(const VideoTeam &ddsData)
|
|
{
|
|
Database::AvmVideoTeam dbData;
|
|
|
|
dbData.id = ddsData.id();
|
|
dbData.name = QString::fromStdString(ddsData.name());
|
|
dbData.ssrc = ddsData.ssrc();
|
|
dbData.port = ddsData.vtPort();
|
|
dbData.programId = ddsData.programId();
|
|
dbData.timeOffset = ddsData.timeOffset();
|
|
dbData.streamName = QString::fromStdString(ddsData.streamName());
|
|
dbData.exerciseId = ddsData.exerciseId();
|
|
|
|
return dbData;
|
|
}
|
|
|
|
//-------------------------------------------------------------------------------------------------------------
|
|
AudioVideoManagement::VideoTeam ObjectVideoTeam::toDdsData(const Database::AvmVideoTeam &dbData)
|
|
{
|
|
AudioVideoManagement::VideoTeam ddsData;
|
|
|
|
ddsData.id(dbData.id);
|
|
ddsData.name(dbData.name.toStdString());
|
|
ddsData.ssrc(dbData.ssrc);
|
|
ddsData.vtPort(dbData.port);
|
|
ddsData.programId(dbData.programId);
|
|
ddsData.timeOffset(dbData.timeOffset);
|
|
ddsData.exerciseId(dbData.exerciseId);
|
|
ddsData.streamName(dbData.streamName.toStdString());
|
|
|
|
return ddsData;
|
|
} // end of toDdsData()
|
|
|
|
} // Namespace
|