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 - Changed RimFracture to RimWellPathFracture (and same for FractureCollection and commands to create / delete fractures)

Browse Source
This commit is contained in:
astridkbjorke 2017-01-02 11:59:30 +01:00
parent e6ef4fee42
commit b6053147df
18 changed files with 170 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationCode/Commands/CMakeLists_files.cmake
View File

@ -44,6 +44,7 @@ ${CEE_CURRENT_LIST_DIR}RicNewWellPathCollFractureFeature.h
${CEE_CURRENT_LIST_DIR}RicNewWellPathCollFractureAtPosFeature.h
${CEE_CURRENT_LIST_DIR}RicFractureDefinitionsDeleteAllFeature.h
${CEE_CURRENT_LIST_DIR}RicFracturesDeleteAllFeature.h
${CEE_CURRENT_LIST_DIR}RicWellPathFracturesDeleteAllFeature.h
${CEE_CURRENT_LIST_DIR}RicSimWellFracturesDeleteAllFeature.h
@ -92,7 +93,7 @@ ${CEE_CURRENT_LIST_DIR}RicNewFractureDefinitionFeature.cpp
${CEE_CURRENT_LIST_DIR}RicNewWellPathCollFractureFeature.cpp
${CEE_CURRENT_LIST_DIR}RicNewWellPathCollFractureAtPosFeature.cpp
${CEE_CURRENT_LIST_DIR}RicFractureDefinitionsDeleteAllFeature.cpp
${CEE_CURRENT_LIST_DIR}RicFracturesDeleteAllFeature.cpp
${CEE_CURRENT_LIST_DIR}RicWellPathFracturesDeleteAllFeature.cpp
${CEE_CURRENT_LIST_DIR}RicSimWellFracturesDeleteAllFeature.cpp

46
ApplicationCode/Commands/RicDeleteItemFeature.cpp
View File

