Skip to content

Add separate Tools module in ApplicationLibCode #865

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Copilot wants to merge 2 commits into
base: dev
Choose a base branch
from
Draft

Add separate Tools module in ApplicationLibCode #865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21ed2c7
Initial plan
Copilot Apr 9, 2026
16f580d
#issue Add separate Tools module in ApplicationLibCode
Copilot Apr 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions ApplicationLibCode/Application/Tools/CMakeLists_files.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ set(SOURCE_GROUP_HEADER_FILES
${CMAKE_CURRENT_LIST_DIR}/RiaColorTables.h
${CMAKE_CURRENT_LIST_DIR}/RiaColorTools.h
${CMAKE_CURRENT_LIST_DIR}/RiaEclipseUnitTools.h
${CMAKE_CURRENT_LIST_DIR}/RiaImageCompareReporter.h
${CMAKE_CURRENT_LIST_DIR}/RiaImageFileCompare.h
${CMAKE_CURRENT_LIST_DIR}/RiaImageTools.h
${CMAKE_CURRENT_LIST_DIR}/RiaLogging.h
${CMAKE_CURRENT_LIST_DIR}/RiaProjectModifier.h
Expand All @@ -17,7 +15,6 @@ set(SOURCE_GROUP_HEADER_FILES
${CMAKE_CURRENT_LIST_DIR}/RiaInterpolationTools.h
${CMAKE_CURRENT_LIST_DIR}/RiaSimWellBranchTools.h
${CMAKE_CURRENT_LIST_DIR}/RiaProjectFileTools.h
${CMAKE_CURRENT_LIST_DIR}/RiaStringEncodingTools.h
${CMAKE_CURRENT_LIST_DIR}/RiaTextStringTools.h
${CMAKE_CURRENT_LIST_DIR}/RiaTextFileCompare.h
${CMAKE_CURRENT_LIST_DIR}/RiaRegressionTestRunner.h
Expand All @@ -30,11 +27,7 @@ set(SOURCE_GROUP_HEADER_FILES
${CMAKE_CURRENT_LIST_DIR}/RiaWellLogCurveMerger.h
${CMAKE_CURRENT_LIST_DIR}/RiaTimeHistoryCurveResampler.h
${CMAKE_CURRENT_LIST_DIR}/RiaOffshoreSphericalCoords.h
${CMAKE_CURRENT_LIST_DIR}/RiaWeightedMeanCalculator.h
${CMAKE_CURRENT_LIST_DIR}/RiaMedianCalculator.h
${CMAKE_CURRENT_LIST_DIR}/RiaWeightedMeanCalculator.inl
${CMAKE_CURRENT_LIST_DIR}/RiaWeightedGeometricMeanCalculator.h
${CMAKE_CURRENT_LIST_DIR}/RiaWeightedHarmonicMeanCalculator.h
${CMAKE_CURRENT_LIST_DIR}/RiaOptionItemFactory.h
${CMAKE_CURRENT_LIST_DIR}/RiaGitDiff.h
${CMAKE_CURRENT_LIST_DIR}/RiaWslTools.h
Expand All @@ -43,19 +36,15 @@ set(SOURCE_GROUP_HEADER_FILES
${CMAKE_CURRENT_LIST_DIR}/RiaBoundingBoxTools.h
${CMAKE_CURRENT_LIST_DIR}/RiaWellLogUnitTools.h
${CMAKE_CURRENT_LIST_DIR}/RiaWellLogUnitTools.inl
${CMAKE_CURRENT_LIST_DIR}/RiaTimeTTools.h
${CMAKE_CURRENT_LIST_DIR}/RiaValidRegExpValidator.h
${CMAKE_CURRENT_LIST_DIR}/RiaVec3Tools.h
${CMAKE_CURRENT_LIST_DIR}/RiaEnsembleNameTools.h
${CMAKE_CURRENT_LIST_DIR}/RiaNetworkTools.h
${CMAKE_CURRENT_LIST_DIR}/RiaOpenMPTools.h
${CMAKE_CURRENT_LIST_DIR}/RiaNumericalTools.h
${CMAKE_CURRENT_LIST_DIR}/RiaPhaseTools.h
${CMAKE_CURRENT_LIST_DIR}/RiaRegressionTextTools.h
${CMAKE_CURRENT_LIST_DIR}/RiaFileLogger.h
${CMAKE_CURRENT_LIST_DIR}/RiaProjectBackupTools.h
${CMAKE_CURRENT_LIST_DIR}/RiaQuantityInfoTools.h
${CMAKE_CURRENT_LIST_DIR}/RiaHashTools.h
${CMAKE_CURRENT_LIST_DIR}/RiaAngleUtils.h
${CMAKE_CURRENT_LIST_DIR}/RiaAngleUtils.inl
${CMAKE_CURRENT_LIST_DIR}/RiaToCafLogging.h
Expand All @@ -67,8 +56,6 @@ set(SOURCE_GROUP_SOURCE_FILES
${CMAKE_CURRENT_LIST_DIR}/RiaColorTables.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaColorTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaEclipseUnitTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaImageCompareReporter.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaImageFileCompare.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaImageTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaLogging.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaProjectModifier.cpp
Expand All @@ -80,7 +67,6 @@ set(SOURCE_GROUP_SOURCE_FILES
${CMAKE_CURRENT_LIST_DIR}/RiaInterpolationTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaSimWellBranchTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaProjectFileTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaStringEncodingTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaTextStringTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaTextFileCompare.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaRegressionTestRunner.cpp
Expand All @@ -91,23 +77,18 @@ set(SOURCE_GROUP_SOURCE_FILES
${CMAKE_CURRENT_LIST_DIR}/RiaCurveDataTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaWellLogCurveMerger.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaTimeHistoryCurveResampler.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaWeightedGeometricMeanCalculator.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaWeightedHarmonicMeanCalculator.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaOptionItemFactory.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaGitDiff.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaWslTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaCellDividingTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaFieldHandleTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaBoundingBoxTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaTimeTTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaValidRegExpValidator.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaEnsembleNameTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaVec3Tools.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaNetworkTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaOpenMPTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaNumericalTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaPhaseTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaRegressionTextTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaFileLogger.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaProjectBackupTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaQuantityInfoTools.cpp
Expand Down
2 changes: 1 addition & 1 deletion ApplicationLibCode/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
endif()

target_link_libraries(
ApplicationLibCode PUBLIC ${LINK_LIBRARIES} ${EXTERNAL_LINK_LIBRARIES}
ApplicationLibCode PUBLIC ${LINK_LIBRARIES} ${EXTERNAL_LINK_LIBRARIES} Tools
)
target_link_libraries(ApplicationLibCode PRIVATE ResInsightCommonSettings)

Expand Down
36 changes: 36 additions & 0 deletions ApplicationLibCode/Tools/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
project(Tools)

find_package(
Qt6
COMPONENTS Core
REQUIRED
)

set(SOURCE_FILES
RiaHashTools.h
RiaImageCompareReporter.h
RiaImageCompareReporter.cpp
RiaImageFileCompare.h
RiaImageFileCompare.cpp
RiaOpenMPTools.h
RiaOpenMPTools.cpp
RiaRegressionTextTools.h
RiaRegressionTextTools.cpp
RiaStringEncodingTools.h
RiaStringEncodingTools.cpp
RiaTimeTTools.h
RiaTimeTTools.cpp
RiaWeightedGeometricMeanCalculator.h
RiaWeightedGeometricMeanCalculator.cpp
RiaWeightedHarmonicMeanCalculator.h
RiaWeightedHarmonicMeanCalculator.cpp
RiaWeightedMeanCalculator.h
RiaWeightedMeanCalculator.inl
enum_bitmask.hpp
)

add_library(${PROJECT_NAME} ${SOURCE_FILES})

target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

target_link_libraries(${PROJECT_NAME} PUBLIC Qt6::Core regression-analysis)
0 ...nLibCode/Application/Tools/RiaHashTools.h → ApplicationLibCode/Tools/RiaHashTools.h
View file
Open in desktop
File renamed without changes.
0 ...ication/Tools/RiaImageCompareReporter.cpp → ...LibCode/Tools/RiaImageCompareReporter.cpp
View file
Open in desktop
File renamed without changes.
0 ...plication/Tools/RiaImageCompareReporter.h → ...onLibCode/Tools/RiaImageCompareReporter.h
View file
Open in desktop
File renamed without changes.
0 ...Application/Tools/RiaImageFileCompare.cpp → ...tionLibCode/Tools/RiaImageFileCompare.cpp
View file
Open in desktop
File renamed without changes.
0 ...e/Application/Tools/RiaImageFileCompare.h → ...cationLibCode/Tools/RiaImageFileCompare.h
View file
Open in desktop
File renamed without changes.
0 ...Code/Application/Tools/RiaOpenMPTools.cpp → ApplicationLibCode/Tools/RiaOpenMPTools.cpp
View file
Open in desktop
File renamed without changes.
0 ...ibCode/Application/Tools/RiaOpenMPTools.h → ApplicationLibCode/Tools/RiaOpenMPTools.h
View file
Open in desktop
File renamed without changes.
0 ...lication/Tools/RiaRegressionTextTools.cpp → ...nLibCode/Tools/RiaRegressionTextTools.cpp
View file
Open in desktop
File renamed without changes.
0 ...pplication/Tools/RiaRegressionTextTools.h → ...ionLibCode/Tools/RiaRegressionTextTools.h
View file
Open in desktop
File renamed without changes.
0 ...lication/Tools/RiaStringEncodingTools.cpp → ...nLibCode/Tools/RiaStringEncodingTools.cpp
View file
Open in desktop
File renamed without changes.
0 ...pplication/Tools/RiaStringEncodingTools.h → ...ionLibCode/Tools/RiaStringEncodingTools.h
View file
Open in desktop
File renamed without changes.
0 ...bCode/Application/Tools/RiaTimeTTools.cpp → ApplicationLibCode/Tools/RiaTimeTTools.cpp
View file
Open in desktop
File renamed without changes.
0 ...LibCode/Application/Tools/RiaTimeTTools.h → ApplicationLibCode/Tools/RiaTimeTTools.h
View file
Open in desktop
File renamed without changes.
0 ...ls/RiaWeightedGeometricMeanCalculator.cpp → ...ls/RiaWeightedGeometricMeanCalculator.cpp
View file
Open in desktop
File renamed without changes.
0 ...ools/RiaWeightedGeometricMeanCalculator.h → ...ools/RiaWeightedGeometricMeanCalculator.h
View file
Open in desktop
File renamed without changes.
0 ...ols/RiaWeightedHarmonicMeanCalculator.cpp → ...ols/RiaWeightedHarmonicMeanCalculator.cpp
View file
Open in desktop
File renamed without changes.
0 ...Tools/RiaWeightedHarmonicMeanCalculator.h → ...Tools/RiaWeightedHarmonicMeanCalculator.h
View file
Open in desktop
File renamed without changes.
0 ...ication/Tools/RiaWeightedMeanCalculator.h → ...LibCode/Tools/RiaWeightedMeanCalculator.h
View file
Open in desktop
File renamed without changes.
0 ...ation/Tools/RiaWeightedMeanCalculator.inl → ...bCode/Tools/RiaWeightedMeanCalculator.inl
View file
Open in desktop
File renamed without changes.
0 ...ibCode/Application/Tools/enum_bitmask.hpp → ApplicationLibCode/Tools/enum_bitmask.hpp
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1121,6 +1121,7 @@ endif()
# ##############################################################################
# Application
# ##############################################################################
add_subdirectory(ApplicationLibCode/Tools)
add_subdirectory(ApplicationLibCode)
add_subdirectory(ApplicationLibCode/Commands)
add_subdirectory(ApplicationLibCode/ResultStatisticsCache)
Expand Down