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())
{