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

#1038 - pre-proto - Added command feature for creating new well log collection fracture from context menu in project tree

Browse Source
This commit is contained in:
astridkbjorke
2016-12-20 09:53:19 +01:00
parent 456bc03483
commit ab6e12eb3a
14 changed files with 226 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@@ -75,6 +75,7 @@
#include <QMenu>
#include "RimFault.h"
#include "RimFracture.h"
//--------------------------------------------------------------------------------------------------
///
@@ -354,9 +355,11 @@ QStringList RimContextCommandBuilder::commandsFromSelection()
{
commandIds << "RicExportFaultsFeature";
}
else if (dynamic_cast<RimFractureCollection*>(uiItem))
else if (dynamic_cast<RimFractureCollection*>(uiItem)
|| dynamic_cast<RimFracture*>(uiItem) )
{
commandIds << "RicNewSimWellFractureFeature";
commandIds << "RicNewWellPathCollFractureFeature";
}
else if (dynamic_cast<RimFractureDefinitionCollection*>(uiItem))
{

6
ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
View File

@@ -23,6 +23,7 @@
#include "RimIntersectionCollection.h"
#include "RimEclipseView.h"
#include "RimEclipseWellCollection.h"
#include "RimFractureCollection.h"
#include "cvfMath.h"
@@ -48,13 +49,17 @@ RimEclipseWell::RimEclipseWell()
CAF_PDM_InitField(&showWellCells, "ShowWellCells", true, "Add cells to range filter", "", "", "");
CAF_PDM_InitField(&showWellCellFence, "ShowWellCellFence", false, "Use well fence", "", "", "");
CAF_PDM_InitFieldNoDefault(&fractureCollection, "FractureCollection", "Fractures", "", "", "");
name.uiCapability()->setUiHidden(true);
name.uiCapability()->setUiReadOnly(true);
fractureCollection.uiCapability()->setUiHidden(true);
m_resultWellIndex = cvf::UNDEFINED_SIZE_T;
m_reservoirView = NULL;
fractureCollection = new RimFractureCollection();
}
//--------------------------------------------------------------------------------------------------
@@ -62,6 +67,7 @@ RimEclipseWell::RimEclipseWell()
//--------------------------------------------------------------------------------------------------
RimEclipseWell::~RimEclipseWell()
{
if (fractureCollection()) delete fractureCollection();
}
//--------------------------------------------------------------------------------------------------

5
ApplicationCode/ProjectDataModel/RimEclipseWell.h
View File

@@ -31,8 +31,10 @@
// Include to make Pdm work for cvf::Color
#include "cafPdmFieldCvfColor.h"
#include "cafPdmChildField.h"
class RimEclipseView;
class RimFractureCollection;
//==================================================================================================
///
@@ -76,6 +78,9 @@ public:
caf::PdmField<cvf::Color3f> wellPipeColor;
caf::PdmField<double> pipeRadiusScaleFactor;
caf::PdmChildField<RimFractureCollection*> fractureCollection;
private:
cvf::ref<RigSingleWellResultsData> m_wellResults;
size_t m_resultWellIndex;

2
ApplicationCode/ProjectDataModel/RimFracture.cpp
View File

