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>
90 lines
2.0 KiB
C++
90 lines
2.0 KiB
C++
/**
|
|
* Helper Class for handling Entity IdentifierStructs
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Malte Diers, NLE, 2019-07-11
|
|
*/
|
|
|
|
#include "identifierstruct.h"
|
|
#include "settings.h"
|
|
#include <EntityIdentifierStruct.h>
|
|
|
|
namespace HighLevelArchitecture
|
|
{
|
|
|
|
quint16 IdentifierStruct::s_nextId = 1;
|
|
quint16 IdentifierStruct::s_ownSiteId = 1;
|
|
|
|
IdentifierStruct::IdentifierStruct(const rpr2::EntityIdentifierStruct &eis)
|
|
: m_siteId(eis.FederateIdentifier.SiteID)
|
|
{
|
|
setSiteId(eis.FederateIdentifier.SiteID);
|
|
setApplicationId(eis.FederateIdentifier.ApplicationID);
|
|
setEntityNumber(eis.EntityNumber);
|
|
}
|
|
|
|
rpr2::EntityIdentifierStruct IdentifierStruct::toEIS() const
|
|
{
|
|
rpr2::EntityIdentifierStruct eis;
|
|
eis.FederateIdentifier.SiteID = siteId();
|
|
eis.FederateIdentifier.ApplicationID = applicationId();
|
|
eis.EntityNumber = entityNumber();
|
|
return eis;
|
|
}
|
|
|
|
void IdentifierStruct::makeOwn()
|
|
{
|
|
setSiteId(ownSiteId());
|
|
setApplicationId(ownApplicationId());
|
|
}
|
|
|
|
QString IdentifierStruct::toString() const
|
|
{
|
|
return QStringLiteral("[Site %1 | Application: %2 | Entity %3]")
|
|
.arg(siteId())
|
|
.arg(applicationId())
|
|
.arg(entityNumber());
|
|
}
|
|
|
|
qint64 IdentifierStruct::toInt64() const
|
|
{
|
|
quint64 res = 0;
|
|
res += siteId();
|
|
res <<= 16;
|
|
res += applicationId();
|
|
res <<= 16;
|
|
res += entityNumber();
|
|
return static_cast<qint64>(res);
|
|
}
|
|
|
|
IdentifierStruct IdentifierStruct::fromInt64(qint64 value)
|
|
{
|
|
const quint64 uvalue = static_cast<quint64>(value);
|
|
IdentifierStruct is;
|
|
if ((uvalue >> 32) == 0)
|
|
is.setSiteId(ownSiteId());
|
|
else
|
|
is.setSiteId((uvalue >> 32) & 0xffffU);
|
|
|
|
if (((uvalue >> 16) & 0xffffU) == 0)
|
|
is.setApplicationId(ownApplicationId());
|
|
else
|
|
is.setApplicationId((uvalue >> 16 & 0xffffU));
|
|
|
|
is.setEntityNumber(uvalue & 0xffffU);
|
|
return is;
|
|
}
|
|
|
|
quint16 IdentifierStruct::ownSiteId()
|
|
{
|
|
return s_ownSiteId;
|
|
}
|
|
|
|
quint16 IdentifierStruct::ownApplicationId()
|
|
{
|
|
static const int s_applicationId = Settings::applicationId();
|
|
return s_applicationId;
|
|
}
|
|
} // namespace
|