From 21ed2c7c355e44fbf5667600d73cebdb625bd445 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 9 Apr 2026 20:13:04 +0000 Subject: [PATCH 1/2] Initial plan From 16f580dbecd9d5c95589afc406c0626ec32171b6 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 9 Apr 2026 20:26:02 +0000 Subject: [PATCH 2/2] #issue Add separate Tools module in ApplicationLibCode Agent-Logs-Url: https://github.com/magnesj/ResInsight/sessions/33106290-167c-4d7d-a23d-10e229ec8a9c Co-authored-by: magnesj <1793152+magnesj@users.noreply.github.com> --- .../Application/Tools/CMakeLists_files.cmake | 19 ---------- ApplicationLibCode/CMakeLists.txt | 2 +- ApplicationLibCode/Tools/CMakeLists.txt | 36 +++++++++++++++++++ .../{Application => }/Tools/RiaHashTools.h | 0 .../Tools/RiaImageCompareReporter.cpp | 0 .../Tools/RiaImageCompareReporter.h | 0 .../Tools/RiaImageFileCompare.cpp | 0 .../Tools/RiaImageFileCompare.h | 0 .../Tools/RiaOpenMPTools.cpp | 0 .../{Application => }/Tools/RiaOpenMPTools.h | 0 .../Tools/RiaRegressionTextTools.cpp | 0 .../Tools/RiaRegressionTextTools.h | 0 .../Tools/RiaStringEncodingTools.cpp | 0 .../Tools/RiaStringEncodingTools.h | 0 .../{Application => }/Tools/RiaTimeTTools.cpp | 0 .../{Application => }/Tools/RiaTimeTTools.h | 0 .../RiaWeightedGeometricMeanCalculator.cpp | 0 .../RiaWeightedGeometricMeanCalculator.h | 0 .../RiaWeightedHarmonicMeanCalculator.cpp | 0 .../Tools/RiaWeightedHarmonicMeanCalculator.h | 0 .../Tools/RiaWeightedMeanCalculator.h | 0 .../Tools/RiaWeightedMeanCalculator.inl | 0 .../{Application => }/Tools/enum_bitmask.hpp | 0 CMakeLists.txt | 1 + 24 files changed, 38 insertions(+), 20 deletions(-) create mode 100644 ApplicationLibCode/Tools/CMakeLists.txt rename ApplicationLibCode/{Application => }/Tools/RiaHashTools.h (100%) rename ApplicationLibCode/{Application => }/Tools/RiaImageCompareReporter.cpp (100%) rename ApplicationLibCode/{Application => }/Tools/RiaImageCompareReporter.h (100%) rename ApplicationLibCode/{Application => }/Tools/RiaImageFileCompare.cpp (100%) rename ApplicationLibCode/{Application => }/Tools/RiaImageFileCompare.h (100%) rename ApplicationLibCode/{Application => }/Tools/RiaOpenMPTools.cpp (100%) rename ApplicationLibCode/{Application => }/Tools/RiaOpenMPTools.h (100%) rename ApplicationLibCode/{Application => }/Tools/RiaRegressionTextTools.cpp (100%) rename ApplicationLibCode/{Application => }/Tools/RiaRegressionTextTools.h (100%) rename ApplicationLibCode/{Application => }/Tools/RiaStringEncodingTools.cpp (100%) rename ApplicationLibCode/{Application => }/Tools/RiaStringEncodingTools.h (100%) rename ApplicationLibCode/{Application => }/Tools/RiaTimeTTools.cpp (100%) rename ApplicationLibCode/{Application => }/Tools/RiaTimeTTools.h (100%) rename ApplicationLibCode/{Application => }/Tools/RiaWeightedGeometricMeanCalculator.cpp (100%) rename ApplicationLibCode/{Application => }/Tools/RiaWeightedGeometricMeanCalculator.h (100%) rename ApplicationLibCode/{Application => }/Tools/RiaWeightedHarmonicMeanCalculator.cpp (100%) rename ApplicationLibCode/{Application => }/Tools/RiaWeightedHarmonicMeanCalculator.h (100%) rename ApplicationLibCode/{Application => }/Tools/RiaWeightedMeanCalculator.h (100%) rename ApplicationLibCode/{Application => }/Tools/RiaWeightedMeanCalculator.inl (100%) rename ApplicationLibCode/{Application => }/Tools/enum_bitmask.hpp (100%) diff --git a/ApplicationLibCode/Application/Tools/CMakeLists_files.cmake b/ApplicationLibCode/Application/Tools/CMakeLists_files.cmake index 56778d575b6..f501a0ddd09 100644 --- a/ApplicationLibCode/Application/Tools/CMakeLists_files.cmake +++ b/ApplicationLibCode/Application/Tools/CMakeLists_files.cmake @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/ApplicationLibCode/CMakeLists.txt b/ApplicationLibCode/CMakeLists.txt index 1b11e524e75..360f63946cf 100644 --- a/ApplicationLibCode/CMakeLists.txt +++ b/ApplicationLibCode/CMakeLists.txt @@ -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) diff --git a/ApplicationLibCode/Tools/CMakeLists.txt b/ApplicationLibCode/Tools/CMakeLists.txt new file mode 100644 index 00000000000..e0590fa84ff --- /dev/null +++ b/ApplicationLibCode/Tools/CMakeLists.txt @@ -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) diff --git a/ApplicationLibCode/Application/Tools/RiaHashTools.h b/ApplicationLibCode/Tools/RiaHashTools.h similarity index 100% rename from ApplicationLibCode/Application/Tools/RiaHashTools.h rename to ApplicationLibCode/Tools/RiaHashTools.h diff --git a/ApplicationLibCode/Application/Tools/RiaImageCompareReporter.cpp b/ApplicationLibCode/Tools/RiaImageCompareReporter.cpp similarity index 100% rename from ApplicationLibCode/Application/Tools/RiaImageCompareReporter.cpp rename to ApplicationLibCode/Tools/RiaImageCompareReporter.cpp diff --git a/ApplicationLibCode/Application/Tools/RiaImageCompareReporter.h b/ApplicationLibCode/Tools/RiaImageCompareReporter.h similarity index 100% rename from ApplicationLibCode/Application/Tools/RiaImageCompareReporter.h rename to ApplicationLibCode/Tools/RiaImageCompareReporter.h diff --git a/ApplicationLibCode/Application/Tools/RiaImageFileCompare.cpp b/ApplicationLibCode/Tools/RiaImageFileCompare.cpp similarity index 100% rename from ApplicationLibCode/Application/Tools/RiaImageFileCompare.cpp rename to ApplicationLibCode/Tools/RiaImageFileCompare.cpp diff --git a/ApplicationLibCode/Application/Tools/RiaImageFileCompare.h b/ApplicationLibCode/Tools/RiaImageFileCompare.h similarity index 100% rename from ApplicationLibCode/Application/Tools/RiaImageFileCompare.h rename to ApplicationLibCode/Tools/RiaImageFileCompare.h diff --git a/ApplicationLibCode/Application/Tools/RiaOpenMPTools.cpp b/ApplicationLibCode/Tools/RiaOpenMPTools.cpp similarity index 100% rename from ApplicationLibCode/Application/Tools/RiaOpenMPTools.cpp rename to ApplicationLibCode/Tools/RiaOpenMPTools.cpp diff --git a/ApplicationLibCode/Application/Tools/RiaOpenMPTools.h b/ApplicationLibCode/Tools/RiaOpenMPTools.h similarity index 100% rename from ApplicationLibCode/Application/Tools/RiaOpenMPTools.h rename to ApplicationLibCode/Tools/RiaOpenMPTools.h diff --git a/ApplicationLibCode/Application/Tools/RiaRegressionTextTools.cpp b/ApplicationLibCode/Tools/RiaRegressionTextTools.cpp similarity index 100% rename from ApplicationLibCode/Application/Tools/RiaRegressionTextTools.cpp rename to ApplicationLibCode/Tools/RiaRegressionTextTools.cpp diff --git a/ApplicationLibCode/Application/Tools/RiaRegressionTextTools.h b/ApplicationLibCode/Tools/RiaRegressionTextTools.h similarity index 100% rename from ApplicationLibCode/Application/Tools/RiaRegressionTextTools.h rename to ApplicationLibCode/Tools/RiaRegressionTextTools.h diff --git a/ApplicationLibCode/Application/Tools/RiaStringEncodingTools.cpp b/ApplicationLibCode/Tools/RiaStringEncodingTools.cpp similarity index 100% rename from ApplicationLibCode/Application/Tools/RiaStringEncodingTools.cpp rename to ApplicationLibCode/Tools/RiaStringEncodingTools.cpp diff --git a/ApplicationLibCode/Application/Tools/RiaStringEncodingTools.h b/ApplicationLibCode/Tools/RiaStringEncodingTools.h similarity index 100% rename from ApplicationLibCode/Application/Tools/RiaStringEncodingTools.h rename to ApplicationLibCode/Tools/RiaStringEncodingTools.h diff --git a/ApplicationLibCode/Application/Tools/RiaTimeTTools.cpp b/ApplicationLibCode/Tools/RiaTimeTTools.cpp similarity index 100% rename from ApplicationLibCode/Application/Tools/RiaTimeTTools.cpp rename to ApplicationLibCode/Tools/RiaTimeTTools.cpp diff --git a/ApplicationLibCode/Application/Tools/RiaTimeTTools.h b/ApplicationLibCode/Tools/RiaTimeTTools.h similarity index 100% rename from ApplicationLibCode/Application/Tools/RiaTimeTTools.h rename to ApplicationLibCode/Tools/RiaTimeTTools.h diff --git a/ApplicationLibCode/Application/Tools/RiaWeightedGeometricMeanCalculator.cpp b/ApplicationLibCode/Tools/RiaWeightedGeometricMeanCalculator.cpp similarity index 100% rename from ApplicationLibCode/Application/Tools/RiaWeightedGeometricMeanCalculator.cpp rename to ApplicationLibCode/Tools/RiaWeightedGeometricMeanCalculator.cpp diff --git a/ApplicationLibCode/Application/Tools/RiaWeightedGeometricMeanCalculator.h b/ApplicationLibCode/Tools/RiaWeightedGeometricMeanCalculator.h similarity index 100% rename from ApplicationLibCode/Application/Tools/RiaWeightedGeometricMeanCalculator.h rename to ApplicationLibCode/Tools/RiaWeightedGeometricMeanCalculator.h diff --git a/ApplicationLibCode/Application/Tools/RiaWeightedHarmonicMeanCalculator.cpp b/ApplicationLibCode/Tools/RiaWeightedHarmonicMeanCalculator.cpp similarity index 100% rename from ApplicationLibCode/Application/Tools/RiaWeightedHarmonicMeanCalculator.cpp rename to ApplicationLibCode/Tools/RiaWeightedHarmonicMeanCalculator.cpp diff --git a/ApplicationLibCode/Application/Tools/RiaWeightedHarmonicMeanCalculator.h b/ApplicationLibCode/Tools/RiaWeightedHarmonicMeanCalculator.h similarity index 100% rename from ApplicationLibCode/Application/Tools/RiaWeightedHarmonicMeanCalculator.h rename to ApplicationLibCode/Tools/RiaWeightedHarmonicMeanCalculator.h diff --git a/ApplicationLibCode/Application/Tools/RiaWeightedMeanCalculator.h b/ApplicationLibCode/Tools/RiaWeightedMeanCalculator.h similarity index 100% rename from ApplicationLibCode/Application/Tools/RiaWeightedMeanCalculator.h rename to ApplicationLibCode/Tools/RiaWeightedMeanCalculator.h diff --git a/ApplicationLibCode/Application/Tools/RiaWeightedMeanCalculator.inl b/ApplicationLibCode/Tools/RiaWeightedMeanCalculator.inl similarity index 100% rename from ApplicationLibCode/Application/Tools/RiaWeightedMeanCalculator.inl rename to ApplicationLibCode/Tools/RiaWeightedMeanCalculator.inl diff --git a/ApplicationLibCode/Application/Tools/enum_bitmask.hpp b/ApplicationLibCode/Tools/enum_bitmask.hpp similarity index 100% rename from ApplicationLibCode/Application/Tools/enum_bitmask.hpp rename to ApplicationLibCode/Tools/enum_bitmask.hpp diff --git a/CMakeLists.txt b/CMakeLists.txt index f6967efa491..d033509dc72 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1121,6 +1121,7 @@ endif() # ############################################################################## # Application # ############################################################################## +add_subdirectory(ApplicationLibCode/Tools) add_subdirectory(ApplicationLibCode) add_subdirectory(ApplicationLibCode/Commands) add_subdirectory(ApplicationLibCode/ResultStatisticsCache)