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,91 @@
|
||||
/**
|
||||
* The Uas class represents a Uas. It holds the data and offers some conversion methods.
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Hannes Fritsche, ESZS, 2025-04-08
|
||||
*/
|
||||
|
||||
#include "uas.h"
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
namespace UasHandling
|
||||
{
|
||||
|
||||
bool Uas::hasChanges(const CreateModifyUasRequest &request)
|
||||
{
|
||||
bool hasChanges = request.deviceIdentifier() != m_data.deviceIdentifier.toStdString() ||
|
||||
request.participantId() != m_data.participantId ||
|
||||
request.exerciseId() != m_data.exerciseId ||
|
||||
request.hostname() != m_data.hostname.toStdString() ||
|
||||
request.hostport() != m_data.hostport ||
|
||||
request.useTcp() != m_data.useTcp;
|
||||
|
||||
if (hasChanges)
|
||||
{
|
||||
m_data.deviceIdentifier = QString::fromStdString(request.deviceIdentifier());
|
||||
m_data.participantId = request.participantId();
|
||||
m_data.exerciseId = request.exerciseId();
|
||||
m_data.hostname = QString::fromStdString(request.hostname());
|
||||
m_data.hostport = request.hostport();
|
||||
m_data.useTcp = request.useTcp();
|
||||
}
|
||||
|
||||
return hasChanges;
|
||||
}
|
||||
|
||||
bool Uas::compareHostname( const QString &hostname)
|
||||
{
|
||||
return (m_data.hostname.compare(hostname, Qt::CaseInsensitive) == 0);
|
||||
}
|
||||
|
||||
bool Uas::compareHostPort(int hostport)
|
||||
{
|
||||
return (m_data.hostport == hostport);
|
||||
}
|
||||
|
||||
void Uas::unlinkUas()
|
||||
{
|
||||
m_data.participantId = 0;
|
||||
m_data.exerciseId = 0;
|
||||
}
|
||||
|
||||
void Uas::setState(const ProjectDataManagement::UasState &newState)
|
||||
{
|
||||
m_data.uasStateId = newState.underlying();
|
||||
}
|
||||
int32_t Uas::id() const
|
||||
{
|
||||
return m_data.id;
|
||||
}
|
||||
|
||||
int32_t Uas::participantId() const
|
||||
{
|
||||
return m_data.participantId;
|
||||
}
|
||||
|
||||
Database::PpmUas Uas::toDbUas() const
|
||||
{
|
||||
return m_data;
|
||||
}
|
||||
|
||||
UAS Uas::toDdsUas() const
|
||||
{
|
||||
ParticipantManagement::UAS result;
|
||||
|
||||
result.id(m_data.id);
|
||||
result.deviceIdentifier(m_data.deviceIdentifier.toStdString());
|
||||
result.uasState(static_cast<ProjectDataManagement::UasState::inner_enum>(m_data.uasStateId));
|
||||
result.participantId(m_data.participantId);
|
||||
result.exerciseId(m_data.exerciseId);
|
||||
result.hostname(m_data.hostname.toStdString());
|
||||
result.hostport(m_data.hostport);
|
||||
result.sampleTime(QDateTime::currentDateTimeUtc().toMSecsSinceEpoch());
|
||||
result.useTcp(m_data.useTcp);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
} // namespace ParticipantManagement
|
||||
} // namespace UasHandling
|
||||
Reference in new issue
Block a user