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

Rename RivIntersectionGeometryGenerator to RivExtrudedCurveIntersectionGeometryGenerator

Browse Source 
and RivIntersectionPartMgr to RivExtrudedCurveIntersectionPartMgr
This commit is contained in:
Jacob Støren
2019-11-26 11:51:54 +01:00
parent 152d2bde17
commit 0617b56850
17 changed files with 69 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/ProjectDataModel/Rim2dIntersectionView.cpp
View File

@@ -37,7 +37,7 @@
#include "RiuMainWindow.h"
#include "RiuViewer.h"
#include "RivIntersectionPartMgr.h"
#include "RivExtrudedCurveIntersectionPartMgr.h"
#include "RivSimWellPipesPartMgr.h"
#include "RivTernarySaturationOverlayItem.h"
#include "RivWellHeadPartMgr.h"
@@ -354,7 +354,7 @@ void Rim2dIntersectionView::updateName()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
cvf::ref<RivIntersectionPartMgr> Rim2dIntersectionView::flatIntersectionPartMgr() const
cvf::ref<RivExtrudedCurveIntersectionPartMgr> Rim2dIntersectionView::flatIntersectionPartMgr() const
{
return m_flatIntersectionPartMgr;
}
@@ -540,7 +540,7 @@ void Rim2dIntersectionView::onCreateDisplayModel()
nativeOrOverrideViewer()->addFrame( new cvf::Scene(), isUsingOverrideViewer() );
}
m_flatIntersectionPartMgr = new RivIntersectionPartMgr( m_intersection(), true );
m_flatIntersectionPartMgr = new RivExtrudedCurveIntersectionPartMgr( m_intersection(), true );
m_intersectionVizModel->removeAllParts();

6
ApplicationCode/ProjectDataModel/Rim2dIntersectionView.h
View File

@@ -28,7 +28,7 @@ class RimTernaryLegendConfig;
class RivSimWellPipesPartMgr;
class RivWellHeadPartMgr;
class RivWellPathPartMgr;
class RivIntersectionPartMgr;
class RivExtrudedCurveIntersectionPartMgr;
namespace cvf
{
@@ -71,7 +71,7 @@ public:
void update3dInfo();
void updateName();
cvf::ref<RivIntersectionPartMgr> flatIntersectionPartMgr() const;
cvf::ref<RivExtrudedCurveIntersectionPartMgr> flatIntersectionPartMgr() const;
cvf::Vec3d transformToUtm( const cvf::Vec3d& unscaledPointInFlatDomain ) const;
cvf::ref<caf::DisplayCoordTransform> displayCoordTransform() const override;
@@ -119,7 +119,7 @@ private:
caf::PdmPtrField<RimExtrudedCurveIntersection*> m_intersection;
cvf::ref<RivIntersectionPartMgr> m_flatIntersectionPartMgr;
cvf::ref<RivExtrudedCurveIntersectionPartMgr> m_flatIntersectionPartMgr;
cvf::ref<RivSimWellPipesPartMgr> m_flatSimWellPipePartMgr;
cvf::ref<RivWellHeadPartMgr> m_flatWellHeadPartMgr;
cvf::ref<RivWellPathPartMgr> m_flatWellpathPartMgr;

2
ApplicationCode/ProjectDataModel/RimEclipseView.h
View File

@@ -57,7 +57,7 @@ class RimStimPlanColors;
class RimVirtualPerforationResults;
class RiuViewer;
class RivReservoirSimWellsPartMgr;
class RivIntersectionPartMgr;
class RivExtrudedCurveIntersectionPartMgr;
class RivReservoirViewPartMgr;
class RimRegularLegendConfig;
class RimTernaryLegendConfig;

6
ApplicationCode/ProjectDataModel/RimExtrudedCurveIntersection.cpp
View File

@@ -36,7 +36,7 @@
#include "RimWellPath.h"
#include "RiuViewer.h"
#include "RivIntersectionPartMgr.h"
#include "RivExtrudedCurveIntersectionPartMgr.h"
#include "cafCmdFeature.h"
#include "cafCmdFeatureManager.h"
@@ -492,9 +492,9 @@ std::vector<std::vector<cvf::Vec3d>> RimExtrudedCurveIntersection::polyLines( cv
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RivIntersectionPartMgr* RimExtrudedCurveIntersection::intersectionPartMgr()
RivExtrudedCurveIntersectionPartMgr* RimExtrudedCurveIntersection::intersectionPartMgr()
{
if ( m_crossSectionPartMgr.isNull() ) m_crossSectionPartMgr = new RivIntersectionPartMgr( this );
if ( m_crossSectionPartMgr.isNull() ) m_crossSectionPartMgr = new RivExtrudedCurveIntersectionPartMgr( this );
return m_crossSectionPartMgr.p();
}

6
ApplicationCode/ProjectDataModel/RimExtrudedCurveIntersection.h
View File

@@ -30,7 +30,7 @@
#include "RimIntersectionHandle.h"
class RimWellPath;
class RivIntersectionPartMgr;
class RivExtrudedCurveIntersectionPartMgr;
class RimIntersectionResultDefinition;
class RimSimWellInView;
class RimSimWellInViewCollection;
@@ -85,7 +85,7 @@ public:
void appendPointToPolyLine( const cvf::Vec3d& point );
Rim2dIntersectionView* correspondingIntersectionView();
RivIntersectionPartMgr* intersectionPartMgr();
RivExtrudedCurveIntersectionPartMgr* intersectionPartMgr();
void rebuildGeometry();
std::vector<cvf::Vec3d> polyLinesForExtrusionDirection() const;
@@ -140,7 +140,7 @@ private:
static double azimuthInRadians( cvf::Vec3d vec );
private:
cvf::ref<RivIntersectionPartMgr> m_crossSectionPartMgr;
cvf::ref<RivExtrudedCurveIntersectionPartMgr> m_crossSectionPartMgr;
mutable std::vector<std::vector<cvf::Vec3d>> m_simulationWellBranchCenterlines;
};

2
ApplicationCode/ProjectDataModel/RimIntersectionCollection.cpp
View File

@@ -30,7 +30,7 @@
#include "Riu3DMainWindowTools.h"
#include "RivIntersectionBoxPartMgr.h"
#include "RivIntersectionPartMgr.h"
#include "RivExtrudedCurveIntersectionPartMgr.h"
#include "cvfModelBasicList.h"