Renamed source files according to new class names

2025-02-09 23:16:00 -06:00 · 2015-06-25 13:36:15 +02:00 · 2015-06-25 13:36:15 +02:00 · fd03a02645
commit fd03a02645
parent cd662dc7d1
34 changed files with 49 additions and 49 deletions
--- a/ApplicationCode/Application/RiaApplication.cpp
+++ b/ApplicationCode/Application/RiaApplication.cpp
@ -40,7 +40,7 @@
 #include "RimWellPath.h"
 #include "RimWellPathCollection.h"
 #include "RimOilField.h"
-#include "RimAnalysisModels.h"
+#include "RimEclipseCaseCollection.h"
 #include "RimFaultCollection.h"
 #include "RimEclipseFaultColors.h"

@ -76,7 +76,7 @@
 #include "RimCellRangeFilterCollection.h"
 #include "RimEclipsePropertyFilterCollection.h"
 #include "Rim3dOverlayInfoConfig.h"
-#include "RimWellCollection.h"
+#include "RimEclipseWellCollection.h"
 #include "RimEclipseStatisticsCase.h"
 #include "cafCeetronPlusNavigation.h"

--- a/ApplicationCode/Application/RiaProjectModifier.cpp
+++ b/ApplicationCode/Application/RiaProjectModifier.cpp
@ -22,7 +22,7 @@
 #include "RiaProjectModifier.h"

 #include "RimProject.h"
-#include "RimAnalysisModels.h"
+#include "RimEclipseCaseCollection.h"
 #include "RimOilField.h"
 #include "RimIdenticalGridCaseGroup.h"
 #include "RimCaseCollection.h"
@ -37,7 +37,7 @@
 #include "RimEclipseCellColors.h"
 #include "RimCellEdgeResultSlot.h"
 #include "RimCellRangeFilterCollection.h"
-#include "RimWellCollection.h"
+#include "RimEclipseWellCollection.h"
 #include "Rim3dOverlayInfoConfig.h"


--- a/ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.cpp
+++ b/ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.cpp
@ -31,7 +31,7 @@
 #include "RimEclipseView.h"
 #include "RimEclipseCellColors.h"
 #include "RimTernaryLegendConfig.h"
-#include "RimWellCollection.h"
+#include "RimEclipseWellCollection.h"
 #include "RivTernaryTextureCoordsCreator.h"

 #include "cvfDrawableGeo.h"
--- a/ApplicationCode/ModelVisualization/RivGridPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/RivGridPartMgr.cpp
@ -33,7 +33,7 @@
 #include "RimEclipseView.h"
 #include "RimEclipseCellColors.h"
 #include "RimTernaryLegendConfig.h"
-#include "RimWellCollection.h"
+#include "RimEclipseWellCollection.h"

 #include "RivCellEdgeEffectGenerator.h"
 #include "RivResultToTextureMapper.h"
--- a/ApplicationCode/ModelVisualization/RivReservoirPipesPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/RivReservoirPipesPartMgr.cpp
@ -22,8 +22,8 @@

 #include "RivReservoirPipesPartMgr.h"
 #include "RimEclipseView.h"
-#include "RimWell.h"
-#include "RimWellCollection.h"
+#include "RimEclipseWell.h"
+#include "RimEclipseWellCollection.h"
 #include "RivWellPipesPartMgr.h"
 #include "RivWellHeadPartMgr.h"
 #include "RimCellEdgeResultSlot.h"
--- a/ApplicationCode/ModelVisualization/RivReservoirPipesPartMgr.h
+++ b/ApplicationCode/ModelVisualization/RivReservoirPipesPartMgr.h
@ -18,7 +18,7 @@

 #pragma once

-#include "RimWellCollection.h"
+#include "RimEclipseWellCollection.h"


 #include "cvfCollection.h"
--- a/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp
@ -37,7 +37,7 @@
 #include "RimEclipseView.h"
 #include "RimEclipseResultDefinition.h"
 #include "RimEclipseCellColors.h"
-#include "RimWellCollection.h"
+#include "RimEclipseWellCollection.h"

 #include "RivGridPartMgr.h"

