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>
146 lines
3.4 KiB
C++
146 lines
3.4 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* SymbolProperties
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
// Own
|
|
#include "advanced_symbology_export.h"
|
|
#include "symbol_dictionary_types.h"
|
|
|
|
|
|
// Qt
|
|
#include <QStringList>
|
|
|
|
|
|
//----------------------------------------------------------------------------
|
|
namespace AdvancedSymbology
|
|
{
|
|
|
|
/**
|
|
* @brief The SymbolProperties class stores some symbol properties like name, keywords etc.
|
|
*/
|
|
class ADVANCED_SYMBOLOGY_EXPORT SymbolProperties
|
|
{
|
|
public:
|
|
SymbolProperties() = default;
|
|
// TODO: sidc: lowerCase vs. upperCase
|
|
|
|
|
|
/*! \name Basic functions*/
|
|
//@{
|
|
QString key() const;
|
|
void setKey(const QString &key);
|
|
|
|
QString name() const;
|
|
void setName(const QString &name);
|
|
|
|
QString category() const;
|
|
void setCategory(const QString &category);
|
|
|
|
QString symbolClass() const;
|
|
void setSymbolClass(const QString &symbolClass);
|
|
|
|
QStringList tags() const;
|
|
QString gctString() const;
|
|
void setTags(const QStringList &tags);
|
|
|
|
GeometryType geometryType() const;
|
|
void setGeometryType(const GeometryType &geometryType);
|
|
|
|
QString sidc() const;
|
|
void setSidc(const QString &sidc);
|
|
//@}
|
|
|
|
QString originalKey() const;
|
|
void setOriginalKey(const QString &originalKey);
|
|
|
|
|
|
/*! \name Convenience functions*/
|
|
//@{
|
|
QString key_SymbolSet() const;
|
|
QString key_Entity() const;
|
|
QString key_SymbolSetEntity() const;
|
|
//@}
|
|
|
|
/*! \name ColorToBeReplaced
|
|
* \note Some symbols (like ETS symbols) may have a certain color.
|
|
* This is to be replaced by concrete partyColor */
|
|
//@{
|
|
/**
|
|
* @brief colorToBeReplaced
|
|
* @return colorToBeReplaced
|
|
*/
|
|
|
|
QColor colorToBeReplaced() const;
|
|
/**
|
|
* @brief setColorToBeReplaced
|
|
* @param colorToBeReplaced
|
|
*/
|
|
void setColorToBeReplaced(const QColor &colorToBeReplaced);
|
|
//@}
|
|
|
|
|
|
// int minNumberOfPoints() const;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
* @brief operator== Compare two objects
|
|
* @param other to be compared with
|
|
* @return true if identical, otherwise false.
|
|
*/
|
|
bool operator==(const SymbolProperties &other) const
|
|
{
|
|
return ((this->m_key == other.m_key) &&
|
|
(this->m_name == other.m_name) &&
|
|
(this->m_category == other.m_category) &&
|
|
(this->m_symbolClass == other.m_symbolClass) &&
|
|
(this->m_tags == other.m_tags) &&
|
|
(this->m_geometryType == other.m_geometryType) &&
|
|
(this->m_sidc == other.m_sidc) &&
|
|
(this->m_originalKey == other.m_originalKey) &&
|
|
(this->m_colorToBeReplaced == other.m_colorToBeReplaced)
|
|
);
|
|
}
|
|
|
|
/**
|
|
* @brief operator!= Compare two objects
|
|
* @param other to be compared with
|
|
* @return true if NOT identical, otherwise false.
|
|
*/
|
|
bool operator!=(const SymbolProperties &other) const
|
|
{
|
|
return !(*this == other);
|
|
}
|
|
|
|
|
|
private :
|
|
QString m_key;
|
|
QString m_name;
|
|
QString m_category;
|
|
QString m_symbolClass;
|
|
QStringList m_tags;
|
|
GeometryType m_geometryType = GeometryType::Undefined;
|
|
|
|
QString m_sidc;
|
|
QString m_originalKey;
|
|
|
|
QColor m_colorToBeReplaced; // color of ETS symbols to be replaced by concrete partyColor
|
|
|
|
};
|
|
|
|
//-----------------------------------------------------------------------------
|
|
// output operator:
|
|
//-----------------------------------------------------------------------------
|
|
|
|
|
|
} // namespace AdvancedSymbology
|
|
|