OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#1996 Remane RimFieldCollection -> RimFaultInViewCollection

Browse Source
This commit is contained in:
Rebecca Cox
2017-10-15 21:20:03 +02:00
parent f0cb458550
commit 9bd556a1b9
15 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp
View File

@@ -30,7 +30,7 @@
#include "RimEclipseCellColors.h"
#include "RimEclipseView.h"
#include "RimFaultInView.h"
#include "RimFaultCollection.h"
#include "RimFaultInViewCollection.h"
#include "RimLegendConfig.h"
#include "RimTernaryLegendConfig.h"
@@ -55,7 +55,7 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RivFaultPartMgr::RivFaultPartMgr(const RigGridBase* grid, const RimFaultCollection* rimFaultCollection, const RimFaultInView* rimFault)
RivFaultPartMgr::RivFaultPartMgr(const RigGridBase* grid, const RimFaultInViewCollection* rimFaultCollection, const RimFaultInView* rimFault)
: m_grid(grid),
m_rimFaultCollection(rimFaultCollection),
m_rimFault(rimFault),
@@ -454,7 +454,7 @@ void RivFaultPartMgr::createLabelWithAnchorLine(const cvf::Part* part)
RimFaultInView* noConstRimFault = const_cast<RimFaultInView*>(m_rimFault);
if (noConstRimFault)
{
RimFaultCollection* parentObject;
RimFaultInViewCollection* parentObject;
noConstRimFault->firstAncestorOrThisOfType(parentObject);
if (parentObject)
{
@@ -604,7 +604,7 @@ caf::FaceCulling RivFaultPartMgr::faceCullingMode() const
bool isShowingGrid = m_rimFaultCollection->isGridVisualizationMode();
if (!isShowingGrid )
{
if (m_rimFaultCollection->faultResult() == RimFaultCollection::FAULT_BACK_FACE_CULLING)
if (m_rimFaultCollection->faultResult() == RimFaultInViewCollection::FAULT_BACK_FACE_CULLING)
{
if (m_grid->mainGrid()->isFaceNormalsOutwards())
{
@@ -615,7 +615,7 @@ caf::FaceCulling RivFaultPartMgr::faceCullingMode() const
return caf::FC_FRONT;
}
}
else if (m_rimFaultCollection->faultResult() == RimFaultCollection::FAULT_FRONT_FACE_CULLING)
else if (m_rimFaultCollection->faultResult() == RimFaultInViewCollection::FAULT_FRONT_FACE_CULLING)
{
if (m_grid->mainGrid()->isFaceNormalsOutwards())
{

8
ApplicationCode/ModelVisualization/RivFaultPartMgr.h
View File

@@ -35,9 +35,9 @@ namespace cvf
class RimEclipseCellColors;
class RimCellEdgeColors;
class RimFaultCollection;
class RimFaultInViewCollection;
class RigGridBase;
class RimFaultCollection;
class RimFaultInViewCollection;
class RimFaultInView;
class RivFaultGeometryGenerator;
class RivNNCGeometryGenerator;
@@ -51,7 +51,7 @@ class RivNNCGeometryGenerator;
class RivFaultPartMgr : public cvf::Object
{
public:
RivFaultPartMgr(const RigGridBase* grid, const RimFaultCollection* rimFaultCollection, const RimFaultInView* rimFault);
RivFaultPartMgr(const RigGridBase* grid, const RimFaultInViewCollection* rimFaultCollection, const RimFaultInView* rimFault);
void setCellVisibility(cvf::UByteArray* cellVisibilities);
@@ -80,7 +80,7 @@ private:
private:
cvf::cref<RigGridBase> m_grid;
const RimFaultInView* m_rimFault;
const RimFaultCollection* m_rimFaultCollection;
const RimFaultInViewCollection* m_rimFaultCollection;
float m_opacityLevel;
cvf::Color3f m_defaultColor;

10
ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp
View File

@@ -26,7 +26,7 @@
#include "RimEclipseFaultColors.h"
#include "RimEclipseView.h"
#include "RimFaultInView.h"
#include "RimFaultCollection.h"
#include "RimFaultInViewCollection.h"
#include "RivFaultPartMgr.h"
@@ -49,7 +49,7 @@ RivReservoirFaultsPartMgr::RivReservoirFaultsPartMgr(const RigMainGrid* grid, R
if (reservoirView)
{
RimFaultCollection* faultCollection = reservoirView->faultCollection();
RimFaultInViewCollection* faultCollection = reservoirView->faultCollection();
if (faultCollection)
{
for (size_t i = 0; i < faultCollection->faults.size(); i++)
@@ -97,7 +97,7 @@ void RivReservoirFaultsPartMgr::appendPartsToModel(cvf::ModelBasicList* model)
{
CVF_ASSERT(model != NULL);
RimFaultCollection* faultCollection = m_reservoirView->faultCollection();
RimFaultInViewCollection* faultCollection = m_reservoirView->faultCollection();
if (!faultCollection) return;
@@ -211,7 +211,7 @@ void RivReservoirFaultsPartMgr::updateColors(size_t timeStepIndex, RimEclipseCel
{
if (!m_reservoirView) return;
RimFaultCollection* faultCollection = m_reservoirView->faultCollection();
RimFaultInViewCollection* faultCollection = m_reservoirView->faultCollection();
CVF_ASSERT(faultCollection);
for (size_t i = 0; i < faultCollection->faults.size(); i++)
@@ -246,7 +246,7 @@ void RivReservoirFaultsPartMgr::appendLabelPartsToModel(cvf::ModelBasicList* mod
CVF_ASSERT(model != NULL);
if (!m_reservoirView) return;
RimFaultCollection* faultCollection = m_reservoirView->faultCollection();
RimFaultInViewCollection* faultCollection = m_reservoirView->faultCollection();
CVF_ASSERT(faultCollection);
if (!faultCollection->showFaultCollection()) return;

2
ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp
View File

@@ -37,7 +37,7 @@
#include "RimEclipsePropertyFilterCollection.h"
#include "RimEclipseResultDefinition.h"
#include "RimEclipseView.h"
#include "RimFaultCollection.h"
#include "RimFaultInViewCollection.h"
#include "RimReservoirCellResultsStorage.h"
#include "RimSimWellInViewCollection.h"
#include "RimViewController.h"