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
Show Stats 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);
}

5
ApplicationCode/ProjectDataModel/RimWellPath.h
View File

@ -79,14 +79,11 @@ public:
RimFishbonesCollection* fishbonesCollection();
RimPerforationCollection* perforationIntervalCollection();
RimWellPathFractureCollection* fractureCollection();
RigWellPath* wellPathGeometry();
const RigWellPath* wellPathGeometry() const;
caf::PdmChildField<RimWellPathFractureCollection*> fractureCollection;
RivWellPathPartMgr* partMgr();
bool readWellPathFile(QString * errorMessage, RifWellPathImporter* wellPathImporter);

14
ApplicationCode/ProjectDataModel/RimWellPathCompletions.cpp
View File

@ -20,6 +20,7 @@
#include "RimFishbonesCollection.h"
#include "RimPerforationCollection.h"
#include "RimWellPathFractureCollection.h"
#include "cvfAssert.h"
@ -40,6 +41,10 @@ RimWellPathCompletions::RimWellPathCompletions()
CAF_PDM_InitFieldNoDefault(&m_fishbonesCollection, "Fishbones", "Fishbones", "", "", "");
m_fishbonesCollection = new RimFishbonesCollection;
m_fishbonesCollection.uiCapability()->setUiHidden(true);
CAF_PDM_InitFieldNoDefault(&m_fractureCollection, "Fractures", "Fractures", "", "", "");
m_fractureCollection = new RimWellPathFractureCollection;
m_fractureCollection.uiCapability()->setUiHidden(true);
}
//--------------------------------------------------------------------------------------------------
@ -62,3 +67,12 @@ RimPerforationCollection* RimWellPathCompletions::perforationCollection() const
return m_perforationCollection;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimWellPathFractureCollection* RimWellPathCompletions::fractureCollection() const
{
CVF_ASSERT(m_fractureCollection);
return m_fractureCollection;
}

11
ApplicationCode/ProjectDataModel/RimWellPathCompletions.h
View File

@ -23,6 +23,7 @@
class RimFishbonesCollection;
class RimPerforationCollection;
class RimWellPathFractureCollection;
//==================================================================================================
///
@ -35,10 +36,12 @@ class RimWellPathCompletions : public caf::PdmObject
public:
RimWellPathCompletions();
RimFishbonesCollection* fishbonesCollection() const;
RimPerforationCollection* perforationCollection() const;
RimFishbonesCollection* fishbonesCollection() const;
RimPerforationCollection* perforationCollection() const;
RimWellPathFractureCollection* fractureCollection() const;
private:
caf::PdmChildField<RimFishbonesCollection*> m_fishbonesCollection;
caf::PdmChildField<RimPerforationCollection*> m_perforationCollection;
caf::PdmChildField<RimFishbonesCollection*> m_fishbonesCollection;
caf::PdmChildField<RimPerforationCollection*> m_perforationCollection;
caf::PdmChildField<RimWellPathFractureCollection*> m_fractureCollection;
};