Renamed fault part managers

ApplicationCode/ModelVisualization/RivFaultPart.cpp

@@ -52,7 +52,7 @@
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RivFaultPart::RivFaultPart(const RigGridBase* grid, const RimFault* rimFault)
+RivFaultPartMgr::RivFaultPartMgr(const RigGridBase* grid, const RimFault* rimFault)
     :   m_grid(grid),
         m_rimFault(rimFault),
         m_opacityLevel(1.0f),
@@ -76,7 +76,7 @@ RivFaultPart::RivFaultPart(const RigGridBase* grid, const RimFault* rimFault)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RivFaultPart::setCellVisibility(cvf::UByteArray* cellVisibilities)
+void RivFaultPartMgr::setCellVisibility(cvf::UByteArray* cellVisibilities)
 {
     m_nativeFaultGenerator.setCellVisibility(cellVisibilities);
     m_oppositeFaultGenerator.setCellVisibility(cellVisibilities);
@@ -87,7 +87,7 @@ void RivFaultPart::setCellVisibility(cvf::UByteArray* cellVisibilities)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RivFaultPart::updateCellColor(cvf::Color4f color)
+void RivFaultPartMgr::updateCellColor(cvf::Color4f color)
 {
     m_defaultColor = color;
 
@@ -97,7 +97,7 @@ void RivFaultPart::updateCellColor(cvf::Color4f color)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RivFaultPart::setShowNativeFaces(bool showNativeFaces)
+void RivFaultPartMgr::setShowNativeFaces(bool showNativeFaces)
 {
     m_showNativeFaces = showNativeFaces;
 }
@@ -105,7 +105,7 @@ void RivFaultPart::setShowNativeFaces(bool showNativeFaces)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RivFaultPart::setShowOppositeFaces(bool showOppositeFaces)
+void RivFaultPartMgr::setShowOppositeFaces(bool showOppositeFaces)
 {
     m_showOppositeFaces = showOppositeFaces;
 }
@@ -113,7 +113,7 @@ void RivFaultPart::setShowOppositeFaces(bool showOppositeFaces)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RivFaultPart::setShowLabel(bool showLabel)
+void RivFaultPartMgr::setShowLabel(bool showLabel)
 {
     m_showLabel = showLabel;
 }
@@ -121,7 +121,7 @@ void RivFaultPart::setShowLabel(bool showLabel)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RivFaultPart::setLimitFaultToVisibleCells(bool limitFaultToVisibleCells)
+void RivFaultPartMgr::setLimitFaultToVisibleCells(bool limitFaultToVisibleCells)
 {
     m_nativeFaultGenerator.setLimitFaultsToFilter(limitFaultToVisibleCells);
     m_oppositeFaultGenerator.setLimitFaultsToFilter(limitFaultToVisibleCells);
@@ -132,7 +132,7 @@ void RivFaultPart::setLimitFaultToVisibleCells(bool limitFaultToVisibleCells)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RivFaultPart::updateCellResultColor(size_t timeStepIndex, RimResultSlot* cellResultSlot)
+void RivFaultPartMgr::updateCellResultColor(size_t timeStepIndex, RimResultSlot* cellResultSlot)
 {
     CVF_ASSERT(cellResultSlot);
 
@@ -237,7 +237,7 @@ void RivFaultPart::updateCellResultColor(size_t timeStepIndex, RimResultSlot* ce
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RivFaultPart::updateCellEdgeResultColor(size_t timeStepIndex, RimResultSlot* cellResultSlot, RimCellEdgeResultSlot* cellEdgeResultSlot)
+void RivFaultPartMgr::updateCellEdgeResultColor(size_t timeStepIndex, RimResultSlot* cellResultSlot, RimCellEdgeResultSlot* cellEdgeResultSlot)
 {
 
     /*
@@ -267,7 +267,7 @@ void RivFaultPart::updateCellEdgeResultColor(size_t timeStepIndex, RimResultSlot
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RivFaultPart::appendPartsToModel(cvf::ModelBasicList* model)
+void RivFaultPartMgr::appendPartsToModel(cvf::ModelBasicList* model)
 {
     CVF_ASSERT(model != NULL);
 
@@ -299,7 +299,7 @@ void RivFaultPart::appendPartsToModel(cvf::ModelBasicList* model)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RivFaultPart::generatePartGeometry()
+void RivFaultPartMgr::generatePartGeometry()
 {
     bool useBufferObjects = true;
     // Surface geometry
@@ -425,7 +425,7 @@ void RivFaultPart::generatePartGeometry()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RivFaultPart::updatePartEffect()
+void RivFaultPartMgr::updatePartEffect()
 {
     cvf::Color3f partColor = m_defaultColor.toColor3f();
 
@@ -482,7 +482,7 @@ void RivFaultPart::updatePartEffect()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RivFaultPart::createLabelWithAnchorLine(const cvf::Part* part)
+void RivFaultPartMgr::createLabelWithAnchorLine(const cvf::Part* part)
 {
     CVF_ASSERT(part);
 
@@ -565,7 +565,7 @@ void RivFaultPart::createLabelWithAnchorLine(const cvf::Part* part)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-cvf::Vec3f RivFaultPart::findClosestVertex(const cvf::Vec3f& point, const cvf::Vec3fArray* vertices)
+cvf::Vec3f RivFaultPartMgr::findClosestVertex(const cvf::Vec3f& point, const cvf::Vec3fArray* vertices)
 {
     CVF_ASSERT(vertices);
     

ApplicationCode/ModelVisualization/RivFaultPart.h

@@ -42,10 +42,10 @@ class RimFaultCollection;
 ///
 //==================================================================================================
 
-class RivFaultPart : public cvf::Object
+class RivFaultPartMgr : public cvf::Object
 {
 public:
-    RivFaultPart(const RigGridBase* grid, const RimFault* rimFault);
+    RivFaultPartMgr(const RigGridBase* grid, const RimFault* rimFault);
 
     void setCellVisibility(cvf::UByteArray* cellVisibilities);
 

ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp

@@ -32,7 +32,7 @@
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RivFaultPartMgr::RivFaultPartMgr(const RigGridBase* grid, size_t gridIdx, const RimFaultCollection* faultCollection)
+RivReservoirFaultsPartMgr::RivReservoirFaultsPartMgr(const RigGridBase* grid, size_t gridIdx, const RimFaultCollection* faultCollection)
 :   m_gridIdx(gridIdx),
     m_grid(grid),
     m_faultCollection(faultCollection)
@@ -43,7 +43,7 @@ RivFaultPartMgr::RivFaultPartMgr(const RigGridBase* grid, size_t gridIdx, const
     {
         for (size_t i = 0; i < faultCollection->faults.size(); i++)
         {
-            m_faultParts.push_back(new RivFaultPart(grid, faultCollection->faults[i]));
+            m_faultParts.push_back(new RivFaultPartMgr(grid, faultCollection->faults[i]));
         }
     }
 }
@@ -51,14 +51,14 @@ RivFaultPartMgr::RivFaultPartMgr(const RigGridBase* grid, size_t gridIdx, const
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RivFaultPartMgr::~RivFaultPartMgr()
+RivReservoirFaultsPartMgr::~RivReservoirFaultsPartMgr()
 {
 }
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RivFaultPartMgr::setTransform(cvf::Transform* scaleTransform)
+void RivReservoirFaultsPartMgr::setTransform(cvf::Transform* scaleTransform)
 {
     m_scaleTransform = scaleTransform;
 }
@@ -66,7 +66,7 @@ void RivFaultPartMgr::setTransform(cvf::Transform* scaleTransform)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RivFaultPartMgr::setCellVisibility(cvf::UByteArray* cellVisibilities)
+void RivReservoirFaultsPartMgr::setCellVisibility(cvf::UByteArray* cellVisibilities)
 {
     CVF_ASSERT(cellVisibilities);
 
@@ -79,7 +79,7 @@ void RivFaultPartMgr::setCellVisibility(cvf::UByteArray* cellVisibilities)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RivFaultPartMgr::appendPartsToModel(cvf::ModelBasicList* model)
+void RivReservoirFaultsPartMgr::appendPartsToModel(cvf::ModelBasicList* model)
 {
     CVF_ASSERT(model != NULL);
 
@@ -101,7 +101,7 @@ void RivFaultPartMgr::appendPartsToModel(cvf::ModelBasicList* model)
 
         if (rimFault->showFault())
         {
-            cvf::ref<RivFaultPart> rivFaultPart = m_faultParts[i];
+            cvf::ref<RivFaultPartMgr> rivFaultPart = m_faultParts[i];
 
             // Propagate settings from RimFaultCollection to RivFaultPart
             rivFaultPart->setShowNativeFaces(m_faultCollection->showFaultFaces());
@@ -125,7 +125,7 @@ void RivFaultPartMgr::appendPartsToModel(cvf::ModelBasicList* model)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RivFaultPartMgr::updateCellColor(cvf::Color4f color)
+void RivReservoirFaultsPartMgr::updateCellColor(cvf::Color4f color)
 {
     for (size_t i = 0; i < m_faultParts.size(); i++)
     {
@@ -137,7 +137,7 @@ void RivFaultPartMgr::updateCellColor(cvf::Color4f color)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RivFaultPartMgr::updateCellResultColor(size_t timeStepIndex, RimResultSlot* cellResultSlot)
+void RivReservoirFaultsPartMgr::updateCellResultColor(size_t timeStepIndex, RimResultSlot* cellResultSlot)
 {
     for (size_t i = 0; i < m_faultParts.size(); i++)
     {
@@ -148,7 +148,7 @@ void RivFaultPartMgr::updateCellResultColor(size_t timeStepIndex, RimResultSlot*
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RivFaultPartMgr::updateCellEdgeResultColor(size_t timeStepIndex, RimResultSlot* cellResultSlot, RimCellEdgeResultSlot* cellEdgeResultSlot)
+void RivReservoirFaultsPartMgr::updateCellEdgeResultColor(size_t timeStepIndex, RimResultSlot* cellResultSlot, RimCellEdgeResultSlot* cellEdgeResultSlot)
 {
     for (size_t i = 0; i < m_faultParts.size(); i++)
     {

ApplicationCode/ModelVisualization/RivFaultPartMgr.h

@@ -36,11 +36,11 @@ class RimFaultCollection;
 //==================================================================================================
 ///
 //==================================================================================================
-class RivFaultPartMgr : public cvf::Object
+class RivReservoirFaultsPartMgr : public cvf::Object
 {
 public:
-    RivFaultPartMgr(const RigGridBase* grid, size_t gridIdx, const RimFaultCollection* faultCollection);
+    RivReservoirFaultsPartMgr(const RigGridBase* grid, size_t gridIdx, const RimFaultCollection* faultCollection);
-    ~RivFaultPartMgr();
+    ~RivReservoirFaultsPartMgr();
 
     void setTransform(cvf::Transform* scaleTransform);
     void setCellVisibility(cvf::UByteArray* cellVisibilities);
@@ -58,5 +58,5 @@ private:
     cvf::cref<RigGridBase>          m_grid;
     cvf::ref<cvf::Transform>        m_scaleTransform;
     const RimFaultCollection*       m_faultCollection;
-    cvf::Collection<RivFaultPart>   m_faultParts;
+    cvf::Collection<RivFaultPartMgr>   m_faultParts;
 };

ApplicationCode/ModelVisualization/RivReservoirPartMgr.cpp

@@ -44,7 +44,7 @@ void RivReservoirPartMgr::clearAndSetReservoir(const RigCaseData* eclipseCase, c
         }
 
         // Faults read from file are present only on main grid
-        m_faults.push_back(new RivFaultPartMgr(eclipseCase->mainGrid(), 0, faultCollection));
+        m_faults.push_back(new RivReservoirFaultsPartMgr(eclipseCase->mainGrid(), 0, faultCollection));
     }
 }
 

ApplicationCode/ModelVisualization/RivReservoirPartMgr.h

@@ -64,5 +64,5 @@ public:
 private:
 
     cvf::Collection<RivGridPartMgr> m_allGrids; // Main grid and all LGR's 
-    cvf::Collection<RivFaultPartMgr> m_faults;
+    cvf::Collection<RivReservoirFaultsPartMgr> m_faults;
 };