OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

#1495 Move features from well path to sub objects

Browse Source
This commit is contained in:
Magne Sjaastad
2017-05-20 14:31:25 +02:00
parent 5ec2764c16
commit ecddaffeb4
7 changed files with 53 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationCode/ProjectDataModel/Fishbones/RimFishbonesCollection.cpp
+3 -7
View File
@@ -18,16 +18,10 @@
#include "RimFishbonesCollection.h"
#include "RimEclipseWell.h"
#include "RimPerforationInterval.h"
#include "RimView.h"
#include "RimProject.h"
#include "RifWellPathImporter.h"
#include "RigWellPath.h"
#include "RifWellPathImporter.h"
#include "RiuMainWindow.h"
#include "RimFishboneWellPathCollection.h"
#include "RimFishbonesMultipleSubs.h"
@@ -58,6 +52,8 @@ RimFishbonesCollection::RimFishbonesCollection()
//--------------------------------------------------------------------------------------------------
RimFishboneWellPathCollection* RimFishbonesCollection::wellPathCollection() const
{
CVF_ASSERT(m_wellPathCollection);
return m_wellPathCollection();
}
ApplicationCode/ProjectDataModel/Fishbones/RimFishbonesCollection.h
-2
View File
@@ -20,9 +20,7 @@
#include "RimCheckableNamedObject.h"
#include "cafPdmObject.h"
#include "cafPdmChildArrayField.h"
#include "cafPdmField.h"
#include "cafPdmChildField.h"
class RimFishbonesMultipleSubs;
ApplicationCode/ProjectDataModel/RimWellPathCompletions.cpp
+6
View File
@@ -21,6 +21,8 @@
#include "RimFishbonesCollection.h"
#include "RimPerforationCollection.h"
#include "cvfAssert.h"
CAF_PDM_SOURCE_INIT(RimWellPathCompletions, "WellPathCompletions");
@@ -45,6 +47,8 @@ RimWellPathCompletions::RimWellPathCompletions()
//--------------------------------------------------------------------------------------------------
RimFishbonesCollection* RimWellPathCompletions::fishbonesCollection() const
{
CVF_ASSERT(m_fishbonesCollection);
return m_fishbonesCollection;
}
@@ -53,6 +57,8 @@ RimFishbonesCollection* RimWellPathCompletions::fishbonesCollection() const
//--------------------------------------------------------------------------------------------------
RimPerforationCollection* RimWellPathCompletions::perforationCollection() const
{
CVF_ASSERT(m_perforationCollection);
return m_perforationCollection;
}