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>
82 lines
2.6 KiB
C++
82 lines
2.6 KiB
C++
/**
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Hannes Baeuerle, SLSE, 2016-05-23
|
|
*/
|
|
#include "template.h"
|
|
|
|
|
|
ParticipantManagement::TemplateParticipant ParticipantManagement::TemplateHandling::Template::toDdsTemplateParticipant() const
|
|
{
|
|
TemplateParticipant result;
|
|
|
|
result.templateId(id());
|
|
result.typeId(typeId());
|
|
result.name(m_data.name.toStdString());
|
|
result.designator(m_data.designator.toStdString());
|
|
result.info(m_data.info.toStdString());
|
|
result.symbol(m_data.symbol.toStdString());
|
|
result.tacticalIdentifier(m_data.tacticalIdentifier.toStdString());
|
|
result.hierarchyNumber(m_data.hierarchyNumber);
|
|
result.superiorTemplateId(superiorId());
|
|
result.equipmentNumber(m_data.equipmentNumber);
|
|
if (!m_inferiorIds.empty())
|
|
result.inferiorIds().set(m_inferiorIds);
|
|
|
|
return result;
|
|
}
|
|
|
|
bool ParticipantManagement::TemplateHandling::Template::hasToBeChanged(const ParticipantManagement::TemplateData &newData)
|
|
{
|
|
bool hasNoChanges =
|
|
m_data.typeId == newData.typeId() &&
|
|
m_data.hierarchyNumber == newData.hierarchyNumber() &&
|
|
m_data.equipmentNumber == newData.equipmentNumber() &&
|
|
m_data.name == QString::fromStdString(newData.name()) &&
|
|
m_data.symbol == QString::fromStdString(newData.symbol()) &&
|
|
m_data.info == QString::fromStdString(newData.info()) &&
|
|
m_data.designator == QString::fromStdString(newData.designator()) &&
|
|
m_data.tacticalIdentifier == QString::fromStdString(newData.tacticalIdentifier());
|
|
|
|
if (!hasNoChanges)
|
|
{
|
|
m_data.typeId = newData.typeId();
|
|
m_data.hierarchyNumber = newData.hierarchyNumber();
|
|
m_data.name = QString::fromStdString(newData.name());
|
|
m_data.symbol = QString::fromStdString(newData.symbol());
|
|
m_data.info = QString::fromStdString(newData.info());
|
|
m_data.designator = QString::fromStdString(newData.designator());
|
|
m_data.tacticalIdentifier = QString::fromStdString(newData.tacticalIdentifier());
|
|
m_data.equipmentNumber = newData.equipmentNumber();
|
|
}
|
|
|
|
return !hasNoChanges;
|
|
}
|
|
|
|
bool ParticipantManagement::TemplateHandling::Template::hasNewSuperiorId(int32_t superiorId)
|
|
{
|
|
bool result = m_data.superiorId != superiorId;
|
|
m_data.superiorId = superiorId;
|
|
return result;
|
|
}
|
|
|
|
bool ParticipantManagement::TemplateHandling::Template::hasNewInferiorStructure(std::vector<int32_t> inferiorIds)
|
|
{
|
|
std::sort(inferiorIds.begin(), inferiorIds.end());
|
|
|
|
if (m_inferiorIds != inferiorIds)
|
|
{
|
|
std::swap(m_inferiorIds, inferiorIds);
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
ParticipantManagement::Database::PpmTemplate ParticipantManagement::TemplateHandling::Template::dbEntry() const
|
|
{
|
|
return m_data;
|
|
}
|
|
|