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,115 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* IndicationContainer
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
// Own
|
||||
#include <Map/situation_map_types.h>
|
||||
#include <Common/situation_map_logging.h>
|
||||
|
||||
|
||||
// Qt
|
||||
#include <QImage>
|
||||
#include <QMap>
|
||||
#include <QVariant>
|
||||
|
||||
|
||||
// forward:
|
||||
namespace Esri
|
||||
{
|
||||
namespace ArcGISRuntime
|
||||
{
|
||||
class GeoView;
|
||||
class GraphicsOverlay;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
namespace SituationMap
|
||||
{
|
||||
|
||||
// Forward:
|
||||
class CoordTranslationFunctor;
|
||||
class IndicationData;
|
||||
|
||||
|
||||
class IndicationContainer : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit IndicationContainer(const Esri::ArcGISRuntime::GeoView *geoView,
|
||||
Esri::ArcGISRuntime::GraphicsOverlay *graphicsLayer,
|
||||
CoordTranslationFunctor *coordTransFunctor,
|
||||
const UniqueMapId &uniqueMapId);
|
||||
virtual ~IndicationContainer();
|
||||
|
||||
IndicationContainer(const IndicationContainer &other) = delete;
|
||||
IndicationContainer &operator=(IndicationContainer &other) = delete;
|
||||
|
||||
QString debugInfo() const;
|
||||
void setDebugInfo(const QString &debugInfo);
|
||||
|
||||
// Marker :
|
||||
|
||||
virtual PositionCont positions(int idx) const;
|
||||
virtual void setPositions(int idx, const PositionCont &positions);
|
||||
|
||||
virtual void setMarker(int idx, MarkerSymbolType mst, int size, const QColor &color);
|
||||
virtual void setMarker(int idx, int size);
|
||||
virtual void setMarker(int idx, const QColor &color);
|
||||
|
||||
virtual const QImage &image(int idx) const;
|
||||
virtual void setImage(int idx, const QImage &image);
|
||||
|
||||
virtual void clear(int idx);
|
||||
virtual void clearAll();
|
||||
|
||||
virtual int drawOrder() const;
|
||||
virtual void setDrawOrder(int drawOrder);
|
||||
|
||||
virtual bool visible(int idx) const;
|
||||
virtual void setVisible(int idx, bool visible);
|
||||
|
||||
virtual bool selected(int idx) const;
|
||||
virtual void setSelected(int idx, bool selected);
|
||||
|
||||
virtual bool pickable(int idx) const;
|
||||
virtual void setPickable(int idx, bool pickable);
|
||||
|
||||
|
||||
virtual int getIndicationCount() const;
|
||||
virtual QList<int> getIndicationIndexList() const;
|
||||
|
||||
|
||||
virtual bool updateView();
|
||||
virtual bool updateIndicationContainer(int idx);
|
||||
virtual bool updateIndicationContainerPictureMarker(int idx);
|
||||
// virtual bool updateIndicationContainerSceneMarker(int idx);
|
||||
|
||||
public slots:
|
||||
virtual void onThreadFinished(const QVariant &userData);
|
||||
virtual bool onResultReady(const QVariant &userData);
|
||||
|
||||
|
||||
private:
|
||||
LOGGER_T m_logger; ///< Interface of the Logging-Facility
|
||||
|
||||
class Private;
|
||||
/**
|
||||
* The private d->pointer to not break BC when changing internals of this class
|
||||
*/
|
||||
Private *d = nullptr;
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
||||
} // namespace SituationMap
|
||||
|
||||
Reference in new issue
Block a user