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: Rename RimFault -> RimFaultInView

Browse Source
This commit is contained in:
Rebecca Cox
2017-10-13 15:01:52 +02:00
parent 7da8e3091b
commit 97e60ab5f2
10 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp
View File

@@ -29,7 +29,7 @@
#include "RimEclipseCase.h"
#include "RimEclipseCellColors.h"
#include "RimEclipseView.h"
#include "RimFault.h"
#include "RimFaultInView.h"
#include "RimFaultCollection.h"
#include "RimLegendConfig.h"
#include "RimTernaryLegendConfig.h"
@@ -55,7 +55,7 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RivFaultPartMgr::RivFaultPartMgr(const RigGridBase* grid, const RimFaultCollection* rimFaultCollection, const RimFault* rimFault)
RivFaultPartMgr::RivFaultPartMgr(const RigGridBase* grid, const RimFaultCollection* rimFaultCollection, const RimFaultInView* rimFault)
: m_grid(grid),
m_rimFaultCollection(rimFaultCollection),
m_rimFault(rimFault),
@@ -451,7 +451,7 @@ void RivFaultPartMgr::createLabelWithAnchorLine(const cvf::Part* part)
cvf::Color3f defWellLabelColor = RiaApplication::instance()->preferences()->defaultWellLabelColor();
{
RimFault* noConstRimFault = const_cast<RimFault*>(m_rimFault);
RimFaultInView* noConstRimFault = const_cast<RimFaultInView*>(m_rimFault);
if (noConstRimFault)
{
RimFaultCollection* parentObject;

6
ApplicationCode/ModelVisualization/RivFaultPartMgr.h
View File

@@ -38,7 +38,7 @@ class RimCellEdgeColors;
class RimFaultCollection;
class RigGridBase;
class RimFaultCollection;
class RimFault;
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 RimFault* rimFault);
RivFaultPartMgr(const RigGridBase* grid, const RimFaultCollection* rimFaultCollection, const RimFaultInView* rimFault);
void setCellVisibility(cvf::UByteArray* cellVisibilities);
@@ -79,7 +79,7 @@ private:
static cvf::Vec3f findClosestVertex(const cvf::Vec3f& point, const cvf::Vec3fArray* vertices);
private:
cvf::cref<RigGridBase> m_grid;
const RimFault* m_rimFault;
const RimFaultInView* m_rimFault;
const RimFaultCollection* m_rimFaultCollection;
float m_opacityLevel;

6
ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp
View File

@@ -25,7 +25,7 @@
#include "RimEclipseCellColors.h"
#include "RimEclipseFaultColors.h"
#include "RimEclipseView.h"
#include "RimFault.h"
#include "RimFaultInView.h"
#include "RimFaultCollection.h"
#include "RivFaultPartMgr.h"
@@ -125,7 +125,7 @@ void RivReservoirFaultsPartMgr::appendPartsToModel(cvf::ModelBasicList* model)
for (size_t i = 0; i < faultCollection->faults.size(); i++)
{
const RimFault* rimFault = faultCollection->faults[i];
const RimFaultInView* rimFault = faultCollection->faults[i];
cvf::ref<RivFaultPartMgr> rivFaultPart = m_faultParts[i];
CVF_ASSERT(rivFaultPart.notNull());
@@ -260,7 +260,7 @@ void RivReservoirFaultsPartMgr::appendLabelPartsToModel(cvf::ModelBasicList* mod
for (size_t i = 0; i < faultCollection->faults.size(); i++)
{
const RimFault* rimFault = faultCollection->faults[i];
const RimFaultInView* rimFault = faultCollection->faults[i];
cvf::ref<RivFaultPartMgr> rivFaultPart = m_faultParts[i];
CVF_ASSERT(rivFaultPart.notNull());