Qt6 Migration: Complete migration with DDS/RTI support and build validation
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>
This commit is contained in:
18662 files changed
+4115092
-5435
No files matched your search
@@ -0,0 +1,143 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* VdControl
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Astrid Müller, SGAS, 2018-02-22
|
||||
*/
|
||||
|
||||
#include "vd_control.h"
|
||||
#include "ivd_comm.h"
|
||||
#include "ava_types.h"
|
||||
#include "AvsCommands/simple_command.h"
|
||||
#include "AvsCommands/vd_set_script.h"
|
||||
#include "AvsCommands/keep_alive.h"
|
||||
#include <LtsUtilsCore/scoped_connection.h>
|
||||
#include <QTimer>
|
||||
#include <QtGlobal>
|
||||
#include <boost/optional.hpp>
|
||||
#include <chrono>
|
||||
|
||||
namespace AudioVideoManagement
|
||||
{
|
||||
|
||||
VdControl::VdControl(IVdComm *comm, std::chrono::milliseconds commandTimeout)
|
||||
: m_comm(comm)
|
||||
, m_queue(commandTimeout)
|
||||
, m_logger(getLogger("VdControl"))
|
||||
{
|
||||
Q_ASSERT(comm);
|
||||
|
||||
connect(comm, &IVdComm::connected, this, &VdControl::onConnected);
|
||||
connect(comm, &IVdComm::disconnected, this, &VdControl::onDisconnected);
|
||||
connect(&m_queue, &AvsCommandQueue::queueEmpty, this, &VdControl::commandQueueEmpty); // signal -> signal
|
||||
connect(&m_queue, &AvsCommandQueue::timeout, this, &VdControl::onTimeout);
|
||||
}
|
||||
|
||||
void VdControl::switchContext(int exerciseId)
|
||||
{
|
||||
queue(new VdCommands::SimpleCommand(QLatin1String("SwitchContext"), m_comm, this, [ = ](IVdComm * comm) { comm->switchContext(exerciseId); }));
|
||||
}
|
||||
|
||||
void VdControl::vdSetScript(const QString &scriptName, AvaStreamType typ, int fileSplitting, const QVector<AvaScriptEntry> &streams, const QString &exportedDirBaseName, const QString &absolutePath)
|
||||
{
|
||||
vdSetScript(scriptName, typ, fileSplitting, streams, exportedDirBaseName, absolutePath, new LtsUtils::DummyConnection);
|
||||
}
|
||||
|
||||
|
||||
void VdControl::vdReleaseScript(const QString &scriptName)
|
||||
{
|
||||
queue(new VdCommands::SimpleCommand(QLatin1String("vdReleaseScript"), m_comm, this, [ = ](IVdComm * comm) { comm->vdReleaseScript(scriptName); }));
|
||||
}
|
||||
|
||||
void VdControl::keepAlive()
|
||||
{
|
||||
queue(new VdCommands::KeepAlive(m_comm, this));
|
||||
}
|
||||
|
||||
void VdControl::onConnected()
|
||||
{
|
||||
m_connected = true;
|
||||
DEBUG_LOG(m_logger) << "connected";
|
||||
}
|
||||
|
||||
void VdControl::onDisconnected()
|
||||
{
|
||||
m_connected = false;
|
||||
DEBUG_LOG(m_logger) << "disconnected";
|
||||
m_queue.flush();
|
||||
}
|
||||
|
||||
void VdControl::onTimeout()
|
||||
{
|
||||
ICommand *cmd = m_queue.currentCommand();
|
||||
if (cmd->canTimeout())
|
||||
{
|
||||
INFO_LOG(m_logger) << "command '" << cmd->debug() << "' failed";
|
||||
m_queue.done();
|
||||
return;
|
||||
}
|
||||
|
||||
ERROR_LOG(m_logger) << "command timed out";
|
||||
failed(cmd);
|
||||
}
|
||||
|
||||
void VdControl::vdSetScript(const QString &scriptName, AvaStreamType typ, int fileSplitting, const QVector<AvaScriptEntry> &streams,
|
||||
const QString &exportedDirBaseName, const QString &absolutePath, LtsUtils::IConnection *connection)
|
||||
{
|
||||
queue(new AvaCommands::VdSetScript(m_comm, this, scriptName, typ, fileSplitting, streams, exportedDirBaseName, absolutePath), connection);
|
||||
}
|
||||
|
||||
void VdControl::queue(ICommand *cmd, LtsUtils::IConnection *connection)
|
||||
{
|
||||
Q_ASSERT(cmd);
|
||||
|
||||
std::unique_ptr<ICommand> cmd_(cmd);
|
||||
std::unique_ptr<LtsUtils::IConnection> connection_(connection);
|
||||
|
||||
if (!m_connected)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "not connected -> dropping command";
|
||||
return;
|
||||
}
|
||||
|
||||
m_queue.queue(std::move(cmd_), std::move(connection_));
|
||||
}
|
||||
|
||||
/**
|
||||
* Default fallback for all commands that don't require special action
|
||||
* upon completion such as emitting a signal.
|
||||
*/
|
||||
void VdControl::done(ICommand *cmd)
|
||||
{
|
||||
Q_ASSERT(cmd == m_queue.currentCommand());
|
||||
m_queue.done();
|
||||
}
|
||||
|
||||
void VdControl::done(AvaCommands::VdSetScript *cmd)
|
||||
{
|
||||
Q_ASSERT(cmd == m_queue.currentCommand());
|
||||
|
||||
{
|
||||
LtsUtils::ScopedConnection scopedConn(m_queue.currentConnection());
|
||||
emit vdScriptFinished(cmd->getAvDir(), cmd->getStreamType(), cmd->wasSuccessful());
|
||||
} // extra small scope as done() deletes the instance scopedConn is operating on
|
||||
m_queue.done();
|
||||
}
|
||||
|
||||
void VdControl::failed(ICommand *cmd)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "command '" << cmd->debug() << "' failed";
|
||||
Q_ASSERT(cmd == m_queue.currentCommand());
|
||||
m_queue.flush();
|
||||
m_comm->forceDisconnect();
|
||||
}
|
||||
|
||||
void VdControl::alive(ICommand *cmd)
|
||||
{
|
||||
Q_ASSERT(cmd == m_queue.currentCommand());
|
||||
m_queue.alive();
|
||||
}
|
||||
|
||||
} // namespace AudioVideoManagement
|
||||
Reference in new issue
Block a user