@@ -133,7 +133,7 @@ void RimFracture::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiO
caf::PdmUiGroup* geometryGroup = uiOrdering.addNewGroup("Fractures");
geometryGroup->add(&fractureDefinition);
geometryGroup->add(&welltype);
// geometryGroup->add(&welltype);
if (welltype == FRACTURE_WELL_PATH)
{

8
ApplicationCode/ProjectDataModel/RimOilField.cpp
View File

@@ -23,7 +23,7 @@
#include "RimEclipseCaseCollection.h"
#include "RimFormationNamesCollection.h"
#include "RimFractureDefinitionCollection.h"
#include "RimFractureCollection.h"
//#include "RimFractureCollection.h"
#include "RimGeoMechModels.h"
#include "RimSummaryCaseCollection.h"
#include "RimWellPathCollection.h"
@@ -42,11 +42,11 @@ RimOilField::RimOilField(void)
CAF_PDM_InitFieldNoDefault(&wellPathCollection, "WellPathCollection", "Well Paths", ":/WellCollection.png", "", "");
CAF_PDM_InitFieldNoDefault(&fractureDefinitionCollection, "FractureDefinitionCollection", "Defenition of fractures", "", "", "");
CAF_PDM_InitFieldNoDefault(&summaryCaseCollection,"SummaryCaseCollection","Summary Cases",":/GridModels.png","","");
CAF_PDM_InitFieldNoDefault(&fractureCollection, "FractureCollection", "Fractures", "", "", "");
// CAF_PDM_InitFieldNoDefault(&fractureCollection, "FractureCollection", "Fractures", "", "", "");
CAF_PDM_InitFieldNoDefault(&formationNamesCollection,"FormationNamesCollection","Formations","","","");
fractureDefinitionCollection = new RimFractureDefinitionCollection();
fractureCollection = new RimFractureCollection();
// fractureCollection = new RimFractureCollection();
analysisModels = new RimEclipseCaseCollection();
wellPathCollection = new RimWellPathCollection();
summaryCaseCollection = new RimSummaryCaseCollection();
@@ -59,7 +59,7 @@ RimOilField::~RimOilField(void)
{
if (wellPathCollection()) delete wellPathCollection();
if (fractureDefinitionCollection()) delete fractureDefinitionCollection();
if (fractureCollection()) delete fractureCollection();
// if (fractureCollection()) delete fractureCollection();
if (geoMechModels()) delete geoMechModels();
if (analysisModels()) delete analysisModels();
if (summaryCaseCollection()) delete summaryCaseCollection();

16
ApplicationCode/ProjectDataModel/RimOilField.h
View File

@@ -29,7 +29,7 @@ class RimEclipseCaseCollection;
class RimGeoMechModels;
class RimWellPathCollection;
class RimFractureDefinitionCollection;
class RimFractureCollection;
//class RimFractureCollection;
class RimSummaryCaseCollection;
class RimFormationNamesCollection;
@@ -45,12 +45,12 @@ public:
RimOilField(void);
virtual ~RimOilField(void);
caf::PdmChildField<RimEclipseCaseCollection*> analysisModels;
caf::PdmChildField<RimGeoMechModels*> geoMechModels;
caf::PdmChildField<RimWellPathCollection*> wellPathCollection;
caf::PdmChildField<RimFractureDefinitionCollection*> fractureDefinitionCollection;
caf::PdmChildField<RimFractureCollection*> fractureCollection;
caf::PdmChildField<RimSummaryCaseCollection*> summaryCaseCollection;
caf::PdmChildField<RimFormationNamesCollection*> formationNamesCollection;
caf::PdmChildField<RimEclipseCaseCollection*> analysisModels;
caf::PdmChildField<RimGeoMechModels*> geoMechModels;
caf::PdmChildField<RimWellPathCollection*> wellPathCollection;
caf::PdmChildField<RimFractureDefinitionCollection*> fractureDefinitionCollection;
// caf::PdmChildField<RimFractureCollection*> fractureCollection;
caf::PdmChildField<RimSummaryCaseCollection*> summaryCaseCollection;
caf::PdmChildField<RimFormationNamesCollection*> formationNamesCollection;
};

4
ApplicationCode/ProjectDataModel/RimProject.cpp
View File

@@ -34,7 +34,7 @@
#include "RimEclipseCaseCollection.h"
#include "RimFormationNamesCollection.h"
#include "RimFractureDefinitionCollection.h"
#include "RimFractureCollection.h"
//#include "RimFractureCollection.h"
#include "RimGeoMechCase.h"
#include "RimGeoMechModels.h"
#include "RimGridSummaryCase.h"
@@ -828,7 +828,7 @@ void RimProject::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QS
if (oilField->geoMechModels()) uiTreeOrdering.add(oilField->geoMechModels());
if (oilField->wellPathCollection()) uiTreeOrdering.add(oilField->wellPathCollection());
if (oilField->fractureDefinitionCollection()) uiTreeOrdering.add(oilField->fractureDefinitionCollection());
if (oilField->fractureCollection()) uiTreeOrdering.add(oilField->fractureCollection());
// if (oilField->fractureCollection()) uiTreeOrdering.add(oilField->fractureCollection());
if (oilField->formationNamesCollection()) uiTreeOrdering.add(oilField->formationNamesCollection());
}

9
ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp
View File

@@ -22,6 +22,8 @@
#include "RiaApplication.h"
#include "RiaPreferences.h"
#include "RimFractureCollection.h"
#include "RimProject.h"
#include "RimWellPath.h"
#include "RimWellLogFile.h"
@@ -79,11 +81,17 @@ 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", "", "", "");
wellPaths.uiCapability()->setUiHidden(true);
fractureCollection.uiCapability()->setUiHidden(true);
m_wellPathCollectionPartManager = new RivWellPathCollectionPartMgr(this);
m_asciiFileReader = new RifWellPathAsciiFileReader;
fractureCollection = new RimFractureCollection();
}
@@ -93,6 +101,7 @@ RimWellPathCollection::RimWellPathCollection()
RimWellPathCollection::~RimWellPathCollection()
{
wellPaths.deleteAllChildObjects();
if (fractureCollection()) delete fractureCollection();
delete m_asciiFileReader;
}

6
ApplicationCode/ProjectDataModel/RimWellPathCollection.h
View File

@@ -28,11 +28,13 @@
// Include to make Pdm work for cvf::Color
#include "cafPdmFieldCvfColor.h"
#include "cafPdmChildField.h"
#include "cvfObject.h"
#include <QString>
class RimFractureCollection;
class RivWellPathCollectionPartMgr;
class RifWellPathAsciiFileReader;
class RimWellPath;
@@ -73,7 +75,9 @@ public:
caf::PdmField<bool> wellPathClip;
caf::PdmField<int> wellPathClipZDistance;
caf::PdmChildArrayField<RimWellPath*> wellPaths;
caf::PdmChildArrayField<RimWellPath*> wellPaths;
caf::PdmChildField<RimFractureCollection*> fractureCollection;
RivWellPathCollectionPartMgr* wellPathCollectionPartMgr() { return m_wellPathCollectionPartManager.p(); }