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,109 @@
|
||||
/*
|
||||
** -----------------------------------------------------------------------------------------------
|
||||
**
|
||||
** @RDE_HEADER@
|
||||
** Implementation of base class for 2D rubberbands
|
||||
** $Id$
|
||||
** $HeadURL$
|
||||
** $Author$
|
||||
**
|
||||
** -----------------------------------------------------------------------------------------------
|
||||
**
|
||||
** Hardware-Environment: Intel-PC
|
||||
** Software-Environment: Windows 7, Qt 5.x. ArcGISRuntimeQt 100.2
|
||||
**
|
||||
** Language ........: C++ 11
|
||||
**
|
||||
** -----------------------------------------------------------------------------------------------
|
||||
**
|
||||
** Autor ...........: Nikolaus Hanekamp, SEDG, Tel. 2906
|
||||
** Jörg Turla, SPDG, Tel. 3132
|
||||
**
|
||||
** -----------------------------------------------------------------------------------------------
|
||||
**
|
||||
** Notices .........:
|
||||
**
|
||||
** 01.02.2005, NH : Urversion
|
||||
** 15.05.2018, JT : adapting GeISiR source to SituationMap
|
||||
**
|
||||
** -----------------------------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <Map/abstract_map_object.h>
|
||||
|
||||
|
||||
namespace SituationMap
|
||||
{
|
||||
|
||||
class ElevationMap; // Forward declaration
|
||||
|
||||
|
||||
|
||||
class SITUATIONMAP_EXPORT SightFan: public virtual AbstractMapObject
|
||||
{
|
||||
public:
|
||||
|
||||
SightFan(const SightFan &) = delete; // copy constructor
|
||||
SightFan & operator = (const SightFan &) = delete; // assignment operator
|
||||
|
||||
SightFan() : AbstractMapObject() {;}
|
||||
|
||||
virtual ~SightFan() = default;
|
||||
|
||||
virtual void initFan( const QPointF ¢er
|
||||
, double centHat
|
||||
, double objHat
|
||||
, double radius
|
||||
, double innerRadius
|
||||
, double startAngle
|
||||
, double dAngle
|
||||
, unsigned int nrFans
|
||||
, double alpha ) = 0;
|
||||
|
||||
virtual void initFan( const Point3D ¢er
|
||||
, double objHat
|
||||
, double radius
|
||||
, double innerRadius
|
||||
, double startAngle
|
||||
, double dAngle
|
||||
, unsigned int nrFans
|
||||
, double alpha ) = 0;
|
||||
|
||||
virtual void setCenter(const QPointF ¢er) = 0;
|
||||
virtual void setCenter(const Point3D ¢er) = 0;
|
||||
virtual void setCenter(const QPointF ¢er, double centerHat ) = 0;
|
||||
|
||||
virtual void setCenterHat(double centerHat) = 0;
|
||||
virtual void setObjectHat(double objHat) = 0;
|
||||
|
||||
virtual void setRadius(double radius) = 0;
|
||||
virtual void setInnerRadius(double radius) = 0;
|
||||
virtual void setStartAngle(double startAngle) = 0;
|
||||
virtual void setdeltaAngle(double dAngle) = 0;
|
||||
virtual void setNoOfFans(double noFans) = 0;
|
||||
virtual void setAlpha(double alpha) = 0;
|
||||
|
||||
virtual QPointF center() const = 0;
|
||||
virtual double centerHat() const = 0;
|
||||
virtual double objectHat() const = 0;
|
||||
virtual double innerRadius() const = 0;
|
||||
virtual double radius() const = 0;
|
||||
virtual double startAngle() const = 0;
|
||||
virtual double dAngle() const = 0;
|
||||
virtual double alpha() const = 0;
|
||||
virtual unsigned int noOfFans() const = 0;
|
||||
|
||||
virtual void move(const QPointF ¢er) = 0;
|
||||
|
||||
virtual void move(const QPointF ¢er, double centHat, double objHat) = 0;
|
||||
|
||||
virtual void show() = 0;
|
||||
virtual void setFanColor(const QColor & visible, const QColor &invisible, const QColor &undefined) = 0;
|
||||
virtual void setFanColorMark(float colMult) = 0;
|
||||
|
||||
}; // SightFan
|
||||
|
||||
} // SituationMap
|
||||
|
||||
Reference in new issue
Block a user