Rearrange cell filter related files in source code tree (#6998)

* Move cell filter related classes to separate subfolder
* Update cmake files

ApplicationCode/CMakeLists.txt

@@ -112,6 +112,7 @@ include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/StimPlanModel
   ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/Summary
   ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/Surfaces
+  ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/CellFilters
   ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModelCommands
   ${CMAKE_CURRENT_SOURCE_DIR}/ResultStatisticsCache
   ${CMAKE_CURRENT_SOURCE_DIR}/ReservoirDataModel
@@ -174,6 +175,7 @@ list(
   ProjectDataModel/PlotTemplates/CMakeLists_files.cmake
   ProjectDataModel/StimPlanModel/CMakeLists_files.cmake
   ProjectDataModel/Surfaces/CMakeLists_files.cmake
+  ProjectDataModel/CellFilters/CMakeLists_files.cmake
   ProjectDataModelCommands/CMakeLists_files.cmake
   GeoMech/GeoMechVisualization/CMakeLists_files.cmake
   ModelVisualization/CMakeLists_files.cmake

ApplicationCode/ProjectDataModel/CMakeLists_files.cmake

@@ -2,12 +2,6 @@
 set (SOURCE_GROUP_HEADER_FILES
 ${CMAKE_CURRENT_LIST_DIR}/RimEclipseCaseCollection.h
 ${CMAKE_CURRENT_LIST_DIR}/RimCaseCollection.h
-${CMAKE_CURRENT_LIST_DIR}/RimCellFilter.h
-${CMAKE_CURRENT_LIST_DIR}/RimEclipsePropertyFilter.h
-${CMAKE_CURRENT_LIST_DIR}/RimPropertyFilterCollection.h
-${CMAKE_CURRENT_LIST_DIR}/RimEclipsePropertyFilterCollection.h
-${CMAKE_CURRENT_LIST_DIR}/RimCellRangeFilter.h
-${CMAKE_CURRENT_LIST_DIR}/RimCellRangeFilterCollection.h
 ${CMAKE_CURRENT_LIST_DIR}/RimRegularLegendConfig.h
 ${CMAKE_CURRENT_LIST_DIR}/RimOilField.h
 ${CMAKE_CURRENT_LIST_DIR}/RimProject.h
@@ -61,8 +55,6 @@ ${CMAKE_CURRENT_LIST_DIR}/RimNoCommonAreaNncCollection.h
 ${CMAKE_CURRENT_LIST_DIR}/RimGeoMechModels.h
 ${CMAKE_CURRENT_LIST_DIR}/RimGeoMechCase.h
 ${CMAKE_CURRENT_LIST_DIR}/RimGeoMechView.h
-${CMAKE_CURRENT_LIST_DIR}/RimGeoMechPropertyFilter.h
-${CMAKE_CURRENT_LIST_DIR}/RimGeoMechPropertyFilterCollection.h
 ${CMAKE_CURRENT_LIST_DIR}/RimGeoMechResultDefinition.h
 ${CMAKE_CURRENT_LIST_DIR}/RimGeoMechCellColors.h
 ${CMAKE_CURRENT_LIST_DIR}/RimViewWindow.h
@@ -106,7 +98,6 @@ ${CMAKE_CURRENT_LIST_DIR}/RimStackablePlotCurve.h
 ${CMAKE_CURRENT_LIST_DIR}/RimBoxIntersection.h
 ${CMAKE_CURRENT_LIST_DIR}/RimAdvancedSnapshotExportDefinition.h
 ${CMAKE_CURRENT_LIST_DIR}/RimMdiWindowController.h
-${CMAKE_CURRENT_LIST_DIR}/RimPropertyFilter.h
 ${CMAKE_CURRENT_LIST_DIR}/RimNamedObject.h
 ${CMAKE_CURRENT_LIST_DIR}/RimCheckableNamedObject.h
 ${CMAKE_CURRENT_LIST_DIR}/RimCheckableObject.h
@@ -165,12 +156,6 @@ ${CMAKE_CURRENT_LIST_DIR}/RimAbstractPlotCollection.h
 set (SOURCE_GROUP_SOURCE_FILES
 ${CMAKE_CURRENT_LIST_DIR}/RimEclipseCaseCollection.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimCaseCollection.cpp
-${CMAKE_CURRENT_LIST_DIR}/RimCellFilter.cpp
-${CMAKE_CURRENT_LIST_DIR}/RimEclipsePropertyFilter.cpp
-${CMAKE_CURRENT_LIST_DIR}/RimPropertyFilterCollection.cpp
-${CMAKE_CURRENT_LIST_DIR}/RimEclipsePropertyFilterCollection.cpp
-${CMAKE_CURRENT_LIST_DIR}/RimCellRangeFilter.cpp
-${CMAKE_CURRENT_LIST_DIR}/RimCellRangeFilterCollection.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimRegularLegendConfig.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimOilField.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimProject.cpp
@@ -224,8 +209,6 @@ ${CMAKE_CURRENT_LIST_DIR}/RimNoCommonAreaNncCollection.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimGeoMechModels.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimGeoMechCase.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimGeoMechView.cpp
-${CMAKE_CURRENT_LIST_DIR}/RimGeoMechPropertyFilter.cpp
-${CMAKE_CURRENT_LIST_DIR}/RimGeoMechPropertyFilterCollection.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimGeoMechResultDefinition.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimGeoMechCellColors.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimMudWeightWindowParameters.cpp
@@ -270,7 +253,6 @@ ${CMAKE_CURRENT_LIST_DIR}/RimStackablePlotCurve.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimBoxIntersection.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimAdvancedSnapshotExportDefinition.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimMdiWindowController.cpp
-${CMAKE_CURRENT_LIST_DIR}/RimPropertyFilter.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimNamedObject.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimCheckableNamedObject.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimCheckableObject.cpp

ApplicationCode/ProjectDataModel/CellFilters/CMakeLists_files.cmake

@@ -0,0 +1,34 @@
+
+set (SOURCE_GROUP_HEADER_FILES
+${CMAKE_CURRENT_LIST_DIR}/RimCellFilter.h
+${CMAKE_CURRENT_LIST_DIR}/RimCellRangeFilter.h
+${CMAKE_CURRENT_LIST_DIR}/RimCellRangeFilterCollection.h
+${CMAKE_CURRENT_LIST_DIR}/RimPropertyFilter.h
+${CMAKE_CURRENT_LIST_DIR}/RimPropertyFilterCollection.h
+${CMAKE_CURRENT_LIST_DIR}/RimEclipsePropertyFilter.h
+${CMAKE_CURRENT_LIST_DIR}/RimEclipsePropertyFilterCollection.h
+${CMAKE_CURRENT_LIST_DIR}/RimGeoMechPropertyFilter.h
+${CMAKE_CURRENT_LIST_DIR}/RimGeoMechPropertyFilterCollection.h
+)
+
+set (SOURCE_GROUP_SOURCE_FILES
+${CMAKE_CURRENT_LIST_DIR}/RimCellFilter.cpp
+${CMAKE_CURRENT_LIST_DIR}/RimCellRangeFilter.cpp
+${CMAKE_CURRENT_LIST_DIR}/RimCellRangeFilterCollection.cpp
+${CMAKE_CURRENT_LIST_DIR}/RimPropertyFilter.cpp
+${CMAKE_CURRENT_LIST_DIR}/RimPropertyFilterCollection.cpp
+${CMAKE_CURRENT_LIST_DIR}/RimEclipsePropertyFilter.cpp
+${CMAKE_CURRENT_LIST_DIR}/RimEclipsePropertyFilterCollection.cpp
+${CMAKE_CURRENT_LIST_DIR}/RimGeoMechPropertyFilter.cpp
+${CMAKE_CURRENT_LIST_DIR}/RimGeoMechPropertyFilterCollection.cpp
+)
+
+list(APPEND CODE_HEADER_FILES
+${SOURCE_GROUP_HEADER_FILES}
+)
+
+list(APPEND CODE_SOURCE_FILES
+${SOURCE_GROUP_SOURCE_FILES}
+)
+
+source_group( "ProjectDataModel\\CellFilters" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake )