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>
59 lines
761 B
C++
59 lines
761 B
C++
/**
|
|
* @RDE_HEADER@
|
|
* Moduletest
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
// Qwn
|
|
#include <Common/situation_map_logging.h>
|
|
|
|
|
|
namespace SituationMap
|
|
{
|
|
class Map;
|
|
}
|
|
|
|
namespace AdvancedSymbology
|
|
{
|
|
enum class SymbologyType;
|
|
}
|
|
|
|
|
|
// Qt
|
|
#include <QDialog>
|
|
|
|
class SitMap : public QDialog
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
SitMap(AdvancedSymbology::SymbologyType symbologyType, QWidget *parent = nullptr);
|
|
virtual ~SitMap();
|
|
|
|
virtual bool isReady();
|
|
|
|
SituationMap::Map *map();
|
|
|
|
|
|
signals:
|
|
void mapReady();
|
|
void mapReadyAndSymbolDictionaryLoaded();
|
|
|
|
public slots:
|
|
void onCreateDestroyClicked();
|
|
void createMap();
|
|
|
|
|
|
private:
|
|
SituationMap::LOGGER_T m_logger; ///< Interface of the Logging-Facility
|
|
|
|
class Private;
|
|
Private *d = nullptr;
|
|
|
|
};
|
|
|