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

#1722 Completion Export : Use RimTools::wellPathCollection

Browse Source
This commit is contained in:
Magne Sjaastad
2018-06-26 10:12:49 +02:00
parent 7347e0ecc3
commit 4ae3290e3c
10 changed files with 44 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ModelVisualization/RivWellPathPartMgr.cpp
View File

@@ -606,7 +606,7 @@ void RivWellPathPartMgr::clearAllBranchData()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimWellPathCollection* RivWellPathPartMgr::wellPathCollection()
RimWellPathCollection* RivWellPathPartMgr::wellPathCollection() const
{
if (!m_rimWellPath) return nullptr;

2
ApplicationCode/ModelVisualization/RivWellPathPartMgr.h
View File

@@ -110,7 +110,7 @@ private:
void clearAllBranchData();
inline RimWellPathCollection* wellPathCollection();
inline RimWellPathCollection* wellPathCollection() const;
inline double wellPathRadius(double characteristicCellSize, RimWellPathCollection* wellPathCollection);
bool isWellPathWithinBoundingBox(const cvf::BoundingBox& wellPathClipBoundingBox) const;

14
ApplicationCode/ModelVisualization/RivWellPathsPartMgr.cpp
View File

@@ -21,8 +21,8 @@
#include "RiaApplication.h"
#include "RimEclipseView.h"
#include "RimOilField.h"
#include "RimProject.h"
#include "RimTools.h"
#include "RimWellPathCollection.h"
#include "RivWellPathPartMgr.h"
@@ -129,22 +129,12 @@ void RivWellPathsPartMgr::createPartManagersIfRequired()
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimWellPathCollection* RivWellPathsPartMgr::wellPathCollection() const
{
RimProject* proj = RiaApplication::instance()->project();
return proj->activeOilField()->wellPathCollection();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RivWellPathsPartMgr::isWellPathVisible() const
{
auto wellPathColl = wellPathCollection();
auto wellPathColl = RimTools::wellPathCollection();
if (!wellPathColl->isActive()) return false;
if (wellPathColl->wellPathVisibility() == RimWellPathCollection::FORCE_ALL_OFF) return false;

2
ApplicationCode/ModelVisualization/RivWellPathsPartMgr.h
View File

@@ -42,7 +42,6 @@ class DisplayCoordTransform;
class Rim3dView;
class RivWellPathPartMgr;
class RimWellPathCollection;
class RimWellPath;
//--------------------------------------------------------------------------------------------------
@@ -72,7 +71,6 @@ private:
void clearGeometryCache();
void scheduleGeometryRegen();
void createPartManagersIfRequired();
RimWellPathCollection* wellPathCollection() const;
bool isWellPathVisible() const;
private: