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>
95 lines
2.5 KiB
C++
95 lines
2.5 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* MapLayer
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
// Own
|
|
#include <Map/situation_map_types.h>
|
|
#include <Common/situation_map_logging.h>
|
|
|
|
//----------------------------------------------------------------------------
|
|
namespace SituationMap
|
|
{
|
|
|
|
class MapImpl;
|
|
|
|
|
|
class MapLayer
|
|
{
|
|
public:
|
|
|
|
explicit MapLayer(const QString &logicalName = QString(),
|
|
LayerType layerType = LayerType::Undefined);
|
|
|
|
bool isValid() const;
|
|
|
|
// for some read-only values :
|
|
QString name() const;
|
|
LayerType type() const;
|
|
// : for some read-only values
|
|
|
|
protected:
|
|
QString m_name;
|
|
LayerType m_layerType = LayerType::Undefined;
|
|
|
|
};
|
|
|
|
/**
|
|
* @brief The MapLayerOrderedList class will store an ordered List of the MapLayer.
|
|
* The List can be used to get the orderedList of layernames as well as
|
|
* control the parameters like on/off, brightness etc.
|
|
*/
|
|
class MapLayerOrderedList final : public QObject
|
|
{
|
|
Q_OBJECT
|
|
using BaseClass = QObject;
|
|
|
|
public:
|
|
MapLayerOrderedList() = default;
|
|
~MapLayerOrderedList() = default;
|
|
|
|
|
|
/**
|
|
* @brief addLayer add Layername. Will NOT be added if name already exists (regardless layerType)
|
|
* !All LayerType::Basemap will below all other!
|
|
* @param name Layername to be added. Must be unique!
|
|
* @param layerType layerType to be added (Undefined is NOT allowed)
|
|
* @return true on success, otherwise false
|
|
*/
|
|
bool addLayer(const QString &name, LayerType layerType);
|
|
bool contains(const QString &name, LayerType layerType) const;
|
|
MapLayer getLayer(const QString &name) const;
|
|
bool removeLayer(const QString &name); // layername has to be unique
|
|
int count() const;
|
|
int count(LayerType layerType) const;
|
|
|
|
/**
|
|
* @brief Order layer according new list
|
|
* @param orderedLayernamesReq requested new order
|
|
* @param bRequestedOrderIsValid if set just a check will be performed. The result bool contains the check result.
|
|
* @return true on success, otherwise false
|
|
*/
|
|
bool orderLayerTo(const QStringList &orderedLayernamesReq, bool *bRequestedOrderIsValid = nullptr);
|
|
|
|
|
|
QStringList layerNamesOrdered() const;
|
|
QStringList layerNamesOrdered(LayerType layerType) const;
|
|
|
|
|
|
protected:
|
|
QStringList layernamesOfType(const QStringList &layernames, LayerType layerType);
|
|
QStringList layernamesOfTypeOther(const QStringList &layernames);
|
|
QList<MapLayer> m_mapLayerList; ///< using logical layernames
|
|
};
|
|
|
|
|
|
|
|
} // namespace SituationMap
|
|
|
|
|