Cleaned up includes

2025-02-25 18:55:39 -06:00 · 2016-07-16 16:31:55 +02:00
parent 68c0d906fb
commit 686aef821e
10 changed files with 77 additions and 45 deletions
--- a/ApplicationCode/GeoMech/GeoMechVisualization/RivGeoMechVizLogic.cpp
+++ b/ApplicationCode/GeoMech/GeoMechVisualization/RivGeoMechVizLogic.cpp
@@ -19,23 +19,26 @@

 #include "RivGeoMechVizLogic.h"

-#include "RimGeoMechView.h"
-#include "cvfModelBasicList.h"
-#include "RimGeoMechCellColors.h"
-#include "RivGeoMechPartMgrCache.h"
-#include "RivGeoMechPartMgr.h"
-#include "RivReservoirViewPartMgr.h"
-#include "RimGeoMechCase.h"
 #include "RigFemPartCollection.h"
+#include "RigFemPartResultsCollection.h"
 #include "RigGeoMechCaseData.h"
+
 #include "RimCellRangeFilterCollection.h"
+#include "RimGeoMechCase.h"
+#include "RimGeoMechCellColors.h"
+#include "RimGeoMechPropertyFilterCollection.h"
+#include "RimGeoMechView.h"
+#include "RimView.h"
+#include "RimViewController.h"

 #include "RivCellSetEnum.h"
 #include "RivFemElmVisibilityCalculator.h"
-#include "RigFemPartResultsCollection.h"
-#include "RimGeoMechPropertyFilterCollection.h"
-#include "RimView.h"
-#include "RimViewController.h"
+#include "RivGeoMechPartMgr.h"
+#include "RivGeoMechPartMgrCache.h"
+#include "RivReservoirViewPartMgr.h"
+
+#include "cvfModelBasicList.h"
+#include "cvfStructGridGeometryGenerator.h"

 //--------------------------------------------------------------------------------------------------
 /// 
--- a/ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.cpp
+++ b/ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.cpp
@@ -26,15 +26,18 @@
 #include "RigGridBase.h"
 #include "RigResultAccessor.h"
 #include "RigResultAccessorFactory.h"
-#include "RimEclipseCase.h"
+
 #include "RimCellEdgeColors.h"
-#include "RimEclipseView.h"
+#include "RimEclipseCase.h"
 #include "RimEclipseCellColors.h"
-#include "RimTernaryLegendConfig.h"
+#include "RimEclipseView.h"
 #include "RimEclipseWellCollection.h"
+#include "RimTernaryLegendConfig.h"
+
 #include "RivTernaryTextureCoordsCreator.h"

 #include "cvfDrawableGeo.h"
+#include "cvfScalarMapper.h"
 #include "cvfVertexAttribute.h"


--- a/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp
@@ -19,20 +19,24 @@

 #include "RivReservoirFaultsPartMgr.h"

-#include "cvfPart.h"
-#include "cvfModelBasicList.h"
+#include "RigCaseData.h"
+#include "RigMainGrid.h"
+
+#include "RimEclipseCase.h"
+#include "RimEclipseCellColors.h"
+#include "RimEclipseFaultColors.h"
+#include "RimEclipseView.h"
+#include "RimFaultCollection.h"
+
+#include "RivFaultPartMgr.h"
+
 #include "cvfColor3.h"
+#include "cvfModelBasicList.h"
+#include "cvfPart.h"
 #include "cvfTransform.h"

 #include "cafPdmFieldCvfColor.h"

-#include "RigMainGrid.h"
-#include "RimFaultCollection.h"
-#include "RimEclipseFaultColors.h"
-#include "RimEclipseView.h"
-#include "RimEclipseCellColors.h"
-#include "RimEclipseCase.h"
-#include "RigCaseData.h"

 //--------------------------------------------------------------------------------------------------
 /// 
--- a/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.h
+++ b/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.h
@@ -19,20 +19,24 @@

 #pragma once

+#include "cvfArray.h"
 #include "cvfBase.h"
+#include "cvfCollection.h"
 #include "cvfObject.h"

-#include "RigGridBase.h"
-#include "RivFaultPartMgr.h"
+#include "cafPdmPointer.h"

 namespace cvf
 {
    class Transform;
+    class ModelBasicList;
 }

 class RimEclipseCellColors;
 class RimCellEdgeColors;
 class RimEclipseView;
+class RivFaultPartMgr;
+class RigMainGrid;

 //==================================================================================================
 ///
--- a/ApplicationCode/ModelVisualization/RivReservoirPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/RivReservoirPartMgr.cpp
@@ -20,12 +20,13 @@

 #include "RivReservoirPartMgr.h"

