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:
1 parent
13f0c3ffbc
commit
09b5e99729
26 files changed
+1870
-289
No files matched your search
@@ -13,6 +13,15 @@ IF(NOT MSVC)
|
||||
ENDIF()
|
||||
OPTION(BUILD_SITMAP_UNIT_TESTS "Build situation map unit tests" ON)
|
||||
|
||||
# Add subdirectories for libraries that situationMap depends on
|
||||
# Must be before situationMap library definition (line ~403)
|
||||
ADD_SUBDIRECTORY(Common)
|
||||
ADD_SUBDIRECTORY(ElevationMap)
|
||||
ADD_SUBDIRECTORY(Symbology)
|
||||
ADD_SUBDIRECTORY(SymbologyGui)
|
||||
ADD_SUBDIRECTORY(SymbologyXML)
|
||||
ADD_SUBDIRECTORY(SideBar)
|
||||
ADD_SUBDIRECTORY(GeometryModel)
|
||||
|
||||
SET(GraphicalObjects_SRCS
|
||||
GraphicalObjects/abstract_graphical_object.cpp
|
||||
@@ -568,17 +577,12 @@ NGL_INSTALL_TARGET(situationMap)
|
||||
|
||||
# Choose logical order instead of alphabetical.
|
||||
# UnitTest should be performed BEFORE ModuleTest
|
||||
ADD_SUBDIRECTORY(Common)
|
||||
ADD_SUBDIRECTORY(ElevationMap)
|
||||
ADD_SUBDIRECTORY(Symbology)
|
||||
ADD_SUBDIRECTORY(SymbologyGui)
|
||||
ADD_SUBDIRECTORY(SymbologyXML)
|
||||
# Note: Common, ElevationMap, Symbology, SymbologyGui, SymbologyXML, SideBar, GeometryModel
|
||||
# are added earlier in this file (before situationMap library definition)
|
||||
ADD_SUBDIRECTORY(MapObjectsImpl)
|
||||
#ADD_SUBDIRECTORY(LocalSrv)
|
||||
|
||||
ADD_SUBDIRECTORY(SideBar)
|
||||
ADD_SUBDIRECTORY(FunctionDialog)
|
||||
ADD_SUBDIRECTORY(GeometryModel)
|
||||
ADD_SUBDIRECTORY(Portal)
|
||||
|
||||
ADD_SUBDIRECTORY(Tests)
|
||||
|
||||
Reference in new issue
Block a user