#1068 Avoid include of RigCell.h and RigSingleWellResultsData in RigCaseData.h

ApplicationCode/Commands/RicExportFaultsFeature.cpp

@@ -20,17 +20,21 @@
 #include "RicExportFaultsFeature.h"
 
 #include "RiaApplication.h"
-#include "cafSelectionManager.h"
+
+#include "RigCaseData.h"
+#include "RigFault.h"
+#include "RigMainGrid.h"
+
+#include "RimDefines.h"
+#include "RimEclipseCase.h"
 #include "RimFault.h"
 
+#include "cafSelectionManager.h"
+#include "cafUtils.h"
+
 #include <QAction>
 #include <QFileDialog>
-#include "RimEclipseCase.h"
-#include "RigFault.h"
-#include "RigMainGrid.h"
-#include "RigCaseData.h"
-#include "QMessageBox"
-#include "cafUtils.h"
+#include <QMessageBox>
 
 CAF_CMD_SOURCE_INIT(RicExportFaultsFeature, "RicExportFaultsFeature");
 

ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp

@@ -24,6 +24,7 @@
 #include "RigCaseCellResultsData.h"
 #include "RigCaseData.h"
 #include "RigCaseToCaseCellMapper.h"
+#include "RigCell.h"
 #include "RigGridBase.h"
 #include "RigResultAccessorFactory.h"
 

ApplicationCode/ModelVisualization/RivSingleCellPartGenerator.cpp

@@ -22,6 +22,7 @@
 #include "RigCaseData.h"
 #include "RigFemPartCollection.h"
 #include "RigGeoMechCaseData.h"
+#include "RigGridBase.h"
 
 #include "RimGeoMechCase.h"
 

ApplicationCode/ModelVisualization/RivTernaryTextureCoordsCreator.cpp

@@ -34,6 +34,8 @@
 #include "RivTernaryResultToTextureMapper.h"
 #include "RivTernaryScalarMapper.h"
 
+#include "cvfStructGridGeometryGenerator.h"
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ModelVisualization/RivTextureCoordsCreator.cpp

@@ -32,6 +32,8 @@
 
 #include "RivResultToTextureMapper.h"
 
+#include "cvfStructGridGeometryGenerator.h"
+
 
 //--------------------------------------------------------------------------------------------------
 /// 

ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.cpp

@@ -24,6 +24,7 @@
 
 #include "RigCaseCellResultsData.h"
 #include "RigCaseData.h"
+#include "RigSingleWellResultsData.h"
 
 #include "RimCaseCollection.h"
 #include "RimEclipseCellColors.h"

ApplicationCode/ProjectDataModel/RimFlowDiagSolution.cpp

@@ -25,6 +25,7 @@
 #include "RigCaseData.h"
 #include "RigFlowDiagResults.h"
 #include "RigMainGrid.h"
+#include "RigSingleWellResultsData.h"
 
 CAF_PDM_SOURCE_INIT(RimFlowDiagSolution, "FlowDiagSolution");
 

ApplicationCode/ProjectDataModel/RimProject.cpp

@@ -24,6 +24,7 @@
 #include "RiaVersionInfo.h"
 
 #include "RigCaseData.h"
+#include "RigGridBase.h"
 
 #include "RimCalcScript.h"
 #include "RimCase.h"
@@ -59,6 +60,8 @@
 #include "cafCmdFeatureManager.h"
 #include "cafPdmUiTreeOrdering.h"
 
+#include "cvfBoundingBox.h"
+
 #include <QDir>
 #include <QMenu>
 

ApplicationCode/ReservoirDataModel/RigCaseData.cpp

@@ -25,6 +25,7 @@
 #include "RigFormationNames.h"
 #include "RigMainGrid.h"
 #include "RigResultAccessorFactory.h"
+#include "RigSingleWellResultsData.h"
 
 #include <QDebug>
 
