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

#815 More renaming CrossSection -> Intersection

Browse Source
This commit is contained in:
Jacob Støren
2016-09-21 10:32:29 +02:00
parent 1c612030ef
commit 0083fb068f
8 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/ProjectDataModel/RimCrossSection.cpp
View File

@@ -33,7 +33,7 @@
#include "RimWellPath.h"
#include "RiuViewer.h"
#include "RivCrossSectionPartMgr.h"
#include "RivIntersectionPartMgr.h"
#include "cafCmdFeature.h"
#include "cafCmdFeatureManager.h"
@@ -336,9 +336,9 @@ std::vector< std::vector <cvf::Vec3d> > RimCrossSection::polyLines() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RivCrossSectionPartMgr* RimCrossSection::crossSectionPartMgr()
RivIntersectionPartMgr* RimCrossSection::crossSectionPartMgr()
{
if (m_crossSectionPartMgr.isNull()) m_crossSectionPartMgr = new RivCrossSectionPartMgr(this);
if (m_crossSectionPartMgr.isNull()) m_crossSectionPartMgr = new RivIntersectionPartMgr(this);
return m_crossSectionPartMgr.p();
}

6
ApplicationCode/ProjectDataModel/RimCrossSection.h
View File

@@ -32,7 +32,7 @@
class RimEclipseWell;
class RimEclipseWellCollection;
class RimWellPath;
class RivCrossSectionPartMgr;
class RivIntersectionPartMgr;
//==================================================================================================
//
@@ -74,7 +74,7 @@ public:
caf::PdmField< bool > inputFromViewerEnabled;
std::vector< std::vector <cvf::Vec3d> > polyLines() const;
RivCrossSectionPartMgr* crossSectionPartMgr();
RivIntersectionPartMgr* crossSectionPartMgr();
void appendPointToPolyLine(const cvf::Vec3d& point);
@@ -104,7 +104,7 @@ private:
void updateName();
void rebuildGeometryAndScheduleCreateDisplayModel();
private:
cvf::ref<RivCrossSectionPartMgr> m_crossSectionPartMgr;
cvf::ref<RivIntersectionPartMgr> m_crossSectionPartMgr;
mutable
std::vector< std::vector <cvf::Vec3d> > m_wellBranchCenterlines;

2
ApplicationCode/ProjectDataModel/RimCrossSectionCollection.cpp
View File

@@ -25,7 +25,7 @@
#include "RiuMainWindow.h"
#include "RivCrossSectionPartMgr.h"
#include "RivIntersectionPartMgr.h"
CAF_PDM_SOURCE_INIT(RimCrossSectionCollection, "CrossSectionCollection");

2
ApplicationCode/ProjectDataModel/RimEclipseView.h
View File

@@ -55,7 +55,7 @@ class RimEclipseCellColors;
class RimEclipseWellCollection;
class RiuViewer;
class RivReservoirPipesPartMgr;
class RivCrossSectionPartMgr;
class RivIntersectionPartMgr;
namespace cvf
{