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

#1037 - pre-proto - Moved fractureCollection from wellPathCollection to WellPath

Browse Source
This commit is contained in:
astridkbjorke
2016-12-21 14:19:52 +01:00
parent 46e4815f9a
commit 22c96be5dd
5 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/ProjectDataModel/RimWellPath.cpp
View File

@@ -28,7 +28,7 @@
#include "RimMainPlotCollection.h"
#include "RimWellLogPlotCollection.h"
#include "RivWellPathPartMgr.h"
#include "RimFractureCollection.h"
#include "RiuMainWindow.h"
#include <QDir>
@@ -96,6 +96,11 @@ RimWellPath::RimWellPath()
CAF_PDM_InitFieldNoDefault(&m_wellLogFile, "WellLogFile", "Well Log File", "", "", "");
m_wellLogFile.uiCapability()->setUiHidden(true);
CAF_PDM_InitFieldNoDefault(&fractureCollection, "FractureCollection", "Fractures", "", "", "");
fractureCollection.uiCapability()->setUiHidden(true);
fractureCollection = new RimFractureCollection();
m_wellPath = NULL;
}
@@ -124,6 +129,9 @@ RimWellPath::~RimWellPath()
}
}
if (fractureCollection()) delete fractureCollection();
}

4
ApplicationCode/ProjectDataModel/RimWellPath.h
View File

@@ -36,6 +36,7 @@
class RimProject;
class RivWellPathPartMgr;
class RimWellLogFile;
class RimFractureCollection;
//==================================================================================================
///
@@ -69,6 +70,9 @@ public:
caf::PdmChildField<RimWellLogFile*> m_wellLogFile;
caf::PdmChildField<RimFractureCollection*> fractureCollection;
RigWellPath* wellPathGeometry() { return m_wellPath.p(); }
RivWellPathPartMgr* partMgr();

8
ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp
View File

@@ -81,16 +81,16 @@ RimWellPathCollection::RimWellPathCollection()
CAF_PDM_InitField(&wellPathClipZDistance, "WellPathClipZDistance", 100, "Well path clipping depth distance", "", "", "");
CAF_PDM_InitFieldNoDefault(&wellPaths, "WellPaths", "Well Paths", "", "", "");
CAF_PDM_InitFieldNoDefault(&fractureCollection, "FractureCollection", "Fractures", "", "", "");
// CAF_PDM_InitFieldNoDefault(&fractureCollection, "FractureCollection", "Fractures", "", "", "");
wellPaths.uiCapability()->setUiHidden(true);
fractureCollection.uiCapability()->setUiHidden(true);
// fractureCollection.uiCapability()->setUiHidden(true);
m_wellPathCollectionPartManager = new RivWellPathCollectionPartMgr(this);
m_asciiFileReader = new RifWellPathAsciiFileReader;
fractureCollection = new RimFractureCollection();
// fractureCollection = new RimFractureCollection();
}
@@ -101,7 +101,7 @@ RimWellPathCollection::RimWellPathCollection()
RimWellPathCollection::~RimWellPathCollection()
{
wellPaths.deleteAllChildObjects();
if (fractureCollection()) delete fractureCollection();
// if (fractureCollection()) delete fractureCollection();
delete m_asciiFileReader;
}

4
ApplicationCode/ProjectDataModel/RimWellPathCollection.h
View File

@@ -34,7 +34,7 @@
#include <QString>
class RimFractureCollection;
//class RimFractureCollection;
class RivWellPathCollectionPartMgr;
class RifWellPathAsciiFileReader;
class RimWellPath;
@@ -76,7 +76,7 @@ public:
caf::PdmField<int> wellPathClipZDistance;
caf::PdmChildArrayField<RimWellPath*> wellPaths;
caf::PdmChildField<RimFractureCollection*> fractureCollection;
// caf::PdmChildField<RimFractureCollection*> fractureCollection;