--- a/ApplicationCode/ModelVisualization/RivTernaryTextureCoordsCreator.cpp
+++ b/ApplicationCode/ModelVisualization/RivTernaryTextureCoordsCreator.cpp
@ -29,7 +29,7 @@
 #include "RimEclipseView.h"
 #include "RimEclipseCellColors.h"
 #include "RimTernaryLegendConfig.h"
-#include "RimWellCollection.h"
+#include "RimEclipseWellCollection.h"

 #include "RivTernaryResultToTextureMapper.h"
 #include "RivTernaryScalarMapper.h"
--- a/ApplicationCode/ModelVisualization/RivTextureCoordsCreator.cpp
+++ b/ApplicationCode/ModelVisualization/RivTextureCoordsCreator.cpp
@ -27,7 +27,7 @@
 #include "RigResultAccessorFactory.h"
 #include "RigPipeInCellEvaluator.h"
 #include "RivResultToTextureMapper.h"
-#include "RimWellCollection.h"
+#include "RimEclipseWellCollection.h"

 //--------------------------------------------------------------------------------------------------
 /// 
--- a/ApplicationCode/ModelVisualization/RivWellHeadPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/RivWellHeadPartMgr.cpp
@ -37,7 +37,7 @@
 #include "cvfqtUtils.h"

 #include "RimEclipseView.h"
-#include "RimWellCollection.h"
+#include "RimEclipseWellCollection.h"
 #include "cafPdmFieldCvfMat4d.h"
 #include "RimCellEdgeResultSlot.h"
 #include "RimCellRangeFilterCollection.h"
@ -48,7 +48,7 @@
 #include "RimLegendConfig.h"

 #include "RimEclipseCase.h"
-#include "RimWell.h"
+#include "RimEclipseWell.h"

 #include "RigCaseData.h"
 #include "RigCell.h"
--- a/ApplicationCode/ModelVisualization/RivWellPathPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/RivWellPathPartMgr.cpp
@ -33,7 +33,7 @@
 #include "RimCellEdgeResultSlot.h"
 #include "RimCellRangeFilterCollection.h"
 #include "RimEclipsePropertyFilterCollection.h"
-#include "RimWellCollection.h"
+#include "RimEclipseWellCollection.h"
 #include "Rim3dOverlayInfoConfig.h"
 #include "RimEclipseView.h"
 #include "RigCaseData.h"
@ -51,7 +51,7 @@
 #include "cafEffectGenerator.h"
 #include "cvfqtUtils.h"
 #include "RimOilField.h"
-#include "RimAnalysisModels.h"
+#include "RimEclipseCaseCollection.h"

 //--------------------------------------------------------------------------------------------------
 /// 
--- a/ApplicationCode/ModelVisualization/RivWellPipesPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/RivWellPipesPartMgr.cpp
@ -38,8 +38,8 @@

 #include "RimEclipseCase.h"
 #include "RimEclipseView.h"
-#include "RimWell.h"
-#include "RimWellCollection.h"
+#include "RimEclipseWell.h"
+#include "RimEclipseWellCollection.h"
 #include "RimReservoirCellResultsStorage.h"

 #include "RimEclipseCellColors.h"
