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,120 @@
|
||||
$Id$
|
||||
$HeadURL$
|
||||
$Author$
|
||||
|
||||
Dir: SituationMap
|
||||
Date: 2015-12-15
|
||||
|
||||
AdapterShm
|
||||
- transfer data from SHM to Map.
|
||||
|
||||
ArcGISQt5Hack
|
||||
- Some ArcGIS versions are using a qt version which requires an sysmbol 'operator delete()' which is missing in out qt.
|
||||
So try to 'emulate'
|
||||
|
||||
Common
|
||||
- Common elementes like IdHandler, ReferencePointer, Logging, export macros etc.
|
||||
- Have to be a sperate lib to avoid circular dependencies
|
||||
|
||||
GeometryModel
|
||||
- Classes to define a set of graphics drawn in one layer, like a plan
|
||||
|
||||
GraphicalObjects
|
||||
- Graphical primitives to render with ESRI RuntimeQt-Library
|
||||
|
||||
FunctionDialog
|
||||
- Dialog for debugging purpose
|
||||
|
||||
GraphicalObjects
|
||||
- GraphicalObjects are used in MapImpl
|
||||
|
||||
Map
|
||||
- Interface of common map
|
||||
|
||||
MapImpl
|
||||
- Implementation of 'Map'
|
||||
|
||||
MapObjects
|
||||
- Interface to define objects on the map
|
||||
- Consisting of one or more GraphicObjects
|
||||
|
||||
MapObjectsImpl
|
||||
- Implementation of MapObjects
|
||||
|
||||
MathUtils
|
||||
- Mathematical utils like clipper, PathRasterer, SimpleHelper, Spline
|
||||
|
||||
ModuleTests
|
||||
- ModuleTest of Interface (with GUI)
|
||||
|
||||
Resources
|
||||
- Some resource files like
|
||||
- 'pushPinRedClipArt.png' (http://www.clipartbest.com/clipart-jixEoBAdT)
|
||||
- ..
|
||||
|
||||
Rubberbands
|
||||
- Interfaces (and implementations) of rubberbands to handle input of geometries
|
||||
|
||||
SideBar
|
||||
- Implementation of a sidebar widget on map
|
||||
|
||||
Symbology
|
||||
- Interface of 'Symbology'
|
||||
|
||||
SymbologyGui
|
||||
- Gui Interface to use Symbology in Dialogs and Views
|
||||
|
||||
SymbologyImpl
|
||||
- Implementation of 'Symbology'
|
||||
|
||||
Tests
|
||||
- initial executable (to test the library)
|
||||
|
||||
UnitTests
|
||||
- UnitTests (also of internal classes), uses static version of situationMap (libsituationMap_static.a)
|
||||
|
||||
UserInterface - currently unused
|
||||
- Ui files
|
||||
|
||||
Utils
|
||||
- Utilities, e.g. MouseMoveLayer
|
||||
|
||||
|
||||
Definitions
|
||||
=========================================================================
|
||||
|
||||
Abbr | Full name
|
||||
-------------------------------------------------------------------------
|
||||
|
||||
Esri | ESRI (Manufacturer of ArcGIS)
|
||||
ArcGIS | Product (by ESRI)
|
||||
Sidc | SIDC (Symbol Id Code)
|
||||
-------------------------------------------------------------------------
|
||||
|
||||
|
||||
=========================================================================
|
||||
=========================================================================
|
||||
|
||||
Annotations for the environment:
|
||||
|
||||
=========================================================================
|
||||
=========================================================================
|
||||
You can execute the example within the build dir. Therefore the props files are
|
||||
copied using a construction like this:
|
||||
SET(LOG4CXX_PROPS_FILE log4cxx_sitmapMain.props)
|
||||
ADD_CUSTOM_COMMAND(TARGET sitMapExample POST_BUILD
|
||||
COMMAND ${CMAKE_COMMAND}
|
||||
ARGS -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/${LOG4CXX_PROPS_FILE} $<TARGET_FILE_DIR:sitMapExample>/${LOG4CXX_PROPS_FILE}
|
||||
)
|
||||
But then the props file is only update if a cpp or h file is modified and the lib has to be rebuild.
|
||||
Therefore links are useful:
|
||||
|
||||
TDS-build-product/bin>
|
||||
lrwxrwxrwx 1 ctc ctc 119 15. Dez 09:25 log4cxxGeometryModelUnitTest.props -> /shd/CTC/TOOLS/TDS/TDS-source-product/Legatus/Plugins/SituationMap/UnitTestsGeoModel/log4cxxGeometryModelUnitTest.props
|
||||
lrwxrwxrwx 1 ctc ctc 110 15. Dez 09:25 log4cxxSituationMapUnitTest.props -> /shd/CTC/TOOLS/TDS/TDS-source-product/Legatus/Plugins/SituationMap/UnitTests/log4cxxSituationMapUnitTest.props
|
||||
lrwxrwxrwx 1 ctc ctc 111 15. Dez 09:25 log4cxxSitMapShm.props -> /shd/CTC/TOOLS/TDS/TDS-source-product/Legatus/Plugins/SituationMap/Tests/SituationMapShm/log4cxxSitMapShm.props
|
||||
lrwxrwxrwx 1 ctc ctc 114 15. Dez 09:25 log4cxx_sitMapTestApp.props -> /shd/CTC/TOOLS/TDS/TDS-source-product/Legatus/Plugins/SituationMap/Tests/SitMapTestApp/log4cxx_sitMapTestApp.props
|
||||
lrwxrwxrwx 1 ctc ctc 120 15. Dez 09:25 log4cxx_symbologyExample.props -> /shd/CTC/TOOLS/TDS/TDS-source-product/Legatus/Plugins/SituationMap/Tests/SymbologyExample/log4cxx_symbologyExample.props
|
||||
lrwxrwxrwx 1 ctc ctc 110 15. Dez 09:26 log4cxx_sitmapMain.props -> /shd/CTC/TOOLS/TDS/TDS-source-product/Legatus/Plugins/SituationMap/Tests/SituationMap/log4cxx_sitmapMain.props
|
||||
lrwxrwxrwx 1 ctc ctc 115 15. Dez 09:26 log4cxxSituationMapModuleTests.props -> /shd/CTC/TOOLS/TDS/TDS-source-product/Legatus/Plugins/SituationMap/ModuleTests/log4cxxSituationMapModuleTests.props
|
||||
|
||||
Reference in new issue
Block a user