Qt6 Migration: Complete SituationMap module migration with comprehensive tests

Migration Summary:
- Migrated 7 subdirectories: GraphicalObjects, Rubberbands, MathUtils, MapImpl,
  SymbologyImpl, Viewshed3D, and Common
- Applied Qt6 API changes: QTouchEvent, Qt::MiddleButton, QFuture continuations
- Updated ArcGIS SDK v300: include paths, identifyGraphicsOverlaysAsync()
- Fixed QList/QVector unification issues in MathUtils
- Replaced QSharedPointer::use_count() with isNull()/data() comparisons

Test Coverage:
- Created 6 new test files following check_pr_policies.py naming conventions
- test_graphical_objects.cpp, test_rubberbands.cpp, test_mathutils.cpp
- test_mapimpl.cpp, test_symbologyimpl.cpp, test_viewshed3d.cpp
- All tests integrated into CMake and CTest
- 42 SituationMap tests passing (695 total tests)

Build Validation:
- Docker build successful with Qt 6.10.2 via aqtinstall
- Fixed LtsDataView dependency order in CMakeLists.txt
- Fixed test paths to use absolute TESTS_DIR
- Removed duplicate main() functions from test files

Documentation:
- Created MIGRATION_STATUS.md with detailed migration status
- Created TEST_REPORT.md with comprehensive test coverage summary

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
torstenandCopilot committed 2026-10-20 02:49:34 +02:00
1 parent 13f0c3ffbc
commit 09b5e99729
26 files changed
+1870 -289

No files matched your search

@@ -866,6 +866,10 @@ BUILD_GROUP2="$(normalize_on_off "$BUILD_GROUP2" "BUILD_GROUP2")"
BUILD_GROUP3="$(normalize_on_off "$BUILD_GROUP3" "BUILD_GROUP3")"
BUILD_GROUP4="$(normalize_on_off "$BUILD_GROUP4" "BUILD_GROUP4")"
BUILD_GROUP5="$(normalize_on_off "$BUILD_GROUP5" "BUILD_GROUP5")"
# Auto-enable BUILD_ARCGIS when BUILD_GROUP5=ON (situationMap depends on advancedSymbology)
if [[ "${BUILD_GROUP5}" == "ON" ]]; then
BUILD_ARCGIS=ON
fi
BUILD_GROUP6="$(normalize_on_off "$BUILD_GROUP6" "BUILD_GROUP6")"
BUILD_GROUP7="$(normalize_on_off "$BUILD_GROUP7" "BUILD_GROUP7")"
BUILD_GROUP8="$(normalize_on_off "$BUILD_GROUP8" "BUILD_GROUP8")"
@@ -910,6 +914,14 @@ if [[ "${BUILD_ARCGIS}" == "ON" ]]; then
situationMap
LtsDataView
LtsDataViewTest
# Qt6 Migration Unit Tests
test_qt6_api_migrations
test_graphical_objects
test_rubberbands
test_mathutils
test_mapimpl
test_symbologyimpl
test_viewshed3d
)
else
GROUP5_TARGETS=(
@@ -926,6 +938,14 @@ if [[ "${BUILD_ARCGIS}" == "ON" ]]; then
LtsDataViewTest
LtsFileDialog
LtsFileDialogTest
# Qt6 Migration Unit Tests
test_qt6_api_migrations
test_graphical_objects
test_rubberbands
test_mathutils
test_mapimpl
test_symbologyimpl
test_viewshed3d
)
fi
else
@@ -941,6 +961,14 @@ else
situationMap
LtsDataView
LtsDataViewTest
# Qt6 Migration Unit Tests
test_qt6_api_migrations
test_graphical_objects
test_rubberbands
test_mathutils
test_mapimpl
test_symbologyimpl
test_viewshed3d
)
else
GROUP5_TARGETS=(
@@ -955,6 +983,14 @@ else
LtsDataViewTest
LtsFileDialog
LtsFileDialogTest
# Qt6 Migration Unit Tests
test_qt6_api_migrations
test_graphical_objects
test_rubberbands
test_mathutils
test_mapimpl
test_symbologyimpl
test_viewshed3d
)
fi
fi
@@ -1309,6 +1345,7 @@ cd build4
cmake .. \
-DBUILD_TESTING=ON \
-DBUILD_SITMAP_UNIT_TESTS=ON \
-DBUILD_ALL="${BUILD_ALL}" \
-DBUILD_SV="${BUILD_SV}" \
-DBUILD_WS="${BUILD_WS}" \