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,86 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* AvaSession
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Christian Fröbel, SLSE, 2017-07-17
|
||||
*/
|
||||
|
||||
#include "ava_session.h"
|
||||
#include "ava_control.h"
|
||||
#include "iava_comm.h"
|
||||
#include "avs_dialog.h"
|
||||
#include <chrono>
|
||||
|
||||
namespace AudioVideoManagement
|
||||
{
|
||||
|
||||
AvaSession::AvaSession(AvaControl *ctrl, int exerciseId, const QString &operator_, const QString &langCode, AvaAudioPrio audioPrio, QChar timezone, AvaGuiStyle guiStyle, bool keepAliveEnabled)
|
||||
: m_ctrl(ctrl)
|
||||
, m_exerciseId(exerciseId)
|
||||
, m_operator(operator_)
|
||||
, m_langCode(langCode)
|
||||
, m_audioPrio(audioPrio)
|
||||
, m_timezone(timezone)
|
||||
, m_guiStyle(guiStyle)
|
||||
, m_keepAliveEnabled(keepAliveEnabled)
|
||||
, m_logger(getLogger("AvaSession"))
|
||||
{
|
||||
Q_ASSERT(ctrl);
|
||||
|
||||
m_keepAliveTimer.setInterval(std::chrono::milliseconds(5000).count());
|
||||
m_keepAliveTimer.setSingleShot(true);
|
||||
|
||||
connect(m_ctrl->comm(), &IAvaComm::connected, this, &AvaSession::onConnected);
|
||||
connect(m_ctrl->comm(), &IAvaComm::disconnected, this, &AvaSession::onDisconnected);
|
||||
connect(&m_keepAliveTimer, &QTimer::timeout, this, &AvaSession::onKeepAliveTimerElapsed);
|
||||
}
|
||||
|
||||
void AvaSession::onAudioPrioChanged(AvaAudioPrio newPrio)
|
||||
{
|
||||
m_audioPrio = newPrio;
|
||||
if (!m_established)
|
||||
return;
|
||||
|
||||
onDisconnected();
|
||||
onConnected();
|
||||
}
|
||||
|
||||
void AvaSession::onTimezoneChanged(QChar newTimezone)
|
||||
{
|
||||
m_timezone = newTimezone;
|
||||
if (!m_established)
|
||||
return;
|
||||
|
||||
m_ctrl->setTimezone(m_timezone);
|
||||
}
|
||||
|
||||
void AvaSession::onConnected()
|
||||
{
|
||||
m_ctrl->switchContext(m_exerciseId);
|
||||
m_ctrl->setUserProfile(m_operator, m_langCode, m_audioPrio, m_guiStyle);
|
||||
m_ctrl->setTimezone(m_timezone);
|
||||
|
||||
m_established = true;
|
||||
if (m_keepAliveEnabled)
|
||||
m_keepAliveTimer.start();
|
||||
DEBUG_LOG(m_logger) << "session established";
|
||||
emit sessionEstablished();
|
||||
}
|
||||
|
||||
void AvaSession::onDisconnected()
|
||||
{
|
||||
m_keepAliveTimer.stop();
|
||||
m_established = false;
|
||||
DEBUG_LOG(m_logger) << "disconnected";
|
||||
emit disconnected();
|
||||
}
|
||||
|
||||
void AvaSession::onKeepAliveTimerElapsed()
|
||||
{
|
||||
m_ctrl->keepAlive();
|
||||
m_keepAliveTimer.start();
|
||||
}
|
||||
|
||||
} // namespace AudioVideoManagement
|
||||
Reference in new issue
Block a user