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>
60 lines
2.0 KiB
C++
60 lines
2.0 KiB
C++
/**
|
|
* The Party class represents a party. It holds the data and offers some conversion methods.
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Hannes Baeuerle, SLSE, 2016-05-12
|
|
*/
|
|
|
|
#include "party.h"
|
|
|
|
bool ParticipantManagement::PartyHandling::Party::hasChanges(const ParticipantManagement::Party &request,
|
|
const bool bIgnoreIsUsedBy)
|
|
{
|
|
const QString requestProperties = QString::fromStdString(request.properties());
|
|
bool hasChanges = request.color() != m_data.color
|
|
|| request.fadingColor() != m_data.fadingColor
|
|
|| request.name() != m_data.name.toStdString()
|
|
|| request.hlaForceIdentifier().underlying() != m_data.hlaForceIdentifier
|
|
|| request.role() != m_data.roleId
|
|
|| requestProperties != m_data.properties;
|
|
if (!bIgnoreIsUsedBy && !hasChanges)
|
|
hasChanges = request.isUsedBy() != m_data.isUsedBy;
|
|
|
|
if (hasChanges)
|
|
{
|
|
m_data.color = request.color();
|
|
m_data.fadingColor = request.fadingColor();
|
|
m_data.name = QString::fromStdString(request.name());
|
|
m_data.roleId = request.role();
|
|
m_data.hlaForceIdentifier = request.hlaForceIdentifier().underlying();
|
|
m_data.properties = requestProperties;
|
|
if (!bIgnoreIsUsedBy)
|
|
m_data.isUsedBy = request.isUsedBy();
|
|
}
|
|
|
|
return hasChanges;
|
|
}
|
|
|
|
ParticipantManagement::Database::PpmParty ParticipantManagement::PartyHandling::Party::toDbParty() const
|
|
{
|
|
return m_data;
|
|
}
|
|
|
|
ParticipantManagement::Party ParticipantManagement::PartyHandling::Party::toDdsParty() const
|
|
{
|
|
ParticipantManagement::Party result;
|
|
|
|
result.id(id());
|
|
result.color(m_data.color);
|
|
result.fadingColor(m_data.fadingColor);
|
|
result.name(m_data.name.toStdString());
|
|
result.role(m_data.roleId);
|
|
result.hlaForceIdentifier(static_cast<HlaForceIdentifierEnum::inner_enum>(m_data.hlaForceIdentifier));
|
|
result.isUsedBy(m_data.isUsedBy);
|
|
result.sampleTime(QDateTime::currentMSecsSinceEpoch());
|
|
result.properties(m_data.properties.toStdString());
|
|
|
|
return result;
|
|
}
|