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

#1524 Move "Fractures" into "Completions" folder

Browse Source
This commit is contained in:
Bjørnar Grip Fjær
2017-05-26 13:01:28 +02:00
parent a51c21787d
commit cedd8c42d0
4 changed files with 32 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ApplicationCode/ProjectDataModel/RimWellPath.cpp
View File

@@ -112,9 +112,6 @@ RimWellPath::RimWellPath()
CAF_PDM_InitFieldNoDefault(&m_wellLogFile, "WellLogFile", "Well Log File", "", "", "");
m_wellLogFile.uiCapability()->setUiHidden(true);
CAF_PDM_InitFieldNoDefault(&fractureCollection, "FractureCollection", "Fractures", "", "", "");
fractureCollection = new RimWellPathFractureCollection();
m_wellPath = NULL;
}
@@ -142,10 +139,6 @@ RimWellPath::~RimWellPath()
}
}
}
if (fractureCollection()) delete fractureCollection();
}
@@ -189,6 +182,16 @@ RimPerforationCollection* RimWellPath::perforationIntervalCollection()
return m_completions->perforationCollection();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimWellPathFractureCollection* RimWellPath::fractureCollection()
{
CVF_ASSERT(m_completions);
return m_completions->fractureCollection();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -318,12 +321,6 @@ void RimWellPath::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, Q
{
uiTreeOrdering.add(&m_wellLogFile);
uiTreeOrdering.add(&m_completions);
// TODO : Move to subobject Completions->Fractures
for (RimWellPathFracture* fracture : fractureCollection()->fractures())
{
uiTreeOrdering.add(fracture);
}
uiTreeOrdering.skipRemainingChildren(true);
}