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

#6007 Rename Facies Properties to Elastic Properties.

Browse Source
This commit is contained in:
Kristian Bendiksen
2020-06-05 09:46:44 +02:00
committed by Magne Sjaastad
parent 466827e7d0
commit 5ddfd4f9da
23 changed files with 264 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ApplicationCode/ProjectDataModel/Completions/RimFractureModel.cpp
View File

@@ -33,8 +33,8 @@
#include "RimEclipseCase.h"
#include "RimEclipseCellColors.h"
#include "RimEclipseView.h"
#include "RimElasticProperties.h"
#include "RimEllipseFractureTemplate.h"
#include "RimFaciesProperties.h"
#include "RimModeledWellPath.h"
#include "RimOilField.h"
#include "RimProject.h"
@@ -105,9 +105,9 @@ RimFractureModel::RimFractureModel()
CAF_PDM_InitField( &m_boundingBoxHorizontal, "BoundingBoxHorizontal", 50.0, "Bounding Box Horizontal", "", "", "" );
CAF_PDM_InitField( &m_boundingBoxVertical, "BoundingBoxVertical", 100.0, "Bounding Box Vertical", "", "", "" );
CAF_PDM_InitFieldNoDefault( &m_faciesProperties, "FaciesProperties", "Facies Properties", "", "", "" );
m_faciesProperties.uiCapability()->setUiHidden( true );
m_faciesProperties.uiCapability()->setUiTreeHidden( true );
CAF_PDM_InitFieldNoDefault( &m_elasticProperties, "ElasticProperties", "Elastic Properties", "", "", "" );
m_elasticProperties.uiCapability()->setUiHidden( true );
m_elasticProperties.uiCapability()->setUiTreeHidden( true );
}
//--------------------------------------------------------------------------------------------------
@@ -361,7 +361,7 @@ cvf::Vec3d RimFractureModel::calculateTSTDirection() const
void RimFractureModel::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
{
m_thicknessDirectionWellPath.uiCapability()->setUiHidden( true );
m_faciesProperties.uiCapability()->setUiHidden( false );
m_elasticProperties.uiCapability()->setUiHidden( false );
}
//--------------------------------------------------------------------------------------------------
@@ -460,17 +460,17 @@ void RimFractureModel::findThicknessTargetPoints( cvf::Vec3d& topPosition, cvf::
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimFaciesProperties* RimFractureModel::faciesProperties() const
RimElasticProperties* RimFractureModel::elasticProperties() const
{
return m_faciesProperties;
return m_elasticProperties;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimFractureModel::setFaciesProperties( RimFaciesProperties* faciesProperties )
void RimFractureModel::setElasticProperties( RimElasticProperties* elasticProperties )
{
m_faciesProperties = faciesProperties;
m_elasticProperties = elasticProperties;
}
//--------------------------------------------------------------------------------------------------
@@ -478,8 +478,8 @@ void RimFractureModel::setFaciesProperties( RimFaciesProperties* faciesPropertie
//--------------------------------------------------------------------------------------------------
void RimFractureModel::loadDataAndUpdate()
{
if ( m_faciesProperties )
if ( m_elasticProperties )
{
m_faciesProperties->loadDataAndUpdate();
m_elasticProperties->loadDataAndUpdate();
}
}

12
ApplicationCode/ProjectDataModel/Completions/RimFractureModel.h
View File

@@ -34,7 +34,7 @@
class RimEclipseCase;
class RimWellPath;
class RimModeledWellPath;
class RimFaciesProperties;
class RimElasticProperties;
//==================================================================================================
///
@@ -73,10 +73,10 @@ public:
void loadDataAndUpdate();
RimModeledWellPath* thicknessDirectionWellPath() const;
void setThicknessDirectionWellPath( RimModeledWellPath* thicknessDirectionWellPath );
void setFaciesProperties( RimFaciesProperties* faciesProperties );
RimFaciesProperties* faciesProperties() const;
RimModeledWellPath* thicknessDirectionWellPath() const;
void setThicknessDirectionWellPath( RimModeledWellPath* thicknessDirectionWellPath );
void setElasticProperties( RimElasticProperties* elasticProperties );
RimElasticProperties* elasticProperties() const;
protected:
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
@@ -97,5 +97,5 @@ protected:
caf::PdmField<double> m_boundingBoxVertical;
caf::PdmField<double> m_boundingBoxHorizontal;
caf::PdmPtrField<RimModeledWellPath*> m_thicknessDirectionWellPath;
caf::PdmChildField<RimFaciesProperties*> m_faciesProperties;
caf::PdmChildField<RimElasticProperties*> m_elasticProperties;
};