--- a/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
+++ b/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
@ -5,7 +5,7 @@ if (${CMAKE_VERSION} VERSION_GREATER "2.8.2")
 endif()

 set (SOURCE_GROUP_HEADER_FILES
-${CEE_CURRENT_LIST_DIR}RimAnalysisModels.h
+${CEE_CURRENT_LIST_DIR}RimEclipseCaseCollection.h
 ${CEE_CURRENT_LIST_DIR}RimCaseCollection.h
 ${CEE_CURRENT_LIST_DIR}RimCellFilter.h
 ${CEE_CURRENT_LIST_DIR}RimEclipsePropertyFilter.h
@ -26,7 +26,7 @@ ${CEE_CURRENT_LIST_DIR}RimEclipseView.h
 ${CEE_CURRENT_LIST_DIR}RimEclipseResultDefinition.h
 ${CEE_CURRENT_LIST_DIR}RimEclipseCellColors.h
 ${CEE_CURRENT_LIST_DIR}RimCellEdgeResultSlot.h
-${CEE_CURRENT_LIST_DIR}RimWell.h
+${CEE_CURRENT_LIST_DIR}RimEclipseWell.h
 ${CEE_CURRENT_LIST_DIR}RimWellCollection.h
 ${CEE_CURRENT_LIST_DIR}RimWellPath.h
 ${CEE_CURRENT_LIST_DIR}RimWellPathCollection.h
@ -63,7 +63,7 @@ ${CEE_CURRENT_LIST_DIR}RimCase.h
 )

 set (SOURCE_GROUP_SOURCE_FILES
-${CEE_CURRENT_LIST_DIR}RimAnalysisModels.cpp
+${CEE_CURRENT_LIST_DIR}RimEclipseCaseCollection.cpp
 ${CEE_CURRENT_LIST_DIR}RimCaseCollection.cpp
 ${CEE_CURRENT_LIST_DIR}RimCellFilter.cpp
 ${CEE_CURRENT_LIST_DIR}RimEclipsePropertyFilter.cpp
@ -84,7 +84,7 @@ ${CEE_CURRENT_LIST_DIR}RimEclipseView.cpp
 ${CEE_CURRENT_LIST_DIR}RimEclipseResultDefinition.cpp
 ${CEE_CURRENT_LIST_DIR}RimEclipseCellColors.cpp
 ${CEE_CURRENT_LIST_DIR}RimCellEdgeResultSlot.cpp
-${CEE_CURRENT_LIST_DIR}RimWell.cpp
+${CEE_CURRENT_LIST_DIR}RimEclipseWell.cpp
 ${CEE_CURRENT_LIST_DIR}RimWellCollection.cpp
 ${CEE_CURRENT_LIST_DIR}RimWellPath.cpp
 ${CEE_CURRENT_LIST_DIR}RimWellPathCollection.cpp
--- a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp
+++ b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp
@ -30,7 +30,7 @@
 #include "RimReservoirCellResultsStorage.h"
 #include "RimEclipseView.h"
 #include "RimEclipseCellColors.h"
-#include "RimWellCollection.h"
+#include "RimEclipseWellCollection.h"
 #include "RiuViewer.h"
 #include "RimGeoMechView.h"
 #include "RimView.h"
--- a/ApplicationCode/ProjectDataModel/RimEclipseCaseCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseCaseCollection.cpp
@ -18,7 +18,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////

-#include "RimAnalysisModels.h"
+#include "RimEclipseCaseCollection.h"

 #include "RiaApplication.h"
 #include "RigCaseData.h"
--- a/ApplicationCode/ProjectDataModel/RimEclipseCaseCollection.h
+++ b/ApplicationCode/ProjectDataModel/RimEclipseCaseCollection.h
--- a/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.cpp
@ -29,7 +29,7 @@
 #include "RimEclipseCellColors.h"
 #include "RimEclipseStatisticsCaseEvaluator.h"
 #include "RimUiTreeModelPdm.h"
-#include "RimWellCollection.h"
+#include "RimEclipseWellCollection.h"
 #include "RiuMainWindow.h"

 #include "cafPdmUiPushButtonEditor.h"
--- a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp
@ -37,8 +37,8 @@
 #include "RimProject.h"
 #include "RimEclipseCellColors.h"
 #include "RimTernaryLegendConfig.h"
-#include "RimWell.h"
-#include "RimWellCollection.h"
+#include "RimEclipseWell.h"
+#include "RimEclipseWellCollection.h"
 #include "RimWellPathCollection.h"
 #include "RiuMainWindow.h"
 #include "RiuViewer.h"
--- a/ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
@ -18,11 +18,11 @@
 //
 /////////////////////////////////////////////////////////////////////////////////

-#include "RimWell.h"
+#include "RimEclipseWell.h"

 #include "RigSingleWellResultsData.h"
 #include "RimEclipseView.h"
-#include "RimWellCollection.h"
+#include "RimEclipseWellCollection.h"

 #include "cvfMath.h"

--- a/ApplicationCode/ProjectDataModel/RimEclipseWell.h
+++ b/ApplicationCode/ProjectDataModel/RimEclipseWell.h
--- a/ApplicationCode/ProjectDataModel/RimEclipseWellCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseWellCollection.cpp
@ -18,13 +18,13 @@
 //
 /////////////////////////////////////////////////////////////////////////////////

-#include "RimWellCollection.h"
+#include "RimEclipseWellCollection.h"

 #include "RiaApplication.h"
 #include "RiaPreferences.h"
 #include "RigSingleWellResultsData.h"
 #include "RimEclipseView.h"
-#include "RimWell.h"
+#include "RimEclipseWell.h"
 #include "RivReservoirViewPartMgr.h"


--- a/ApplicationCode/ProjectDataModel/RimEclipseWellCollection.h
+++ b/ApplicationCode/ProjectDataModel/RimEclipseWellCollection.h
--- a/ApplicationCode/ProjectDataModel/RimOilField.cpp
+++ b/ApplicationCode/ProjectDataModel/RimOilField.cpp
@ -20,7 +20,7 @@

 #include "RimOilField.h"

-#include "RimAnalysisModels.h"
+#include "RimEclipseCaseCollection.h"
 #include "RimWellPathCollection.h"
 #include "RimGeoMechModels.h"

--- a/ApplicationCode/ProjectDataModel/RimProject.cpp
+++ b/ApplicationCode/ProjectDataModel/RimProject.cpp
@ -23,7 +23,7 @@
 #include "RiaApplication.h"
 #include "RiaVersionInfo.h"
 #include "RigCaseData.h"
-#include "RimAnalysisModels.h"
+#include "RimEclipseCaseCollection.h"
 #include "RimEclipseCase.h"
 #include "RimCaseCollection.h"
 #include "RimIdenticalGridCaseGroup.h"
--- a/ApplicationCode/ProjectDataModel/RimUiTreeModelPdm.cpp
+++ b/ApplicationCode/ProjectDataModel/RimUiTreeModelPdm.cpp
@ -22,7 +22,7 @@

 #include "RiaApplication.h"
 #include "RigGridManager.h"
-#include "RimAnalysisModels.h"
+#include "RimEclipseCaseCollection.h"
 #include "RimEclipseCase.h"
 #include "RimCaseCollection.h"
 #include "RimEclipsePropertyFilterCollection.h"
@ -41,7 +41,7 @@
 #include "RimScriptCollection.h"
 #include "RimEclipseStatisticsCase.h"
 #include "RimUiTreeView.h"
-#include "RimWellCollection.h"
+#include "RimEclipseWellCollection.h"
 #include "RimWellPathCollection.h"
 #include "RimGeoMechView.h"

--- a/ApplicationCode/ProjectDataModel/RimUiTreeView.cpp
+++ b/ApplicationCode/ProjectDataModel/RimUiTreeView.cpp
@ -60,15 +60,15 @@
 #include "RimIdenticalGridCaseGroup.h"
 #include "RimCaseCollection.h"
 #include "RimScriptCollection.h"
-#include "RimWell.h"
+#include "RimEclipseWell.h"
 #include "RimCellEdgeResultSlot.h"
-#include "RimWellCollection.h"
+#include "RimEclipseWellCollection.h"
 #include "RimWellPathCollection.h"
 #include "RimReservoirCellResultsStorage.h"
 #include "Rim3dOverlayInfoConfig.h"
 #include "RimProject.h"
 #include "RimOilField.h"
-#include "RimAnalysisModels.h"
+#include "RimEclipseCaseCollection.h"
 #include "RimEclipseInputProperty.h"
 #include "RigSingleWellResultsData.h"
 #include "RimGeoMechView.h"
--- a/ApplicationCode/SocketInterface/RiaCaseInfoCommands.cpp
+++ b/ApplicationCode/SocketInterface/RiaCaseInfoCommands.cpp
@ -31,7 +31,7 @@
 #include "RimCellEdgeResultSlot.h"
 #include "RimCellRangeFilterCollection.h"
 #include "RimEclipsePropertyFilterCollection.h"
-#include "RimWellCollection.h"
+#include "RimEclipseWellCollection.h"
 #include "Rim3dOverlayInfoConfig.h"
 #include "RimReservoirCellResultsStorage.h"
 #include "RimEclipseCase.h"
--- a/ApplicationCode/SocketInterface/RiaGeometryCommands.cpp
+++ b/ApplicationCode/SocketInterface/RiaGeometryCommands.cpp
@ -28,7 +28,7 @@
 #include "RimCellEdgeResultSlot.h"
 #include "RimCellRangeFilterCollection.h"
 #include "RimEclipsePropertyFilterCollection.h"
-#include "RimWellCollection.h"
+#include "RimEclipseWellCollection.h"
 #include "Rim3dOverlayInfoConfig.h"
 #include "RimReservoirCellResultsStorage.h"

--- a/ApplicationCode/SocketInterface/RiaProjectInfoCommands.cpp
+++ b/ApplicationCode/SocketInterface/RiaProjectInfoCommands.cpp
@ -28,7 +28,7 @@
 #include "RimCellEdgeResultSlot.h"
 #include "RimCellRangeFilterCollection.h"
 #include "RimEclipsePropertyFilterCollection.h"
-#include "RimWellCollection.h"
+#include "RimEclipseWellCollection.h"
 #include "Rim3dOverlayInfoConfig.h"
 #include "RimReservoirCellResultsStorage.h"

@ -43,7 +43,7 @@
 #include "RimScriptCollection.h"
 #include "RimWellPathCollection.h"
 #include "RimOilField.h"
-#include "RimAnalysisModels.h"
+#include "RimEclipseCaseCollection.h"



--- a/ApplicationCode/SocketInterface/RiaSocketServer.cpp
+++ b/ApplicationCode/SocketInterface/RiaSocketServer.cpp
@ -38,7 +38,7 @@
 #include "RimCellEdgeResultSlot.h"
 #include "RimCellRangeFilterCollection.h"
 #include "RimEclipsePropertyFilterCollection.h"
-#include "RimWellCollection.h"
+#include "RimEclipseWellCollection.h"
 #include "Rim3dOverlayInfoConfig.h"
 #include "RimIdenticalGridCaseGroup.h"
 #include "RimScriptCollection.h"
@ -52,7 +52,7 @@
 #include "cafFactory.h"
 #include "RigGridBase.h"
 #include "RimOilField.h"
-#include "RimAnalysisModels.h"
+#include "RimEclipseCaseCollection.h"


 //--------------------------------------------------------------------------------------------------
--- a/ApplicationCode/SocketInterface/RiaSocketTools.cpp
+++ b/ApplicationCode/SocketInterface/RiaSocketTools.cpp
@ -35,7 +35,7 @@
 #include "RimCellEdgeResultSlot.h"
 #include "RimCellRangeFilterCollection.h"
 #include "RimEclipsePropertyFilterCollection.h"
-#include "RimWellCollection.h"
+#include "RimEclipseWellCollection.h"
 #include "Rim3dOverlayInfoConfig.h"
 #include "RimReservoirCellResultsStorage.h"

--- a/ApplicationCode/SocketInterface/RiaWellDataCommands.cpp
+++ b/ApplicationCode/SocketInterface/RiaWellDataCommands.cpp
@ -38,7 +38,7 @@
 #include "RimCellEdgeResultSlot.h"
 #include "RimCellRangeFilterCollection.h"
 #include "RimEclipsePropertyFilterCollection.h"
-#include "RimWellCollection.h"
+#include "RimEclipseWellCollection.h"
 #include "Rim3dOverlayInfoConfig.h"

 #include <QTcpSocket>
--- a/ApplicationCode/UserInterface/RiuMainWindow.cpp
+++ b/ApplicationCode/UserInterface/RiuMainWindow.cpp
@ -27,7 +27,7 @@
 #include "RiaPreferences.h"
 #include "RiaRegressionTest.h"
 #include "RigCaseCellResultsData.h"
-#include "RimAnalysisModels.h"
+#include "RimEclipseCaseCollection.h"
 #include "RimEclipseCase.h"
 #include "RimCaseCollection.h"
 #include "RimEclipsePropertyFilterCollection.h"
@ -45,7 +45,7 @@
 #include "RimTools.h"
 #include "RimUiTreeModelPdm.h"
 #include "RimUiTreeView.h"
-#include "RimWellCollection.h"
+#include "RimEclipseWellCollection.h"
 #include "RimWellPathCollection.h"
 #include "RimWellPathImport.h"
 #include "RiuMultiCaseImportDialog.h"
--- a/ApplicationCode/UserInterface/RiuViewer.cpp
+++ b/ApplicationCode/UserInterface/RiuViewer.cpp
@ -35,7 +35,7 @@
 #include "RimCellRangeFilterCollection.h"
 #include "RimFaultCollection.h"
 #include "RimEclipseCellColors.h"
-#include "RimWellCollection.h"
+#include "RimEclipseWellCollection.h"

 #include "RimUiTreeModelPdm.h"