+#include "RigCaseData.h"
+
+#include "RivGridPartMgr.h"
+#include "RivReservoirFaultsPartMgr.h"
+
 #include "cvfStructGrid.h"
 #include "cvfModelBasicList.h"
-
-#include "RigCaseData.h"
-#include "RivGridPartMgr.h"
-
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
--- a/ApplicationCode/ModelVisualization/RivReservoirPartMgr.h
+++ b/ApplicationCode/ModelVisualization/RivReservoirPartMgr.h
@@ -24,9 +24,6 @@
 #include "cvfArray.h"
 #include "cvfCollection.h"

-#include "RivGridPartMgr.h"
-#include "RivReservoirFaultsPartMgr.h"
-
 namespace cvf
 {
    class ModelBasicList;
@@ -37,6 +34,8 @@ class RimEclipseCellColors;
 class RimCellEdgeColors;
 class RigCaseData;
 class RimEclipseView;
+class RivReservoirFaultsPartMgr;
+class RivGridPartMgr;

 //==================================================================================================
 ///
--- a/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp
@@ -22,25 +22,26 @@

 #include "RigCaseCellResultsData.h"
 #include "RigCaseData.h"
+#include "RigCaseToCaseCellMapper.h"
 #include "RigGridBase.h"
 #include "RigResultAccessorFactory.h"

 #include "Rim3dOverlayInfoConfig.h"
-#include "RimEclipseCase.h"
 #include "RimCellEdgeColors.h"
-#include "RimEclipsePropertyFilterCollection.h"
 #include "RimCellRangeFilterCollection.h"
+#include "RimEclipseCase.h"
+#include "RimEclipseCellColors.h"
+#include "RimEclipsePropertyFilterCollection.h"
+#include "RimEclipseResultDefinition.h"
+#include "RimEclipseView.h"
+#include "RimEclipseWellCollection.h"
 #include "RimFaultCollection.h"
 #include "RimReservoirCellResultsStorage.h"
-#include "RimEclipseView.h"
-#include "RimEclipseResultDefinition.h"
-#include "RimEclipseCellColors.h"
-#include "RimEclipseWellCollection.h"
-
-#include "RivGridPartMgr.h"
 #include "RimViewController.h"
 #include "RimViewLinker.h"
-#include "RigCaseToCaseCellMapper.h"
+
+#include "RivGridPartMgr.h"
+#include "RivReservoirFaultsPartMgr.h"

 //--------------------------------------------------------------------------------------------------
 /// 
--- a/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.h
+++ b/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.h
@@ -19,18 +19,29 @@
 /////////////////////////////////////////////////////////////////////////////////

 #pragma once
-#include "RivReservoirPartMgr.h"
-#include "cvfTransform.h"
+
+#include "RivCellSetEnum.h"
+#include "RivReservoirPartMgr.h"    // Must include here because of caf::FixedArray<RivReservoirPartMgr, PROPERTY_FILTERED>
+
 #include "cafFixedArray.h"
 #include "cvfArray.h"
+#include "cvfBase.h"
+#include "cvfTransform.h"
+
 #include "cafPdmObject.h"
-#include "RivCellSetEnum.h"

 class RimEclipseView;
 class RigGridBase;
 class RimCellRangeFilterCollection;
 class RimEclipsePropertyFilterCollection;
 class RigActiveCellInfo;
+class RimEclipseCellColors;
+class RimCellEdgeColors;
+
+namespace cvf
+{
+    class ModelBasicList;
+}

 class RivReservoirViewPartMgr: public cvf::Object
 {
--- a/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp
@@ -21,12 +21,17 @@

 #include "RiaApplication.h"
 #include "RiaPreferences.h"
+
 #include "RigCaseData.h"
+
 #include "RimEclipseCase.h"
+#include "RimEclipseView.h"
+#include "RimFault.h"
 #include "RimNoCommonAreaNNC.h"
 #include "RimNoCommonAreaNncCollection.h"
-#include "RimEclipseView.h"
+
 #include "RiuMainWindow.h"
+
 #include "RivColorTableArray.h"

 #include "cafAppEnum.h"
--- a/ApplicationCode/UserInterface/RiuViewerCommands.cpp
+++ b/ApplicationCode/UserInterface/RiuViewerCommands.cpp
@@ -39,6 +39,7 @@
 #include "RimEclipseFaultColors.h"
 #include "RimEclipseView.h"
 #include "RimEclipseWell.h"
+#include "RimFault.h"
 #include "RimFaultCollection.h"
 #include "RimGeoMechCase.h"
 #include "RimGeoMechCellColors.h"