@ -21,8 +21,29 @@
#include "RicDeleteItemExec.h"
#include "RicDeleteItemExecData.h"
#include "RimCellRangeFilter.h"
#include "RimEclipseInputProperty.h"
#include "RimEclipsePropertyFilter.h"
#include "RimEclipseView.h"
#include "RimFormationNames.h"
#include "RimFormationNamesCollection.h"
#include "RimFractureDefinition.h"
#include "RimGeoMechPropertyFilter.h"
#include "RimGeoMechView.h"
#include "RimIdenticalGridCaseGroup.h"
#include "RimIntersection.h"
#include "RimIntersectionBox.h"
#include "RimSimWellFracture.h"
#include "RimSimWellFractureCollection.h"
#include "RimSummaryCurve.h"
#include "RimSummaryCurveFilter.h"
#include "RimSummaryPlot.h"
#include "RimViewController.h"
#include "RimWellLogCurve.h"
#include "RimWellLogPlot.h"
#include "RimWellLogTrack.h"
#include "RimWellPathFracture.h"
#include "RimWellPathFractureCollection.h"
#include "cafCmdExecCommandManager.h"
#include "cafCmdSelectionHelper.h"
@ -32,27 +53,6 @@
#include "cafSelectionManager.h"
#include <QAction>
#include "RimGeoMechView.h"
#include "RimEclipseView.h"
#include "RimIdenticalGridCaseGroup.h"
#include "RimEclipseInputProperty.h"
#include "RimCellRangeFilter.h"
#include "RimEclipsePropertyFilter.h"
#include "RimFracture.h"
#include "RimFractureCollection.h"
#include "RimFractureDefinition.h"
#include "RimGeoMechPropertyFilter.h"
#include "RimViewController.h"
#include "RimWellLogCurve.h"
#include "RimSimWellFracture.h"
#include "RimSimWellFractureCollection.h"
#include "RimSummaryCurve.h"
#include "RimSummaryCurveFilter.h"
#include "RimIntersection.h"
#include "RimIntersectionBox.h"
#include "RimFormationNames.h"
#include "RimFormationNamesCollection.h"
#include "RimSummaryPlot.h"
namespace caf
{
@ -77,8 +77,8 @@ bool isDeletable(PdmUiItem * uiItem)
if (dynamic_cast<RimIntersectionBox*>(uiItem)) return true;
if (dynamic_cast<RimFormationNames*>(uiItem)) return true;
if (dynamic_cast<RimFormationNamesCollection*>(uiItem)) return true;
if (dynamic_cast<RimFractureCollection*>(uiItem)) return true;
if (dynamic_cast<RimFracture*>(uiItem)) return true;
if (dynamic_cast<RimWellPathFractureCollection*>(uiItem)) return true;
if (dynamic_cast<RimWellPathFracture*>(uiItem)) return true;
if (dynamic_cast<RimFractureDefinition*>(uiItem)) return true;
if (dynamic_cast<RimSimWellFractureCollection*>(uiItem)) return true;
if (dynamic_cast<RimSimWellFracture*>(uiItem)) return true;

16
ApplicationCode/Commands/RicFracturesDeleteAllFeature.cpp
View File

@ -19,7 +19,7 @@
#include "RicFracturesDeleteAllFeature.h"
#include "RimFractureCollection.h"
#include "RimWellPathFractureCollection.h"
#include "cafSelectionManager.h"
@ -28,15 +28,15 @@
namespace caf
{
CAF_CMD_SOURCE_INIT(RicFracturesDeleteAllFeature, "RicFracturesDeleteAllFeature");
CAF_CMD_SOURCE_INIT(RicWellPathFracturesDeleteAllFeature, "RicFracturesDeleteAllFeature");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicFracturesDeleteAllFeature::isCommandEnabled()
bool RicWellPathFracturesDeleteAllFeature::isCommandEnabled()
{
std::vector<RimFractureCollection*> objects;
std::vector<RimWellPathFractureCollection*> objects;
caf::SelectionManager::instance()->objectsByType(&objects);
if (objects.size() == 1)
@ -50,12 +50,12 @@ bool RicFracturesDeleteAllFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicFracturesDeleteAllFeature::onActionTriggered(bool isChecked)
void RicWellPathFracturesDeleteAllFeature::onActionTriggered(bool isChecked)
{
std::vector<RimFractureCollection*> objects;
std::vector<RimWellPathFractureCollection*> objects;
caf::SelectionManager::instance()->objectsByType(&objects);
RimFractureCollection* fractureCollection = nullptr;
RimWellPathFractureCollection* fractureCollection = nullptr;
if (objects.size() > 0)
{
fractureCollection = objects[0];
@ -69,7 +69,7 @@ void RicFracturesDeleteAllFeature::onActionTriggered(bool isChecked)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicFracturesDeleteAllFeature::setupActionLook(QAction* actionToSetup)
void RicWellPathFracturesDeleteAllFeature::setupActionLook(QAction* actionToSetup)
{
actionToSetup->setText("Delete All Fractures");
actionToSetup->setIcon(QIcon(":/Erase.png"));

22
ApplicationCode/Commands/RicNewWellPathCollFractureAtPosFeature.cpp
View File

@ -21,21 +21,22 @@
#include "RiaApplication.h"
#include "RimCase.h"
#include "RimFracture.h"
#include "RimFractureCollection.h"
#include "RimProject.h"
#include "RimView.h"
#include "RimWellPath.h"
#include "RimWellPathCollection.h"
#include "RimWellPathFracture.h"
#include "RimWellPathFractureCollection.h"
#include "RiuSelectionManager.h"
#include "RiuViewer.h"
#include "cafSelectionManager.h"
#include "cvfAssert.h"
#include "RimWellPath.h"
#include "RimView.h"
#include "cvfVector3.h"
#include "cvfRenderState_FF.h"
#include "RiuViewer.h"
#include "RiuSelectionManager.h"
#include <QAction>
@ -69,13 +70,12 @@ void RicNewWellPathCollFractureAtPosFeature::onActionTriggered(bool isChecked)
objHandle->firstAncestorOrThisOfType(wellPathObj);
if (!wellPathObj) return;
RimFractureCollection* fractureCollection = wellPathObj->fractureCollection();
RimWellPathFractureCollection* fractureCollection = wellPathObj->fractureCollection();
RimFracture* fracture = new RimFracture();
RimWellPathFracture* fracture = new RimWellPathFracture();
fractureCollection->fractures.push_back(fracture);
fracture->name = "New Well Path Fracture";
fracture->welltype = RimFracture::FRACTURE_WELL_PATH;
fracture->wellpath = wellPath;
fracture->positionAtWellpath = wellPathItem->m_currentPickPositionInDomainCoords;

10
ApplicationCode/Commands/RicNewWellPathCollFractureFeature.cpp
View File

@ -21,10 +21,10 @@
#include "RiaApplication.h"
#include "RimCase.h"
#include "RimFracture.h"
#include "RimFractureCollection.h"
#include "RimProject.h"
#include "RimWellPathCollection.h"
#include "RimWellPathFracture.h"
#include "RimWellPathFractureCollection.h"
#include "cafSelectionManager.h"
@ -49,16 +49,14 @@ void RicNewWellPathCollFractureFeature::onActionTriggered(bool isChecked)
RimWellPathCollection* wellPathColl = nullptr;
objHandle->firstAncestorOrThisOfType(wellPathColl);
RimFractureCollection* fractureCollection = nullptr;
RimWellPathFractureCollection* fractureCollection = nullptr;
objHandle->firstAncestorOrThisOfType(fractureCollection);
CVF_ASSERT(fractureCollection);
RimFracture* fracture = new RimFracture();
RimWellPathFracture* fracture = new RimWellPathFracture();
fractureCollection->fractures.push_back(fracture);
fracture->name = "New Well Path Fracture";
fracture->welltype = RimFracture::FRACTURE_WELL_PATH;
//TODO set all relevant defaults...
fractureCollection->updateConnectedEditors();

78
ApplicationCode/Commands/RicWellPathFracturesDeleteAllFeature.cpp Normal file
View File

@ -0,0 +1,78 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2015- Statoil ASA
// Copyright (C) 2015- Ceetron Solutions AS
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#include "RicWellPathFracturesDeleteAllFeature.h"
#include "RimWellPathFractureCollection.h"
#include "cafSelectionManager.h"
#include <QAction>
namespace caf
{
CAF_CMD_SOURCE_INIT(RicWellPathFracturesDeleteAllFeature, "RicWellPathFracturesDeleteAllFeature");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicWellPathFracturesDeleteAllFeature::isCommandEnabled()
{
std::vector<RimWellPathFractureCollection*> objects;
caf::SelectionManager::instance()->objectsByType(&objects);
if (objects.size() == 1)
{
return true;
}
return false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicWellPathFracturesDeleteAllFeature::onActionTriggered(bool isChecked)
{
std::vector<RimWellPathFractureCollection*> objects;
caf::SelectionManager::instance()->objectsByType(&objects);
RimWellPathFractureCollection* fractureCollection = nullptr;
if (objects.size() > 0)
{
fractureCollection = objects[0];
}
fractureCollection->deleteFractures();
fractureCollection->uiCapability()->updateConnectedEditors();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicWellPathFracturesDeleteAllFeature::setupActionLook(QAction* actionToSetup)
{
actionToSetup->setText("Delete All Fractures");
actionToSetup->setIcon(QIcon(":/Erase.png"));
}
} // end namespace caf

2
ApplicationCode/Commands/RicFracturesDeleteAllFeature.h → ApplicationCode/Commands/RicWellPathFracturesDeleteAllFeature.h
View File

@ -27,7 +27,7 @@ namespace caf
//==================================================================================================
///
//==================================================================================================
class RicFracturesDeleteAllFeature : public CmdFeature
class RicWellPathFracturesDeleteAllFeature : public CmdFeature
{
CAF_CMD_HEADER_INIT;
protected:

8
ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
View File

@ -86,9 +86,9 @@ ${CEE_CURRENT_LIST_DIR}RimIntersectionBox.h
${CEE_CURRENT_LIST_DIR}RimMultiSnapshotDefinition.h
${CEE_CURRENT_LIST_DIR}RimFractureDefinition.h
${CEE_CURRENT_LIST_DIR}RimFractureDefinitionCollection.h
${CEE_CURRENT_LIST_DIR}RimFracture.h
${CEE_CURRENT_LIST_DIR}RimWellPathFracture.h
${CEE_CURRENT_LIST_DIR}RimWellPathFractureCollection.h
${CEE_CURRENT_LIST_DIR}RimSimWellFracture.h
${CEE_CURRENT_LIST_DIR}RimFractureCollection.h
${CEE_CURRENT_LIST_DIR}RimSimWellFractureCollection.h
)
@ -175,9 +175,9 @@ ${CEE_CURRENT_LIST_DIR}RimIntersectionBox.cpp
${CEE_CURRENT_LIST_DIR}RimMultiSnapshotDefinition.cpp
${CEE_CURRENT_LIST_DIR}RimFractureDefinition.cpp
${CEE_CURRENT_LIST_DIR}RimFractureDefinitionCollection.cpp
${CEE_CURRENT_LIST_DIR}RimFracture.cpp
${CEE_CURRENT_LIST_DIR}RimWellPathFracture.cpp
${CEE_CURRENT_LIST_DIR}RimWellPathFractureCollection.cpp
${CEE_CURRENT_LIST_DIR}RimSimWellFracture.cpp
${CEE_CURRENT_LIST_DIR}RimFractureCollection.cpp
${CEE_CURRENT_LIST_DIR}RimSimWellFractureCollection.cpp
)

25
ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@ -23,8 +23,6 @@
#include "RimCaseCollection.h"
#include "RimCellRangeFilter.h"
#include "RimCellRangeFilterCollection.h"
#include "RimIntersection.h"
#include "RimIntersectionCollection.h"
#include "RimEclipseCase.h"
#include "RimEclipseCaseCollection.h"
#include "RimEclipseCellColors.h"
@ -38,8 +36,6 @@
#include "RimFault.h"
#include "RimFormationNames.h"
#include "RimFormationNamesCollection.h"
#include "RimFracture.h"
#include "RimFractureCollection.h"
#include "RimFractureDefinition.h"
#include "RimFractureDefinitionCollection.h"
#include "RimGeoMechCase.h"
@ -47,10 +43,12 @@
#include "RimGeoMechPropertyFilterCollection.h"
#include "RimGeoMechView.h"
#include "RimIdenticalGridCaseGroup.h"
#include "RimIntersection.h"
#include "RimIntersectionBox.h"
#include "RimIntersectionCollection.h"
#include "RimScriptCollection.h"
#include "RimSimWellFracture.h"
#include "RimSimWellFractureCollection.h"
#include "RimScriptCollection.h"
#include "RimSummaryCase.h"
#include "RimSummaryCurve.h"
#include "RimSummaryCurveFilter.h"
@ -65,19 +63,19 @@
#include "RimWellLogTrack.h"
#include "RimWellPath.h"
#include "RimWellPathCollection.h"
#include "RimWellPathFracture.h"
#include "RimWellPathFractureCollection.h"
#include "ToggleCommands/RicToggleItemsFeatureImpl.h"
#include "cafCmdFeature.h"
#include "cafCmdFeatureManager.h"
#include "cafPdmUiItem.h"
#include "cafSelectionManager.h"
#include "cvfAssert.h"
#include "cafCmdFeatureManager.h"
#include "cafCmdFeature.h"
#include <vector>
#include <QMenu>
//--------------------------------------------------------------------------------------------------
@ -358,12 +356,11 @@ QStringList RimContextCommandBuilder::commandsFromSelection()
{
commandIds << "RicExportFaultsFeature";
}
else if (dynamic_cast<RimFractureCollection*>(uiItem) ||
dynamic_cast<RimFracture*>(uiItem) )
else if (dynamic_cast<RimWellPathFractureCollection*>(uiItem) ||
dynamic_cast<RimWellPathFracture*>(uiItem) )
{
commandIds << "RicNewSimWellFractureFeature";
commandIds << "RicNewWellPathCollFractureFeature";
commandIds << "RicFracturesDeleteAllFeature";
commandIds << "RicWellPathFracturesDeleteAllFeature";
}
else if (dynamic_cast<RimSimWellFractureCollection*>(uiItem) ||
dynamic_cast<RimSimWellFracture*>(uiItem))

2
ApplicationCode/ProjectDataModel/RimProject.cpp
View File

@ -34,7 +34,6 @@
#include "RimEclipseCaseCollection.h"
#include "RimFormationNamesCollection.h"
#include "RimFractureDefinitionCollection.h"
//#include "RimFractureCollection.h"
#include "RimGeoMechCase.h"
#include "RimGeoMechModels.h"
#include "RimGridSummaryCase.h"
@ -830,7 +829,6 @@ 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->formationNamesCollection()) uiTreeOrdering.add(oilField->formationNamesCollection());
}

2
ApplicationCode/ProjectDataModel/RimProject.h
View File

@ -34,7 +34,7 @@ class RimCase;
class RimCommandObject;
class RimEclipseCase;
class RimFractureDefinition;
class RimFractureCollection;
class RimWellPathFractureCollection;
class RimIdenticalGridCaseGroup;
class RimMainPlotCollection;
class RimMultiSnapshotDefinition;

4
ApplicationCode/ProjectDataModel/RimWellPath.cpp
View File

@ -28,7 +28,7 @@
#include "RimMainPlotCollection.h"
#include "RimWellLogPlotCollection.h"
#include "RivWellPathPartMgr.h"
#include "RimFractureCollection.h"
#include "RimWellPathFractureCollection.h"
#include "RiuMainWindow.h"
#include <QDir>
@ -98,7 +98,7 @@ RimWellPath::RimWellPath()
CAF_PDM_InitFieldNoDefault(&fractureCollection, "FractureCollection", "Fractures", "", "", "");
fractureCollection.uiCapability()->setUiHidden(true);
fractureCollection = new RimFractureCollection();
fractureCollection = new RimWellPathFractureCollection();
m_wellPath = NULL;

4
ApplicationCode/ProjectDataModel/RimWellPath.h
View File

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

5
ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp
View File

@ -23,7 +23,6 @@
#include "RiaApplication.h"
#include "RiaPreferences.h"
#include "RimFractureCollection.h"
#include "RimProject.h"
#include "RimWellPath.h"
#include "RimWellLogFile.h"
@ -81,16 +80,13 @@ 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();
}
@ -101,7 +97,6 @@ RimWellPathCollection::RimWellPathCollection()
RimWellPathCollection::~RimWellPathCollection()
{
wellPaths.deleteAllChildObjects();
// if (fractureCollection()) delete fractureCollection();
delete m_asciiFileReader;
}

43
ApplicationCode/ProjectDataModel/RimFracture.cpp → ApplicationCode/ProjectDataModel/RimWellPathFracture.cpp
View File

@ -16,7 +16,7 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RimFracture.h"
#include "RimWellPathFracture.h"
#include "RiaApplication.h"
@ -35,30 +35,17 @@
#include "cvfVector3.h"
namespace caf
{
template<>
void caf::AppEnum< RimFracture::FractureWellEnum>::setUp()
{
addItem(RimFracture::FRACTURE_SIMULATION_WELL, "SIMULATION_WELL", "Simulation Well");
addItem(RimFracture::FRACTURE_WELL_PATH, "WELL_PATH", "Well Path");
setDefault(RimFracture::FRACTURE_SIMULATION_WELL);
}
}
CAF_PDM_SOURCE_INIT(RimFracture, "Fracture");
CAF_PDM_SOURCE_INIT(RimWellPathFracture, "WellPathFracture");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimFracture::RimFracture(void)
RimWellPathFracture::RimWellPathFracture(void)
{
CAF_PDM_InitObject("Fracture", "", "", "");
CAF_PDM_InitField(&name, "UserDescription", QString("Fracture Name"), "Name", "", "", "");
CAF_PDM_InitField(&welltype,"Type", caf::AppEnum<FractureWellEnum>(FRACTURE_SIMULATION_WELL), "Type", "", "", "");
CAF_PDM_InitField( &measuredDepth, "MeasuredDepth", 0.0f, "Measured Depth Location (if along well path)", "", "", "");
CAF_PDM_InitFieldNoDefault(&wellpath, "WellPath", "Well path for measured deph", "", "", "");
@ -75,14 +62,14 @@ RimFracture::RimFracture(void)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimFracture::~RimFracture()
RimWellPathFracture::~RimWellPathFracture()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> RimFracture::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly)
QList<caf::PdmOptionItemInfo> RimWellPathFracture::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly)
{
QList<caf::PdmOptionItemInfo> options;
@ -129,28 +116,16 @@ QList<caf::PdmOptionItemInfo> RimFracture::calculateValueOptions(const caf::PdmF
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimFracture::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
void RimWellPathFracture::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
uiOrdering.add(&name);
caf::PdmUiGroup* geometryGroup = uiOrdering.addNewGroup("Fractures");
geometryGroup->add(&fractureDefinition);
// geometryGroup->add(&welltype);
if (welltype == FRACTURE_WELL_PATH)
{
geometryGroup->add(&wellpath);
geometryGroup->add(&measuredDepth);
geometryGroup->add(&positionAtWellpath);
}
else if (welltype == FRACTURE_SIMULATION_WELL)
{
geometryGroup->add(&i);
geometryGroup->add(&j);
geometryGroup->add(&k);
}
geometryGroup->add(&wellpath);
geometryGroup->add(&measuredDepth);
geometryGroup->add(&positionAtWellpath);
uiOrdering.setForgetRemainingFields(true);

14
ApplicationCode/ProjectDataModel/RimFracture.h → ApplicationCode/ProjectDataModel/RimWellPathFracture.h
View File

@ -32,24 +32,16 @@ class RimWellPath;
///
///
//==================================================================================================
class RimFracture : public caf::PdmObject
class RimWellPathFracture : public caf::PdmObject
{
CAF_PDM_HEADER_INIT;
public:
enum FractureWellEnum
{
FRACTURE_WELL_PATH,
FRACTURE_SIMULATION_WELL
};
public:
RimFracture(void);
virtual ~RimFracture(void);
RimWellPathFracture(void);
virtual ~RimWellPathFracture(void);
caf::PdmField<QString> name;
caf::PdmPtrField<RimFractureDefinition* > fractureDefinition;
caf::PdmField< caf::AppEnum< FractureWellEnum > > welltype;
caf::PdmPtrField<RimWellPath*> wellpath;
caf::PdmField<float> measuredDepth;

12
ApplicationCode/ProjectDataModel/RimFractureCollection.cpp → ApplicationCode/ProjectDataModel/RimWellPathFractureCollection.cpp
View File

@ -16,20 +16,20 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RimFractureCollection.h"
#include "RimWellPathFractureCollection.h"
#include "RimFracture.h"
#include "RimWellPathFracture.h"
#include "cafPdmObject.h"
CAF_PDM_SOURCE_INIT(RimFractureCollection, "FractureCollection");
CAF_PDM_SOURCE_INIT(RimWellPathFractureCollection, "WellPathFractureCollection");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimFractureCollection::RimFractureCollection(void)
RimWellPathFractureCollection::RimWellPathFractureCollection(void)
{
CAF_PDM_InitObject("Fracture Collection", "", "", "");
@ -42,7 +42,7 @@ RimFractureCollection::RimFractureCollection(void)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimFractureCollection::~RimFractureCollection()
RimWellPathFractureCollection::~RimWellPathFractureCollection()
{
fractures.deleteAllChildObjects();
@ -51,7 +51,7 @@ RimFractureCollection::~RimFractureCollection()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimFractureCollection::deleteFractures()
void RimWellPathFractureCollection::deleteFractures()
{
fractures.deleteAllChildObjects();
}

10
ApplicationCode/ProjectDataModel/RimFractureCollection.h → ApplicationCode/ProjectDataModel/RimWellPathFractureCollection.h
View File

@ -22,21 +22,21 @@
#include "cafPdmObject.h"
#include "cafPdmChildArrayField.h"
class RimFracture;
class RimWellPathFracture;
//==================================================================================================
///
///
//==================================================================================================
class RimFractureCollection : public caf::PdmObject
class RimWellPathFractureCollection : public caf::PdmObject
{
CAF_PDM_HEADER_INIT;
public:
RimFractureCollection(void);
virtual ~RimFractureCollection(void);
RimWellPathFractureCollection(void);
virtual ~RimWellPathFractureCollection(void);
caf::PdmChildArrayField<RimFracture*> fractures;
caf::PdmChildArrayField<RimWellPathFracture*> fractures;
caf::PdmField<bool> isActive;
void deleteFractures();