@@ -55,6 +56,22 @@ RigCaseData::~RigCaseData()
 
 }
 
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RigMainGrid* RigCaseData::mainGrid()
+{
+    return m_mainGrid.p();
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+const RigMainGrid* RigCaseData::mainGrid() const
+{
+    return m_mainGrid.p();
+}
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ReservoirDataModel/RigCaseData.h

@@ -20,19 +20,30 @@
 
 #pragma once
 
-//#include "RigActiveCellInfo.h"
-#include "RigCell.h"
-#include "RigSingleWellResultsData.h"
+
+#include "RifReaderInterface.h"
 
 #include "cvfAssert.h"
 #include "cvfObject.h"
 #include "cvfVector3.h"
+#include "cvfStructGrid.h"
 
 #include <vector>
 
 class RigCaseCellResultsData;
 class RigFormationNames;
+class RigMainGrid;
+class RigGridBase;
+class RigCaseCellResultsData;
+class RigActiveCellInfo;
+class RigSingleWellResultsData;
+class RigCell;
 
+struct RigWellResultPoint;
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
 class RigCaseData : public cvf::Object
 {
 public:
@@ -47,8 +58,8 @@ public:
     RigCaseData();
     ~RigCaseData();
 
-    RigMainGrid*                                mainGrid() { return m_mainGrid.p(); }
-    const RigMainGrid*                          mainGrid() const { return m_mainGrid.p(); }
+    RigMainGrid*                                mainGrid();
+    const RigMainGrid*                          mainGrid() const;
     void                                        setMainGrid(RigMainGrid* mainGrid);
 
     void                                        allGrids(std::vector<RigGridBase*>* grids); // To be removed

ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.cpp

@@ -19,9 +19,10 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 #include "RigReservoirBuilderMock.h"
-#include "RigCaseData.h"
-#include "RigActiveCellInfo.h"
 
+#include "RigActiveCellInfo.h"
+#include "RigCaseData.h"
+#include "RigSingleWellResultsData.h"
 
 /* rand example: guess the number */
 #include <stdio.h>

ApplicationCode/ReservoirDataModel/RigSimulationWellCenterLineCalculator.cpp

@@ -18,11 +18,15 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 #include "RigSimulationWellCenterLineCalculator.h"
+
+#include "RigCaseData.h"
+#include "RigCell.h"
+
+#include "RimEclipseCase.h"
 #include "RimEclipseView.h"
 #include "RimEclipseWell.h"
 #include "RimEclipseWellCollection.h"
-#include "RimEclipseCase.h"
-#include "RigCaseData.h"
+
 #include "cvfRay.h"
 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ReservoirDataModel/RigTimeHistoryResultAccessor.cpp

@@ -19,13 +19,13 @@
 
 #include "RigTimeHistoryResultAccessor.h"
 
-#include <cmath> // Needed for HUGE_VAL on Linux
-
+#include "RigCaseCellResultsData.h"
 #include "RigCaseData.h"
+#include "RigGridBase.h"
 #include "RigResultAccessor.h"
 #include "RigResultAccessorFactory.h"
-#include "RigCaseCellResultsData.h"
 
+#include <cmath> // Needed for HUGE_VAL on Linux
 
 //--------------------------------------------------------------------------------------------------
 /// 

ApplicationCode/SocketInterface/RiaWellDataCommands.cpp

@@ -22,6 +22,7 @@
 #include "RiaSocketServer.h"
 #include "RiaSocketTools.h"
 
+#include "RigGridBase.h"
 #include "RigCaseData.h"
 #include "RigSingleWellResultsData.h"
 

ApplicationCode/UserInterface/RiuResultTextBuilder.cpp

@@ -25,6 +25,7 @@
 #include "RigMainGrid.h"
 #include "RigResultAccessor.h"
 #include "RigResultAccessorFactory.h"
+#include "RigSingleWellResultsData.h"
 
 #include "RimCellEdgeColors.h"
 #include "RimEclipseCase.h"