#1255 Remove includes from header files

ApplicationCode/Commands/OperationsUsingObjReferences/RicPasteEclipseCasesFeature.cpp

@@ -28,6 +28,7 @@
 #include "RimCaseCollection.h"
 #include "RimEclipseCaseCollection.h"
 #include "RimEclipseResultCase.h"
+#include "RimEclipseView.h"
 #include "RimIdenticalGridCaseGroup.h"
 #include "RimMimeData.h"
 #include "RimOilField.h"

ApplicationCode/Commands/OperationsUsingObjReferences/RicPasteFeatureImpl.cpp

@@ -23,6 +23,7 @@
 
 #include "RimCaseCollection.h"
 #include "RimEclipseCase.h"
+#include "RimEclipseView.h"
 #include "RimGeoMechCase.h"
 #include "RimGeoMechView.h"
 #include "RimIdenticalGridCaseGroup.h"

ApplicationCode/GeoMech/GeoMechVisualization/RivFemPartPartMgr.cpp

@@ -56,9 +56,11 @@
 #include "cvfShaderSourceProvider.h"
 #include "cvfShaderSourceRepository.h"
 #include "cvfStructGrid.h"
+#include "cvfTransform.h"
 #include "cvfUniform.h"
 
 
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ModelVisualization/RivGridPartMgr.cpp

@@ -54,17 +54,19 @@
 #include "cvfMath.h"
 #include "cvfModelBasicList.h"
 #include "cvfPart.h"
+#include "cvfRenderState_FF.h"
 #include "cvfRenderStateBlending.h"
 #include "cvfRenderStatePolygonOffset.h"
-#include "cvfRenderState_FF.h"
 #include "cvfShaderProgram.h"
 #include "cvfShaderProgramGenerator.h"
 #include "cvfShaderSourceProvider.h"
 #include "cvfShaderSourceRepository.h"
 #include "cvfStructGrid.h"
+#include "cvfTransform.h"
 #include "cvfUniform.h"
 
 
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ModelVisualization/RivReservoirPipesPartMgr.cpp

@@ -35,6 +35,8 @@
 #include "cafPdmFieldCvfColor.h"
 #include "cafPdmFieldCvfMat4d.h"
 
+#include "cvfTransform.h"
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp

