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,98 @@
|
||||
// **************************************************************************
|
||||
//
|
||||
// (C) Copyright 2009 Swiss SIMTEC AG
|
||||
//
|
||||
// **************************************************************************
|
||||
//
|
||||
// $HeadURL$
|
||||
// $LastChangedBy$
|
||||
// $LastChangedDate$
|
||||
// $LastChangedRevision$
|
||||
//
|
||||
// **************************************************************************
|
||||
|
||||
// manual class headers
|
||||
#include "PrtCnvMember.hpp"
|
||||
#include <CoPrtCnv/CoPrtCnvRadioTelegram.hpp>
|
||||
|
||||
namespace PrtCnv
|
||||
{
|
||||
|
||||
// ---------------------------------------------------------------
|
||||
// Constructor with id and ISSI as parameter
|
||||
// ---------------------------------------------------------------
|
||||
PrtCnvMember::PrtCnvMember(int a_id, int a_issi)
|
||||
: m_ISSI(a_issi)
|
||||
, m_ClaimCount(0)
|
||||
, m_loggedInExerciseId(0)
|
||||
, m_Id(a_id)
|
||||
, m_Licensed(false)
|
||||
{}
|
||||
|
||||
PrtCnvMember::~PrtCnvMember()
|
||||
{
|
||||
clearFragmentedList();
|
||||
}
|
||||
|
||||
|
||||
// ---------------------------------------------------------------
|
||||
// Adds a radio-telegram-fragment to this member.
|
||||
// ---------------------------------------------------------------
|
||||
void PrtCnvMember::addFragmentedTelegram(const N_CoPrtCnv::CoPrtCnvRadioTelegram &a_radioTelegram)
|
||||
{
|
||||
m_FragmentedTelegramList.insert(std::make_pair(a_radioTelegram.getFragmentCounter(),
|
||||
new N_CoPrtCnv::CoPrtCnvRadioTelegram(a_radioTelegram)));
|
||||
}
|
||||
|
||||
|
||||
|
||||
// ---------------------------------------------------------------
|
||||
// Returns the telegram-Id of the fragmented telegram assiged
|
||||
// to this member.
|
||||
// If not evaluable: 0 will be returned.
|
||||
// ---------------------------------------------------------------
|
||||
gef_telegramm_id_et PrtCnvMember::getFragmentedTelegramId() const
|
||||
{
|
||||
// the fragment with the highest counter is the first fragment
|
||||
for (auto rit = m_FragmentedTelegramList.rbegin(); rit != m_FragmentedTelegramList.rend(); ++rit)
|
||||
{
|
||||
N_CoPrtCnv::CoPrtCnvRadioTelegram *firstFragment = rit->second;
|
||||
if (N_CoPrtCnv::CoPrtCnvRadioTelegram::e_FirstFragment == firstFragment->getFragmentStatus())
|
||||
return firstFragment->getTelID();
|
||||
}
|
||||
return GEF_BESTAETIGUNG; // no telegram found => return 0 (= GEF_BESTAETIGUNG)
|
||||
}
|
||||
|
||||
|
||||
// ---------------------------------------------------------------
|
||||
// Erases the radio-telegram-fragments assiged to this member.
|
||||
// The fragments itself will be deleted.
|
||||
// ---------------------------------------------------------------
|
||||
void PrtCnvMember::clearFragmentedList()
|
||||
{
|
||||
for (auto it : m_FragmentedTelegramList)
|
||||
delete it.second;
|
||||
m_FragmentedTelegramList.clear();
|
||||
}
|
||||
|
||||
|
||||
// ---------------------------------------------------------------
|
||||
// Returns the radio-telegram-fragments assembled to a only
|
||||
// big radio-telegram. The fragments will not be deleted.
|
||||
// Returns NULL if it was impossible to assemble the telegram.
|
||||
// ---------------------------------------------------------------
|
||||
QByteArray PrtCnvMember::getUnfragmentedTelegramData() const
|
||||
{
|
||||
return N_CoPrtCnv::CoPrtCnvRadioTelegram::getUnfragmentedData(m_FragmentedTelegramList);
|
||||
}
|
||||
|
||||
|
||||
// ---------------------------------------------------------------
|
||||
// Returns true if the fragment-list is empty
|
||||
// ---------------------------------------------------------------
|
||||
bool PrtCnvMember::isFragmentedListEmpty() const
|
||||
{
|
||||
return m_FragmentedTelegramList.empty();
|
||||
}
|
||||
|
||||
} // namespace PrtCnv
|
||||
Reference in new issue
Block a user