Qt6 Migration: Complete migration with DDS/RTI support and build validation
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>
This commit is contained in:
18662 files changed
+4115092
-5435
No files matched your search
@@ -0,0 +1,151 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Interface of AbstractMapObject
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
// Own
|
||||
#include "situation_map_types.h"
|
||||
#include <Common/situation_map_logging.h>
|
||||
#include <situation_map_export.h>
|
||||
#include <Symbology/symbol_dictionary.h>
|
||||
|
||||
// Qt
|
||||
#include <QString>
|
||||
#include <QSettings>
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
namespace SituationMap
|
||||
{
|
||||
|
||||
/**
|
||||
* @brief The MapSettings class is reading some values from an ini file using the QSettings.
|
||||
* The main use case is the class MapInitializer.
|
||||
*/
|
||||
class SITUATIONMAP_EXPORT MapSettings : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
/*! \name Construction, Destruction */
|
||||
//@{
|
||||
|
||||
/**
|
||||
* @brief Constructor
|
||||
* @param inifile_ABSOLUTE_Path to read
|
||||
*/
|
||||
explicit MapSettings(const QString &inifile_ABSOLUTE_Path, QObject *parent = nullptr);
|
||||
|
||||
/**
|
||||
* @brief ~MapSettings destructor
|
||||
*/
|
||||
virtual ~MapSettings();
|
||||
//@}
|
||||
|
||||
/**
|
||||
* @brief Get filename
|
||||
* @return filename
|
||||
*/
|
||||
QString filename() const;
|
||||
|
||||
/*! \name Functions for error handling */
|
||||
//@{
|
||||
bool hasErrors() const;
|
||||
bool exists() const;
|
||||
bool accessError() const;
|
||||
bool formatError() const;
|
||||
//@}
|
||||
|
||||
/*! \name Get values */
|
||||
//@{
|
||||
QString licenseStr() const;
|
||||
QStringList licenseExtensions();
|
||||
|
||||
EsriNetworkCacheSettings networkCacheSettings();
|
||||
|
||||
QString symbologyTypeStr() const;
|
||||
AdvancedSymbology::SymbologyType symbologyType() const;
|
||||
QString extraSymbolDirectory() const;
|
||||
|
||||
QString basemapLayernamePrefix();
|
||||
QString localMapFile();
|
||||
QVector<QPair<QString, QString>> mapUrlsWithNames();
|
||||
QStringList mapUrls();
|
||||
QStringList sceneUrls();
|
||||
QVector<QPair<QString, QString>> sceneUrlsWithNames();
|
||||
QStringList sceneObjectUrls();
|
||||
QStringList elevationUrls();
|
||||
|
||||
QStringList operationalLayers();
|
||||
QString participantLayername();
|
||||
|
||||
QString operationalLayerForCubes();
|
||||
|
||||
|
||||
QString centerPointMgrs() const;
|
||||
|
||||
double scale() const;
|
||||
double minScale() const;
|
||||
double maxScale() const;
|
||||
double scaleHasVisibility() const;
|
||||
|
||||
double zoomFactorBase() const;
|
||||
|
||||
QString gridStr() const;
|
||||
GridType gridType() const;
|
||||
|
||||
double animationDuration() const;
|
||||
double rocketDuration() const;
|
||||
|
||||
|
||||
|
||||
bool addMapWidgets() const;
|
||||
bool addSideBar() const;
|
||||
|
||||
QString viewshedUrl() const;
|
||||
|
||||
|
||||
QColor rubberbandDrawColor() const;
|
||||
QColor rubberbandFillColor() const;
|
||||
QColor rubberbandHandleDrawColor() const;
|
||||
QColor rubberbandHandleFillColor() const;
|
||||
QColor rubberbandSelectionColor() const;
|
||||
QColor rubberbandFrameColor() const;
|
||||
QColor rubberbandFrameFillColor() const;
|
||||
int rubberbandFrameHandleMargin() const;
|
||||
QPoint rubberbandPreviewOffset() const;
|
||||
unsigned int rubberbandPreviewSize() const;
|
||||
unsigned int rubberbandPickingRatio() const;
|
||||
unsigned int rubberbandLineHandleWidth() const;
|
||||
//@}
|
||||
|
||||
|
||||
QString toString() const;
|
||||
|
||||
protected:
|
||||
QSettings m_settings;
|
||||
|
||||
LOGGER_T m_logger; ///< Interface of the Logging-Facility
|
||||
};
|
||||
|
||||
|
||||
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// output operator:
|
||||
//-----------------------------------------------------------------------------
|
||||
/**
|
||||
* @brief Output operator
|
||||
* @param stream used to stream into.
|
||||
* @param value to be streamed.
|
||||
* @return appended stream.
|
||||
*/
|
||||
SITUATIONMAP_EXPORT std::ostream &operator<< (std::ostream &stream,
|
||||
const MapSettings &value);
|
||||
|
||||
|
||||
} // namespace SituationMap
|
||||
|
||||
Reference in new issue
Block a user