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
1.7 KiB
C++
60 lines
1.7 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* Settings for zwmsqt
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
#pragma once
|
|
|
|
#include <DDS/Generic/topic_description.h>
|
|
|
|
#include <nglsettings/nglsettings_settings.h>
|
|
#include <QMap>
|
|
|
|
struct TopicDescriptionEx : public DDSGeneric::TopicDescription
|
|
{
|
|
TopicDescriptionEx() = default;
|
|
explicit TopicDescriptionEx(const DDSGeneric::TopicDescription &td)
|
|
: DDSGeneric::TopicDescription(td)
|
|
{}
|
|
QString serviceName;
|
|
};
|
|
|
|
class NGLSettings : public NGL::Settings
|
|
{
|
|
NGLSettings();
|
|
public:
|
|
|
|
// QString --> TopicName
|
|
QMap<QString, QStringList> infoValues();
|
|
void setInfoValues(const QMap<QString, QStringList> &map);
|
|
|
|
int ddsDomain() const;
|
|
void setDdsDomain(int domainId);
|
|
|
|
static NGLSettings *instance();
|
|
|
|
/* Temporary "globally" accessible Values */
|
|
// <TopicNAME, Description>
|
|
QMap<std::string, TopicDescriptionEx> m_dtTypes;
|
|
QMap<std::string, TopicDescriptionEx> m_ftTypes;
|
|
|
|
// DataTopics
|
|
QMap<std::string, TopicDescriptionEx> dataTopics() const;
|
|
bool hasDataTopic(const std::string &name) const;
|
|
TopicDescriptionEx dataTopic(const std::string &topicName) const;
|
|
TopicDescriptionEx dataTopic(const QString &topicName) const { return dataTopic(topicName.toStdString()); }
|
|
void insertDataTopic(const TopicDescriptionEx &td);
|
|
|
|
// FunctionTopics
|
|
QMap<std::string, TopicDescriptionEx> functionTopics() const;
|
|
bool hasFunctionTopic(const std::string &name) const;
|
|
TopicDescriptionEx functionTopic(const std::string &topicName) const;
|
|
void insertFunctionTopic(const TopicDescriptionEx &td);
|
|
|
|
TopicDescriptionEx topicFromTopicName(const std::string &topicName) const;
|
|
TopicDescriptionEx topicFromTopicName(const QString &topicName) const { return topicFromTopicName(topicName.toStdString()); }
|
|
};
|
|
|