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

Improve name of User-Defined Well/Fracture Intersection Depth

Browse Source
This commit is contained in:
Kristian Bendiksen 2021-02-01 11:57:52 +01:00 committed by Magne Sjaastad
parent e2c7d11049
commit d941ff58d0
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ApplicationLibCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp
View File

@ -71,10 +71,10 @@ RimStimPlanFractureTemplate::RimStimPlanFractureTemplate()
CAF_PDM_InitFieldNoDefault( &m_stimPlanFileName, "StimPlanFileName", "File Name", "", "", "" ); CAF_PDM_InitFieldNoDefault( &m_stimPlanFileName, "StimPlanFileName", "File Name", "", "", "" );
m_stimPlanFileName.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() ); m_stimPlanFileName.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
CAF_PDM_InitField( &m_useUserDefinedWellPathDepthAtFracture, CAF_PDM_InitField( &m_userDefinedWellPathDepthAtFracture,
"UseUserDefinedWellPathDepthAtFracture", "UserDefinedWellPathDepthAtFracture",
false, false,
"Use User-Defined Well/Fracture Intersection Depth", "User-Defined Well/Fracture Intersection Depth",
"", "",
"", "",
"" ); "" );
@ -130,9 +130,9 @@ void RimStimPlanFractureTemplate::fieldChangedByUi( const caf::PdmFieldHandle* c
setDefaultsBasedOnXMLfile(); setDefaultsBasedOnXMLfile();
} }
if ( &m_useUserDefinedWellPathDepthAtFracture == changedField ) if ( &m_userDefinedWellPathDepthAtFracture == changedField )
{ {
if ( !m_useUserDefinedWellPathDepthAtFracture ) if ( !m_userDefinedWellPathDepthAtFracture )
{ {
m_readError = false; m_readError = false;
loadDataAndUpdate(); loadDataAndUpdate();
@ -280,7 +280,7 @@ void RimStimPlanFractureTemplate::loadDataAndUpdate()
setUnitSystem( m_stimPlanFractureDefinitionData->unitSet() ); setUnitSystem( m_stimPlanFractureDefinitionData->unitSet() );
} }
if ( !m_useUserDefinedWellPathDepthAtFracture ) if ( !m_userDefinedWellPathDepthAtFracture )
{ {
computeDepthOfWellPathAtFracture(); computeDepthOfWellPathAtFracture();
} }
@ -1020,10 +1020,10 @@ void RimStimPlanFractureTemplate::defineUiOrdering( QString uiConfigName, caf::P
caf::PdmUiGroup* group = uiOrdering.addNewGroup( "Input" ); caf::PdmUiGroup* group = uiOrdering.addNewGroup( "Input" );
group->add( &m_stimPlanFileName ); group->add( &m_stimPlanFileName );
group->add( &m_activeTimeStepIndex ); group->add( &m_activeTimeStepIndex );
group->add( &m_useUserDefinedWellPathDepthAtFracture ); group->add( &m_userDefinedWellPathDepthAtFracture );
group->add( &m_wellPathDepthAtFracture ); group->add( &m_wellPathDepthAtFracture );
m_wellPathDepthAtFracture.uiCapability()->setUiReadOnly( !m_useUserDefinedWellPathDepthAtFracture() ); m_wellPathDepthAtFracture.uiCapability()->setUiReadOnly( !m_userDefinedWellPathDepthAtFracture() );
} }
{ {
@ -1082,7 +1082,7 @@ void RimStimPlanFractureTemplate::initAfterRead()
{ {
if ( RimProject::current()->isProjectFileVersionEqualOrOlderThan( "2020.10.0" ) ) if ( RimProject::current()->isProjectFileVersionEqualOrOlderThan( "2020.10.0" ) )
{ {
m_useUserDefinedWellPathDepthAtFracture = true; m_userDefinedWellPathDepthAtFracture = true;
} }
} }

2
ApplicationLibCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.h
View File

@ -135,7 +135,7 @@ private:
caf::PdmField<int> m_activeTimeStepIndex; caf::PdmField<int> m_activeTimeStepIndex;
caf::PdmField<QString> m_conductivityResultNameOnFile; caf::PdmField<QString> m_conductivityResultNameOnFile;
caf::PdmField<bool> m_useUserDefinedWellPathDepthAtFracture; caf::PdmField<bool> m_userDefinedWellPathDepthAtFracture;
caf::PdmField<QString> m_borderPolygonResultName; caf::PdmField<QString> m_borderPolygonResultName;
caf::PdmField<caf::FilePath> m_stimPlanFileName; caf::PdmField<caf::FilePath> m_stimPlanFileName;