@@ -903,7 +903,7 @@ void RivReservoirViewPartMgr::updateFaultCellEdgeResultColor(RivCellSetEnum geom
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-cvf::cref<cvf::UByteArray> RivReservoirViewPartMgr::cellVisibility(RivCellSetEnum geometryType, size_t gridIndex, size_t timeStepIndex) const
+const cvf::UByteArray* RivReservoirViewPartMgr::cellVisibility(RivCellSetEnum geometryType, size_t gridIndex, size_t timeStepIndex) const
 {
     RivReservoirPartMgr * pmgr = (const_cast<RivReservoirViewPartMgr*>(this))->reservoirPartManager( geometryType,  timeStepIndex );
     return pmgr->cellVisibility(gridIndex).p();

ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.h

@@ -52,7 +52,7 @@ public:
 
     void                        clearGeometryCache();
     void                        scheduleGeometryRegen(RivCellSetEnum geometryType);
-    cvf::cref<cvf::UByteArray>  cellVisibility(RivCellSetEnum geometryType, size_t gridIndex, size_t frameIndex) const;
+    const cvf::UByteArray*      cellVisibility(RivCellSetEnum geometryType, size_t gridIndex, size_t frameIndex) const;
    
     void                        appendStaticGeometryPartsToModel (cvf::ModelBasicList* model, RivCellSetEnum geometryType, const std::vector<size_t>& gridIndices);
     void                        appendDynamicGeometryPartsToModel(cvf::ModelBasicList* model, RivCellSetEnum geometryType, size_t frameIndex, const std::vector<size_t>& gridIndices);

ApplicationCode/ModelVisualization/RivWellHeadPartMgr.cpp

@@ -31,6 +31,7 @@
 #include "RigSingleWellResultsData.h"
 
 #include "RimEclipseCase.h"
+#include "RimEclipseView.h"
 #include "RimEclipseWell.h"
 #include "RimEclipseWellCollection.h"
 
@@ -46,6 +47,7 @@
 #include "cvfGeometryBuilderFaceList.h"
 #include "cvfModelBasicList.h"
 #include "cvfPart.h"
+#include "cvfTransform.h"
 #include "cvfqtUtils.h"
 
 

ApplicationCode/ProjectDataModel/Flow/RimFlowDiagSolution.cpp

@@ -29,6 +29,7 @@
 #include "RigSingleWellResultsData.h"
 
 #include "RimEclipseResultCase.h"
+#include "RimEclipseView.h"
 #include "RimEclipseWell.h"
 #include "RimEclipseWellCollection.h"
 

ApplicationCode/ProjectDataModel/RimEclipseCase.h

@@ -20,19 +20,17 @@
 
 #pragma once
 
-#include "cvfBase.h"
+#include "RifReaderInterface.h"
-#include "cvfObject.h"
 
 #include "RimCase.h"
-#include "RimEclipseView.h"
-
 
 #include "cafPdmChildArrayField.h"
 #include "cafPdmChildField.h"
 #include "cafPdmField.h"
 #include "cafPdmObject.h"
 
-#include "RifReaderInterface.h"
+#include "cvfBase.h"
+#include "cvfObject.h"
 
 class QString;
 
@@ -41,6 +39,7 @@ class RigGridBase;
 class RimCaseCollection;
 class RimIdenticalGridCaseGroup;
 class RimReservoirCellResultsStorage;
+class RimEclipseView;
 
 
 //==================================================================================================

ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.h

@@ -20,14 +20,16 @@
 
 #pragma once
 
+#include "RimEclipseCase.h"
+#include "RimDefines.h"
+
 #include "cvfBase.h"
 #include "cvfObject.h"
 #include "cafPdmField.h"
 #include "cafPdmObject.h"
 #include "cafAppEnum.h"
+#include "cvfCollection.h"
 
-#include "RimEclipseCase.h"
-#include "RimDefines.h"
 
 class RimIdenticalGridCaseGroup;
 class RimEclipseResultDefinition;

ApplicationCode/ProjectDataModel/RimEclipseView.cpp

@@ -61,6 +61,7 @@
 #include "RiuViewer.h"
 
 #include "RivReservoirPipesPartMgr.h"
+#include "RivReservoirViewPartMgr.h"
 #include "RivReservoirWellSpheresPartMgr.h"
 #include "RivSingleCellPartGenerator.h"
 #include "RivTernarySaturationOverlayItem.h"
@@ -1137,6 +1138,14 @@ void RimEclipseView::syncronizeWellsWithResults()
     }
 }
 
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+const RivReservoirViewPartMgr* RimEclipseView::reservoirGridPartManager() const
+{
+    return m_reservoirGridPartManager.p();
+}
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
@@ -1268,6 +1277,14 @@ void RimEclipseView::updateDisplayModelForWellResults()
 }
 
 
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+const std::vector<RivCellSetEnum>& RimEclipseView::visibleGridParts() const
+{
+    return m_visibleGridParts;
+}
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
@@ -1501,7 +1518,7 @@ void RimEclipseView::calculateCurrentTotalCellVisibility(cvf::UByteArray* totalV
 
         for (size_t gpIdx = 0; gpIdx < m_visibleGridParts.size(); ++gpIdx)
         {
-            cvf::cref<cvf::UByteArray> visibility =  m_reservoirGridPartManager->cellVisibility(m_visibleGridParts[gpIdx], gridIdx, m_currentTimeStep);
+            const cvf::UByteArray* visibility =  m_reservoirGridPartManager->cellVisibility(m_visibleGridParts[gpIdx], gridIdx, m_currentTimeStep);
 
             for (int lcIdx = 0; lcIdx < gridCellCount; ++ lcIdx)
             {

ApplicationCode/ProjectDataModel/RimEclipseView.h

@@ -33,7 +33,6 @@
 #include "cafPdmFieldCvfColor.h"    
 #include "cafPdmFieldCvfMat4d.h"
 
-#include "RivReservoirViewPartMgr.h"
 #include "RimView.h"
 
 class RigActiveCellInfo;
@@ -58,6 +57,7 @@ class RiuViewer;
 class RivReservoirPipesPartMgr;
 class RivReservoirWellSpheresPartMgr;
 class RivIntersectionPartMgr;
+class RivReservoirViewPartMgr;
 
 namespace cvf
 {
@@ -128,8 +128,8 @@ public:
     void                                            schedulePipeGeometryRegen();
     void                                            updateDisplayModelForWellResults();
 
-    const std::vector<RivCellSetEnum>&              visibleGridParts() const { return m_visibleGridParts;}
+    const std::vector<RivCellSetEnum>&              visibleGridParts() const;
-    cvf::cref<RivReservoirViewPartMgr>              reservoirGridPartManager() const { return m_reservoirGridPartManager.p(); }
+    const RivReservoirViewPartMgr*                  reservoirGridPartManager() const;
 
     // Does this belong here, really ?
     void                                            calculateVisibleWellCellsIncFence(cvf::UByteArray* visibleCells, RigGridBase * grid);

ApplicationCode/ProjectDataModel/RimEclipseWell.cpp

@@ -30,6 +30,8 @@
 
 #include "RiuMainWindow.h"
 
+#include "RivReservoirViewPartMgr.h"
+
 #include "cvfMath.h"
 
 CAF_PDM_SOURCE_INIT(RimEclipseWell, "Well");
@@ -177,7 +179,7 @@ bool RimEclipseWell::intersectsWellCellsFilteredCells(const RigWellResultFrame &
     if (!reservoirView) return false;
 
     const std::vector<RivCellSetEnum>& visGridParts = reservoirView->visibleGridParts();
-    cvf::cref<RivReservoirViewPartMgr> rvMan = reservoirView->reservoirGridPartManager();
+    const RivReservoirViewPartMgr* rvMan = reservoirView->reservoirGridPartManager();
 
 
     for (const RivCellSetEnum& visGridPart : visGridParts)
@@ -200,7 +202,7 @@ bool RimEclipseWell::intersectsWellCellsFilteredCells(const RigWellResultFrame &
 
         if (gridIndex != cvf::UNDEFINED_SIZE_T && gridCellIndex != cvf::UNDEFINED_SIZE_T)
         {
-            cvf::cref<cvf::UByteArray> cellVisibility = rvMan->cellVisibility(visGridPart, gridIndex, frameIndex);
+            const cvf::UByteArray* cellVisibility = rvMan->cellVisibility(visGridPart, gridIndex, frameIndex);
             if (gridCellIndex < cellVisibility->size() && (*cellVisibility)[gridCellIndex])
             {
                 return true;
@@ -220,7 +222,7 @@ bool RimEclipseWell::intersectsWellCellsFilteredCells(const RigWellResultFrame &
                     gridIndex = wellResultPoint.m_gridIndex;
                     gridCellIndex = wellResultPoint.m_gridCellIndex;
 
-                    cvf::cref<cvf::UByteArray> cellVisibility = rvMan->cellVisibility(visGridPart, gridIndex, frameIndex);
+                    const cvf::UByteArray* cellVisibility = rvMan->cellVisibility(visGridPart, gridIndex, frameIndex);
                     if (gridCellIndex < cellVisibility->size() && (*cellVisibility)[gridCellIndex])
                     {
                         return true;

ApplicationCode/ProjectDataModel/RimGeoMechView.cpp

@@ -58,6 +58,7 @@
 #include "cvfOverlayScalarMapperLegend.h"
 #include "cvfPart.h"
 #include "cvfScene.h"
+#include "cvfTransform.h"
 #include "cvfViewport.h"
 #include "cvfqtUtils.h"
 

ApplicationCode/ProjectDataModel/RimIntersection.cpp

@@ -42,6 +42,7 @@
 #include "cafPdmUiPushButtonEditor.h"
 
 #include "cvfBoundingBox.h"
+#include "cvfPlane.h"
 
 
 namespace caf {

ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp

@@ -31,12 +31,12 @@
 #include "RigResultModifier.h"
 #include "RigResultModifierFactory.h"
 
-#include "RimEclipseCase.h"
 #include "RimEclipseCase.h"
 #include "RimEclipseCellColors.h"
 #include "RimEclipseInputCase.h"
 #include "RimEclipseInputProperty.h"
 #include "RimEclipseInputPropertyCollection.h"
+#include "RimEclipseView.h"
 #include "RimReservoirCellResultsStorage.h"
 
 #include "RiuMainWindow.h"

ApplicationCode/UserInterface/RiuViewerCommands.cpp

@@ -77,6 +77,7 @@
 #include "cvfOverlayAxisCross.h"
 #include "cvfOverlayScalarMapperLegend.h"
 #include "cvfPart.h"
+#include "cvfTransform.h"
 
 #include <QMenu>
 #include <QMouseEvent>